diff --git a/.travis.yml b/.travis.yml
index e62254f..82409aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,4 @@ script:
 after_success:
   - docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
   - |-
-    [ "$TRAVIS_BRANCH" == "master" ] && docker push $DOCKER_REPO:$TAG
+    [ "$TRAVIS_BRANCH" == "master" ] || (! [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_TAG" == "$TAG" ]) && docker push $DOCKER_REPO:$TAG