diff --git a/.circleci/config.yml b/.circleci/config.yml
index 127bbd1..3fc2710 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,20 +46,21 @@ executors:
     machine:
       image: ubuntu-2004:202008-01
 
+parameters:
+  run_workflow_release:
+    default: false
+    type: boolean
+
 workflows:
   version: 2
   main:
     jobs:
-      - build-and-test:
-          filters:
-            tags:
-              only: /.*/
+      - build-and-test
+  release:
+    when: << pipeline.parameters.run_workflow_release >>
+    jobs:
+      - build-and-test
       - circleci-maven-release-orb/run-maven-release:
-          filters:
-            branches:
-              only: /master/
-            tags:
-              only: /.*/
           requires:
               - build-and-test
           executor: new-java-maven-executor