diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c2c860..de4d57d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,6 @@ builder-job:
   except:
     - schedules
 
-
 run-setup-digitalocean:
   extends: .run-ansible
   stage: run-setup
@@ -112,6 +111,8 @@ run-setup-digitalocean:
     - rm /tmp/vault-pass
   only:
     - main
+  except:
+    - schedules
 
 run-setup-dev:
   extends: .run-setup
@@ -302,7 +303,7 @@ run-patchday-dev:
     - export STAGE=dev
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "main"
 
 run-patchday-qa:
   extends: .run-patchday
@@ -311,7 +312,7 @@ run-patchday-qa:
     - export STAGE=qa
     - echo "${ANSIBLE_VAULT_PASS_QA}" > /tmp/vault-pass
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "qa"
 
 run-patchday-prodnso:
   extends: .run-patchday