diff --git a/manifest-build.yml b/manifest-build.yml
index 6a4381cfc5b457c1bf9e95c583ecec4451760508..d3d7e7c8471494195143d84c7b595b958238974b 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -167,37 +167,6 @@ variables:
     CI_PARAM_IMAGE: ${CI_PARAM_IMAGE_FNG}
     CI_PARAM_DISTRO: ${CI_PARAM_DISTRO_FNG}
 
-build:merge_request:
-  extends: .infrastructure
-  stage: build
-  timeout: 1h
-  rules:
-    - if: $CI_COMMIT_REF_NAME == $MASTER_BRANCH_MANIFEST && $CI_PIPELINE_SOURCE != "api"
-  script:
-    - cd ${CI_PROJECT_DIR}
-    # Get pipeline for merge request
-    - MR_PIPELINE=$(.gitlab-ci/scripts/get_pipelines.py
-        --gitlab-url=${CI_SERVER_URL}
-        --token=${GITBOT_TOKEN}
-        --project=${CI_PROJECT_PATH}
-        --commit=${CI_COMMIT_SHA}
-        --ref=^${MASTER_BRANCH_MANIFEST} || true | head -1)
-    # If pipeline exists, mirror its result
-    - if [ ! -z "${MR_PIPELINE}" ]; then
-        .gitlab-ci/scripts/mirror_pipeline_result.py
-          --gitlab-url=${CI_SERVER_URL}
-          --token=${GITBOT_TOKEN}
-          --project=${CI_PROJECT_PATH}
-          --pipeline=${MR_PIPELINE}
-    # If no pipeline found, trigger a new one on the master
-    - else
-        .gitlab-ci/scripts/trigger_pipeline.py
-          --gitlab-url=${CI_SERVER_URL}
-          --token=${GITBOT_TOKEN}
-          --project=${CI_PROJECT_PATH}
-          --ref=${MASTER_BRANCH_MANIFEST}
-    - fi
-
 .buildsdk:
   extends:
     - .buildimage
diff --git a/manifest.yml b/manifest.yml
index 2aa68099e62755c280609cbf16021a54815176d8..5cfad0a118b8b772480480f21eb26b379427c858 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -8,6 +8,7 @@ include:
 stages:
   - retrigger
   - infrastructure
+  - build
 
 variables:
   # Default image and distro
@@ -118,3 +119,37 @@ trigger-build-jobs:
 
 yamllint:
   extends: .yamllint
+
+# --------------------------------------------------------------------------------------
+# Stage: build
+# --------------------------------------------------------------------------------------
+build:merge_request:
+  extends: .infrastructure
+  stage: build
+  timeout: 1h
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $MASTER_BRANCH_MANIFEST && $CI_PIPELINE_SOURCE != "api"
+  script:
+    - cd ${CI_PROJECT_DIR}
+    # Get pipeline for merge request
+    - MR_PIPELINE=$(.gitlab-ci/scripts/get_pipelines.py
+        --gitlab-url=${CI_SERVER_URL}
+        --token=${GITBOT_TOKEN}
+        --project=${CI_PROJECT_PATH}
+        --commit=${CI_COMMIT_SHA}
+        --ref=^${MASTER_BRANCH_MANIFEST} || true | head -1)
+    # If pipeline exists, mirror its result
+    - if [ ! -z "${MR_PIPELINE}" ]; then
+        .gitlab-ci/scripts/mirror_pipeline_result.py
+          --gitlab-url=${CI_SERVER_URL}
+          --token=${GITBOT_TOKEN}
+          --project=${CI_PROJECT_PATH}
+          --pipeline=${MR_PIPELINE}
+    # If no pipeline found, trigger a new one on the master
+    - else
+        .gitlab-ci/scripts/trigger_pipeline.py
+          --gitlab-url=${CI_SERVER_URL}
+          --token=${GITBOT_TOKEN}
+          --project=${CI_PROJECT_PATH}
+          --ref=${MASTER_BRANCH_MANIFEST}
+    - fi