diff --git a/.travis.yml b/.travis.yml
index e0ef2aec..a5abc628 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ services:
 
 stages:
   - build
+  - name: docker-tag
+    if: tag IS present
   - name: docker-push
     if: branch = master
 
@@ -26,16 +28,33 @@ jobs:
               skip_cleanup: true
               on:
                   tags: true
+
+        - stage: docker-tag
+          name: jetty
+          script:
+              - if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:jetty-$TRAVIS_TAG -f Dockerfile.jetty .
+              - docker push plantuml/plantuml-server:jetty-$TRAVIS_TAG
+          on:
+              tags: true
+
+        - stage: docker-tag
+          name: tomcat
+          script:
+              - if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:tomcat-$TRAVIS_TAG -f Dockerfile.tomcat .
+              - docker push plantuml/plantuml-server:tomcat-$TRAVIS_TAG
+          on:
+              tags: true
+
         - stage: docker-push
           name: jetty
           script:
               - 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