diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42806440c..1078ae690 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,5 +77,6 @@ workflows:
               only:
                 - master
                 - main
+                - /^[a-z]*-master$/
             tags:
               only: /^v[0-9].*/
diff --git a/scripts/push-docker-tags.sh b/scripts/push-docker-tags.sh
index acdcfc735..5f49e75c3 100755
--- a/scripts/push-docker-tags.sh
+++ b/scripts/push-docker-tags.sh
@@ -54,15 +54,5 @@ pushTag () {
   fi
 }
 
-if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then
-  pushTag "$GIT_TAG"
-  pushTag "latest"
-
-elif [[ $GIT_BRANCH =~ ^(master|main)$ ]]; then
-  pushTag "$GIT_BRANCH-${DATE_SHORT}-${GIT_SHA1_SHORT}"
-  pushTag "$GIT_BRANCH-latest"
-
-else
-  echo "Nothing to do for branch: $GIT_BRANCH, tag: $GIT_TAG"
-
-fi
+pushTag "$GIT_BRANCH-${DATE_SHORT}-${GIT_SHA1_SHORT}"
+pushTag "$GIT_BRANCH-latest"