diff --git a/.travis.yml b/.travis.yml
index d235af859..f048ba96f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,11 +37,6 @@ after_success:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
   - chmod +x send.sh
   - ./send.sh success $WEBHOOK_URL
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then
-    docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-    docker tag humanconnection/nitro-web humanconnection/nitro-web:latest;
-    docker push humanconnection/nitro-web:latest;
-    fi
 
 after_failure:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
@@ -49,6 +44,10 @@ after_failure:
   - ./send.sh failure $WEBHOOK_URL
 
 deploy:
+  - provider: script
+    script: scripts/docker_push.sh
+    on:
+      branch: master
   - provider: script
     script: scripts/deploy.sh nitro.human-connection.org
     on:
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
new file mode 100755
index 000000000..2e5a83907
--- /dev/null
+++ b/scripts/docker_push.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+docker push humanconnection/nitro-web:latest