diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01e7d75db922ae420af198056a8b3b840c446b0a..74e31863fb4946b60e5f68df2da431e007abb7c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -474,141 +474,6 @@ deploy:cp-solver:
     - docker push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
     - $DOCKER_CLI $CP_SOLVER_CLI deploy
 
-#
-deploy:ems:
-  stage: deploy
-#
-  only:
-#
-    - master
-#
-    - rc3.0
-#
-    - rc3.1
-#
-    - morphemic-rc1.5
-    - morphemic-rc2.0
-#
-  image: $DOCKER_DIND_IMAGE
-#
-  services:
-#
-    - $DOCKER_DIND_SERVICE
-#
-  dependencies:
-#
-    - build-required-part3:ems
-#
-  script:
-#
-    - $DOCKER_CLI $EMS_CLI deploy
-
-#deploy:ems-util:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part4:ems-util
-#  script:
-#    - $DOCKER_CLI $EMS_UTIL_CLI deploy
-#
-#deploy:ems-broker-client:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part7:ems-broker-client
-#  script:
-#    - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy
-#
-#deploy:ems-broker-cep:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part5:ems-broker-cep
-#  script:
-#    - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy
-#
-#deploy:ems-baguette-client:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part8:ems-baguette-client
-#    - build-required-part5:ems-broker-cep
-#  script:
-#    - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy
-#
-#deploy:ems-baguette-server:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part6:ems-baguette-server
-#  script:
-#    - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy
-#
-#deploy:ems-baguette-client-install:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part7:ems-baguette-client-install
-#  script:
-#    - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy
-#
-#deploy:ems-translator:
-#  stage: deploy
-#  only:
-#    - master
-#    - rc3.0
-#    - rc3.1
-#    - morphemic-rc1.5
-#  image: $DOCKER_DIND_IMAGE
-#  services:
-#    - $DOCKER_DIND_SERVICE
-#  dependencies:
-#    - build-required-part7:ems-translator
-#  script:
-#    - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy
-
 deploy:ems-server:
   stage: deploy
   only:
@@ -619,6 +484,8 @@ deploy:ems-server:
     - morphemic-rc2.0
     - proactive-dev
   image: $DOCKER_DIND_IMAGE
+  dependencies:
+    - build-required-part3:ems
   services:
     - $DOCKER_DIND_SERVICE
   script: