diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b730810..d79ccddc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,13 +78,21 @@ workflows:
   version: 2
   build-deploy:
     jobs:
-      - checkout
+      - checkout:
+          filters:
+            tags:
+              only: /.*/
       - build:
           requires:
             - checkout
+          filters:
+            tags:
+              only: /.*/
       - deploy-production:
           requires:
             - build
           filters:
             branches:
-              only: 'master'
+              ignore: /.*/
+            tags:
+              only: /^[v|cf_].*/