diff --git a/.travis.yml b/.travis.yml
index 3b508540..22efff3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,10 @@ after_success:
   - if [ $DOCKER_HUB_USERNAME ]; then 
       docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
       docker build -t $DOCKER_IMAGE_NAME .;
-      if [ "$TRAVIS_TAG" != "master" && -z "$TRAVIS_TAG"]; then
-        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
+      if [ ! -z "$TRAVIS_TAG" ]; then
+        docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
+      fi;
+      if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
+        docker push $DOCKER_IMAGE_NAME;
       fi;
-
-      docker push $DOCKER_IMAGE_NAME;
     fi;