diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 80874aa878e442d80cb569bb08e4587ad0b56eca..7ceb0c2800ad552c480d3c8ba0ae096b5d6f76c5 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -354,6 +354,19 @@ azure-{{ machine }}:
 
 generate-firmware-package-{{ machine }}:
   extends: .generate_firmware_package
+{% if CI_COMMIT_TAG is defined %}
+  rules:
+    - if: $DEPLOY_RELEASE_TARGET !~ /^./
+      when: never
+    - when: manual
+      allow_failure: true
+{% else %}
+  rules:
+    - if: $DEPLOY_INTERNAL_RELEASE_TARGET !~ /^./
+      when: never
+    - when: manual
+      allow_failure: true
+{% endif %}
   variables:
     MACHINE: {{ machine }}
   needs: