diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30945f3e52a9d0fbfdff51e0d7a5d167f7c4aa2f..454d9a307543329a370fb629a2cd7a211daa86e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,14 +56,25 @@ build_reposync_branch:
   except:
     - master
 
-tag:
+tag_reposync:
   stage: tag
   tags:
     - docker-image-build
   script: "echo" # unused but this line is required by GitLab CI
   variables:
-    TO: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG # put the tag in the name
-  except:
+    CONTEXT_DIR: reposync
+    TO: $CI_REGISTRY_IMAGE/do_reposync:$CI_COMMIT_TAG
+  only:
+    - tags
+
+tag_scheduler:
+  stage: tag
+  tags:
+    - docker-image-build
+  script: "echo" # unused but this line is required by GitLab CI
+  variables:
+    CONTEXT_DIR: scheduler
+    TO: $CI_REGISTRY_IMAGE/reposync_scheduler:$CI_COMMIT_TAG
   only:
     - tags