diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index a25349eb56b99bbd66458d3ce24203e486b03b62..771db4345f68c12be3b43c12c0a9ea18913ef685 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -8,6 +8,7 @@ build:docker:
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   script:
     - >
       docker build \
@@ -44,14 +45,14 @@ deploy:latest:
 
 deploy:merge-request:master:
   variables:
-    TAG: $CI_REGISTRY_IMAGE:develop
+    TAG: $CI_REGISTRY_IMAGE:mr-master
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
   <<: *deploy
 
 deploy:merge-mr:develop:
   variables:
-    TAG: $CI_REGISTRY_IMAGE:develop
+    TAG: $CI_REGISTRY_IMAGE:mr-develop
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
   <<: *deploy