diff --git a/.travis.yml b/.travis.yml
index 12aaa2a5..deadfe65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,19 @@ script:
 - make build
 
 after_success:
-- if [ ! -s "$DOCKER_USER" ]; then
-  docker tag stefanprodan/steerer:latest stefanprodan/steerer:$TRAVIS_BRANCH-$TRAVIS_COMMIT;
-  echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
-  docker push stefanprodan/steerer:$TRAVIS_BRANCH-$TRAVIS_COMMIT;
+- if [ -z "$DOCKER_USER" ]; then
+    echo "PR build, skipping Docker Hub push";
+  else
+    docker tag stefanprodan/steerer:latest stefanprodan/steerer:${TRAVIS_COMMIT};
+    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
+    docker push stefanprodan/steerer:${TRAVIS_COMMIT};
   fi
-- if [ ! -s "$TRAVIS_TAG" ]; then
-  docker tag stefanprodan/steerer:latest stefanprodan/steerer:$TRAVIS_TAG;
-  echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
-  docker push stefanprodan/steerer:latest;
-  docker push stefanprodan/steerer:$TRAVIS_TAG;
+- if [ -z "$TRAVIS_TAG" ]; then
+    echo "Not a release, skipping Docker Hub push";
+  else
+    docker tag stefanprodan/steerer:latest stefanprodan/steerer:$TRAVIS_TAG;
+    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
+    docker push stefanprodan/steerer:latest;
+    docker push stefanprodan/steerer:$TRAVIS_TAG;
   fi
+