diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 976261a37f42d0bc17cd04ec4bce44a7d7dc07fb..270bfc017d2b6838f76ef29d4c3bc78fab1e369d 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -72,6 +72,7 @@ yocto-pipeline:
     - if: '$CI_COMMIT_TAG'
       variables:
         TEST_STAGE: "auto"
+    - !reference [.build-pipeline, rules]
 
 sdk-pipeline:
   extends:
@@ -84,11 +85,12 @@ sdk-pipeline:
     ARTIFACTS_PATH: build-*/tmp/deploy/sdk/*
     MANUAL_BUILD: "true"
     PACKAGE_TYPE: sdk
-  rules:
+  rules: !merge
     - if: '$CI_COMMIT_TAG'
       variables:
         MANUAL_BUILD: "false"
         DELAY_BUILD: "true"
+    - !reference [.build-pipeline, rules]
 
 fngsystem-pipeline:
   extends: