diff --git a/.travis.yml b/.travis.yml
index 22efff3d..b7a7d35e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,18 @@ deploy:
 after_success:
   - if [ $DOCKER_HUB_USERNAME ]; then 
       docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
+
+      if [ ! -z "$TRAVIS_TAG" ]; then
+        DOCKER_IMAGE_TAG=$TRAVIS_TAG;
+      else
+        DOCKER_IMAGE_TAG=unstable;
+      fi;
       docker build -t $DOCKER_IMAGE_NAME .;
       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;
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest;
+      else
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:unstable;
       fi;
     fi;
+
diff --git a/docker-run.sh b/docker-run.sh
index 6e70a77b..088a9f8f 100644
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -42,5 +42,4 @@ if [[ -n "$VALIDATOR_URL" ]]; then
   sed -i "s|\(url: url,.*\)|\1\n        validatorUrl: \"${VALIDATOR_URL}\",|g" $INDEX_FILE
 fi
 
-#exec http-server -p $PORT $*
 exec nginx -g 'daemon off;'
\ No newline at end of file