diff --git a/.travis.yml b/.travis.yml
index cd1310eb..0fdf9a1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,20 @@ jobs:
         - docker build -t tomochain/tomomaster .
       deploy:
         provider: script
-        script: bash docker_push.sh
+        script:
+          - bash docker_push.sh latest
+          - bash docker_push.sh $TRAVIS_BUILD_ID
         on:
           branch: master
+          tags: false
+      deploy:
+        provider: script
+        script:
+          - bash docker_push.sh latest
+          - bash docker_push.sh $TRAVIS_TAG
+        on:
+          branch: master
+          tags: true
     - stage: Trigger rebuild of infrastructure images
       sudo: false
       install: skip
diff --git a/docker_push.sh b/docker_push.sh
index 117a7fb0..1f7c09bd 100644
--- a/docker_push.sh
+++ b/docker_push.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
 echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-docker tag tomochain/tomomaster tomochain/tomomaster:latest
-docker tag tomochain/tomomaster tomochain/tomomaster:$TRAVIS_BUILD_ID
-docker push tomochain/tomomaster:latest
-docker push tomochain/tomomaster:$TRAVIS_BUILD_ID
+docker tag tomochain/tomomaster tomochain/tomomaster:$1
+docker push tomochain/tomomaster:$1