diff --git a/.travis.yml b/.travis.yml
index 04b7523..23f53b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ jobs:
       script:
         - |
           for x in $sub_images; do
-            docker pull $DOCKER_USERNAME/my_ocrd_workflow-$x || true
-            docker tag $DOCKER_USERNAME/my_ocrd_workflow-$x my_ocrd_workflow-$x || true
+            docker pull $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT
+            docker tag $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT my_ocrd_workflow-$x
           done
 
         - curl -O https://qurator-data.de/examples/actevedef_718448162.first-page.zip
@@ -65,15 +65,21 @@ jobs:
       script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
-        - docker pull $DOCKER_USERNAME/my_ocrd_workflow:$TRAVIS_COMMIT
-        - docker tag $DOCKER_USERNAME/my_ocrd_workflow:$TRAVIS_COMMIT $DOCKER_USERNAME/my_ocrd_workflow:$DOCKER_TAG
-        - docker push $DOCKER_USERNAME/my_ocrd_workflow:$DOCKER_TAG
+        - |
+          for x in $sub_images; do
+            docker pull $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT
+            docker tag $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT my_ocrd_workflow-$x:$DOCKER_TAG
+            docker push $DOCKER_USERNAME/my_ocrd_workflow-$x:$DOCKER_TAG
+          done
 
     - stage: "Deploy Docker image - tagged"
       env: DOCKER_TAG=$TRAVIS_TAG
       script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
-        - docker pull $DOCKER_USERNAME/my_ocrd_workflow:$TRAVIS_COMMIT
-        - docker tag $DOCKER_USERNAME/my_ocrd_workflow:$TRAVIS_COMMIT $DOCKER_USERNAME/my_ocrd_workflow:$DOCKER_TAG
-        - docker push $DOCKER_USERNAME/my_ocrd_workflow:$DOCKER_TAG
+        - |
+          for x in $sub_images; do
+            docker pull $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT
+            docker tag $DOCKER_USERNAME/my_ocrd_workflow-$x:$TRAVIS_COMMIT my_ocrd_workflow-$x:$DOCKER_TAG
+            docker push $DOCKER_USERNAME/my_ocrd_workflow-$x:$DOCKER_TAG
+          done