diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf8727df5..c33deeb10 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -254,10 +254,14 @@ workflows:
           filters:
            branches:
               ignore: develop
+           tags:
+              only: /^[\.0-9]*$/
       - arm_build_push:
           filters:
             branches:
                ignore: develop
+            tags:
+              only: /^[\.0-9]*$/
       - arm_build_push_develop :
           filters:
             branches:
@@ -274,8 +278,9 @@ workflows:
             - arm_build_push
           filters:
             tags:
-              only: ^[\.0-9]*$
+              only: /^[\.0-9]*$/
             branches:
-              only: master
+              ignore: /.*/
+