diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9001617..c919e1ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -193,13 +193,16 @@ jobs:
               else
                 export GIT_VERSION=$(echo "$full_release_tag" | tail -n 1)
               fi
+              if [ "<<parameters.release>>" == "true" ]; then
+                export IMAGE_TAGS="$GIT_VERSION,$IMAGE_TAGS,latest"
+              else
+                export IMAGE_TAGS="$GIT_VERSION,$IMAGE_TAGS"
+              fi
               
-              export IMAGE_TAGS="$GIT_VERSION,$IMAGE_TAGS"
               echo "Setting IMAGE_TAGS=$IMAGE_TAGS"
             fi
 
 
-
             # Create, start (bootstrap) and use a *named* docker builder
             # This allows us to cross-build multi-platform,
             # and naming allows us to use the DLC (docker-layer-cache)
@@ -266,7 +269,7 @@ workflows:
           type: approval
           filters:
             tags:
-              only: (^op-monitorism\/v.*$|^op-defender\/v.*$)
+              only: /(^op-monitorism\/v.*$|^op-defender\/v.*$)/
             branches:
               ignore: /.*/
       - docker-build:
@@ -299,6 +302,7 @@ workflows:
           release: true
           context:
             - oplabs-gcr
+
   main:
     when:
       and: