diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11973e6..53b16cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,7 +66,7 @@ workflows:
             branches:
               ignore: /pull\/[0-9]+/
             tags:
-              only: /.*/
+              ignore: /.*/
 
   release:
     jobs:
@@ -77,3 +77,18 @@ workflows:
               ignore: /.*/
             tags:
               only: /.*/
+      - rok8s-scripts/docker_build_and_push:
+          name: build-and-push-container
+          docker-push: true
+          enable_docker_layer_caching: false
+          config_file: .circleci/build.config
+          context: org-global
+          docker-login: true
+          password-variable: "fairwinds_quay_token"
+          registry: quay.io
+          username: fairwinds+circleci
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /.*/
\ No newline at end of file