diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
index cc50400..4201e3d 100644
--- a/.circleci-matrix.yml
+++ b/.circleci-matrix.yml
@@ -1,3 +1,4 @@
+
 env:
   - IMAGE=android-arm
   - IMAGE=browser-asmjs
@@ -80,7 +81,7 @@ command:
       mkdir -p ~/docker; time docker save dockcross/$IMAGE > ~/docker/$IMAGE.tar
       echo "Saving dockcross/$IMAGE into ~/docker cache - done"
     fi
-    if [[ $STEP == "deployment" ]]; then
+    if [[ $STEP == "deployment" ]] && [[ "$CIRCLE_BRANCH" == "master" ]]; then
       echo "Docker login"
       docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       echo "Docker login - done"
diff --git a/circle.yml b/circle.yml
index 2b6cf7d..28db1ad 100644
--- a/circle.yml
+++ b/circle.yml
@@ -26,13 +26,8 @@ test:
         timeout: 3000
         environment:
           STEP: test
+    - circleci-matrix:
+        parallel: true
+        environment:
+          STEP: deployment
 
-deployment:
-  hub:
-    branch: master
-    commands:
-      - circleci-matrix:
-          parallel: true
-          timeout: 1800
-          environment:
-            STEP: deployment