diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d39a6fcd..06060d915 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,18 +22,12 @@ jobs:
 
 workflows:
   version: 2
-  build:
+  build-and-deploy:
     jobs:
       - build
-
-  release:
-    triggers:
-      - schedules:
+      - release:
           filters:
-            branches:
-              - only: master
             tags:
-              - only: /^v.*/
-
-    jobs:
-      - release
+              only: /^v.*/
+            branches:
+              ignore: /.*/