diff --git a/.circleci/config.yml b/.circleci/config.yml
index 99df7aa8a..9f4c608fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,12 @@ jobs:
 workflows:
     version: 2
     tagged-build:
+        when: # One must be true to trigger
+            or:
+                - equal: [true, <<pipeline.parameters.force>>]
+                - matches: { pattern: "dev-v[0-9]+(\\.[0-9]+)*", value: << pipeline.git.tag >> }
+                - matches: { pattern: "v[0-9]+(\\.[0-9]+)*", value: << pipeline.git.tag >> }
+                - equal: ["master", << pipeline.git.branch >>]
         jobs:
             - publish:
                   context: