diff --git a/.travis.yml b/.travis.yml
index 79b69e49..e0ef2aec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,10 @@ jobs:
               - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
               - docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty .
               - docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest
+              - if [ -n "$TRAVIS_TAG" ]; then
+                  docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:$TRAVIS_TAG;
+                  docker push plantuml/plantuml-server:$TRAVIS_TAG;
+                fi
               - docker push plantuml/plantuml-server:jetty
               - docker push plantuml/plantuml-server:latest
         - stage: docker-push