diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 384c61c..3aefa93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -289,7 +289,6 @@ run-management-update-prodnso:
   after_script:
     - rm /tmp/vault-pass
   timeout: 2h
-  when: manual
 
 run-patchday-dev:
   extends: .run-patchday
@@ -297,8 +296,9 @@ run-patchday-dev:
   before_script:
     - export STAGE=dev
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
-  only:
-    - main
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_COMMIT_BRANCH == "main"'
 
 run-patchday-qa:
   extends: .run-patchday
@@ -306,8 +306,9 @@ run-patchday-qa:
   before_script:
     - export STAGE=qa
     - echo "${ANSIBLE_VAULT_PASS_QA}" > /tmp/vault-pass
-  only:
-    - qa
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_COMMIT_BRANCH == "qa"'
 
 run-patchday-prodnso:
   extends: .run-patchday
@@ -317,3 +318,4 @@ run-patchday-prodnso:
     - echo "${ANSIBLE_VAULT_PASS_PRODNSO}" > /tmp/vault-pass
   only:
     - prodnso
+  when: manual