diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
index da764f2..cc50400 100644
--- a/.circleci-matrix.yml
+++ b/.circleci-matrix.yml
@@ -79,10 +79,11 @@ command:
       echo "Saving dockcross/$IMAGE into ~/docker cache"
       mkdir -p ~/docker; time docker save dockcross/$IMAGE > ~/docker/$IMAGE.tar
       echo "Saving dockcross/$IMAGE into ~/docker cache - done"
-
     fi
     if [[ $STEP == "deployment" ]]; then
+      echo "Docker login"
       docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      echo "Docker login - done"
       if [[ $CIRCLE_NODE_INDEX == 0 ]] && [[ ! -f ~/BASE_PUSHED ]]; then
         echo "Pushing dockcross/base"
         time docker push dockcross/base
diff --git a/circle.yml b/circle.yml
index 743fc78..2b6cf7d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,5 +33,6 @@ deployment:
     commands:
       - circleci-matrix:
           parallel: true
+          timeout: 1800
           environment:
             STEP: deployment