diff --git a/.circleci/config.yml b/.circleci/config.yml
index 48bb06d7aa..9fe6baa494 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,9 @@ workflows:
         - test
         - build
         - lint
+        filters:
+          branches:
+            only: master
     - publish-master:
         requires:
         - test
@@ -103,8 +106,10 @@ jobs:
       - run:
           name: Push Images
           command: |
-            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
-            make push-images
+            if [ -n "$DOCKER_USER" ]; then
+              docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
+              make push-images
+            fi
 
   publish-master:
     <<: *defaults