diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 25cf064a9297eacde7ccf37a228b4a35d9725412..30cb495d45fd1327e93ef525877939c34c6b048e 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -51,7 +51,6 @@ workflow:
     - if: $CI_COMMIT_REF_NAME =~ /^integrate\/.*/
       when: never
     # In all other cases, run the pipeline automatically
-    - when: always
 
 .full_build_pipeline:
 
@@ -61,7 +60,6 @@ workflow:
     - if: $CI_COMMIT_REF_NAME != $MASTER_BRANCH
     - if: $CI_PIPELINE_SOURCE == "api"
     - if: $CI_PIPELINE_SOURCE == "pipeline"
-      when: manual
     - if: $CI_PIPELINE_SOURCE == "web"
     # Trigger the pipeline on schedule basis (for weekly release)
     - if: $CI_PIPELINE_SOURCE == "schedule" 
@@ -140,6 +138,9 @@ retrigger:
   extends:
     - .infrastructure
     - .full_build_pipeline
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: "manual"
   stage: build
   timeout: !reference [variables, BUILD_TIMEOUT]
   image: