diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index a0d1da0ba6104316b014d0321c2a9766bb6285e6..8e352a0c79be3a8e18c6ad6125d95f73b843129f 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -57,29 +57,32 @@ industrial_ci_noetic:
 ddeploy_kinetic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_KINETIC
+    - if: $DEFAULT_DISTRO == "kinetic" || $BUILD_KINETIC
       exists:
         - ddeploy.yaml
+      when: manual
 
 ddeploy_melodic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "melodic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_MELODIC
+    - if: $DEFAULT_DISTRO == "melodic" || $BUILD_MELODIC
       exists:
         - ddeploy.yaml
+      when: manual
 
 ddeploy_noetic:
   extends: .ddeploy
   rules:
-    - if: $DEPLOY && $DEFAULT_DISTRO == "noetic"
+    - if: $DEPLOY && ($DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC)
       exists:
         - ddeploy.yaml
-    - if: $DEPLOY && $BUILD_NOETIC
+    - if: $DEFAULT_DISTRO == "noetic" || $BUILD_NOETIC
       exists:
         - ddeploy.yaml
+      when: manual