diff --git a/.travis.yml b/.travis.yml
index c4f2049f..f2c3fb9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ before_deploy:
   - git config --local user.name "$USER_NAME"
   - git config --local user.email "$USER_EMAIL"
   - if ! git tag "$TAG" "$TRAVIS_COMMIT" ; then echo "$TAG already exists"; fi
+  - if [[ "$DOCKER_BUILD" == "true" ]] ; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin hub.docker.com; fi
 
 deploy:
   - provider: releases
@@ -66,14 +67,11 @@ deploy:
 
   - provider: script
     skip_cleanup: true
-    script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin hub.docker.com
-      - docker push codercom/code-server:"$VERSION"
-      - docker push codercom/code-server:v2
+    script: docker push codercom/code-server:"$VERSION" ; docker push codercom/code-server:v2
     on:
       repo: cdr/code-server
       branch: master
-      condition: "$DOCKER_BUILD"
+      condition: "$DOCKER_BUILD" == "true"
 
 cache:
   yarn: true