diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2392c2751..e6cc8d511 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -369,7 +369,7 @@ workflows:
         - go-ipfs-http-client
         - ipfs-webui
 
-  # NOTE: As we need to pass the tag filter to all dependent jobs, this is pulled out into a seperate workflow.
+  # NOTE: You have to opt in to get circleci to trigger builds for a tat. As it is required that you set the tag filter to all dependent jobs, this is pulled out into a seperate workflow.
   # see: https://circleci.com/docs/2.0/workflows/#executing-workflows-for-a-git-tag
   docker-on-tag: 
     jobs:
@@ -377,9 +377,13 @@ workflows:
           filters:
             tags:
               only: /^v[0-9].*|^cluster.+/
+          branches:
+              ignore: /.*/
       - docker-push:
           requires:
             - docker-build
           filters:
             tags:
               only: /^v[0-9].*|^cluster.+/
+          branches:
+              ignore: /.*/
diff --git a/bin/push-docker-tags.sh b/bin/push-docker-tags.sh
index db2a6cc78..189f830b4 100755
--- a/bin/push-docker-tags.sh
+++ b/bin/push-docker-tags.sh
@@ -61,8 +61,8 @@ pushTag () {
 if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then 
   pushTag "$GIT_TAG"
 
-elif [[ $GIT_TAG =~ ^cluster ]]; then 
-  pushTag "$GIT_TAG"
+elif [[ $GIT_BRANCH =~ ^cluster ]]; then 
+  pushTag "$GIT_BRANCH"
 
 elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then 
   pushTag "bifrost-${BUILD_NUM}-${GIT_SHA1_SHORT}"