diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 68279340b9abbc0748d361858a18bdb4706ba605..e78e7e939521279d54dd179c1876355c2e0a7a84 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -144,6 +144,10 @@ deploy-{{ machine }}:
   extends: .deploy-rsync
 {% if CI_COMMIT_TAG is defined %}
   stage: Deploy SoftwareStore
+  rules:
+    - if: $DEPLOY_RELEASE_TARGET
+      when: manual
+      allow_failure: true
   variables:
     MACHINE: {{ machine }}
     DEPLOY_SOURCE: ${RELEASE_NAME}
@@ -151,6 +155,10 @@ deploy-{{ machine }}:
     DEPLOY_TARGET_LINK: ${DEPLOY_RELEASE_TARGET_LINK}/${RELEASE_NAME}
 {% else %}
   stage: Deploy SoftwareStore Internal
+  rules:
+    - if: $DEPLOY_INTERNAL_RELEASE_TARGET
+      when: manual
+      allow_failure: true
   variables:
     MACHINE: {{ machine }}
     DEPLOY_SOURCE: ${RELEASE_NAME}