diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 126eb6ce509f93c8cb3a1e177d0d4fb187616c2b..dd49bffedc0db832ddb3674858f98d65f01ebfc4 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -359,7 +359,6 @@ azure-documentation:
   variables:
     ASSOCIATED_PACKAGE_JOB: package-documentation
   needs:
-    - job: deploy-documentation
     - job: package-documentation
       artifacts: false
     - job: build-version
@@ -374,7 +373,6 @@ azure-{{ machine }}:
   needs:
     - job: package-{{ machine }}
       artifacts: false
-    - job: deploy-{{ machine }}
     - job: build-version
 
 {% endfor %}
@@ -419,13 +417,14 @@ deploy-firmware-package-{{ machine }}:
     ASSOCIATED_PACKAGE_JOB: generate-firmware-package-{{ machine }}
 {% if CI_COMMIT_TAG is defined %}
   rules:
+    - if: $DEPLOY_RELEASE_TARGET !~ /^./
+      when: never
     - when: on_success
       allow_failure: true
 {% endif %}
   needs:
     - job: generate-firmware-package-{{ machine }}
       artifacts: false
-    - deploy-{{ machine }}
     - job: build-version
 
 {% endfor %}