diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 601b5c5..2c2c860 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,6 +89,8 @@ builder-job:
     - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml setup.yml --vault-password-file /tmp/vault-pass -t common -u gitlabci
   after_script:
     - rm /tmp/vault-pass
+  except:
+    - schedules
 
 
 run-setup-digitalocean:
@@ -110,9 +112,6 @@ run-setup-digitalocean:
     - rm /tmp/vault-pass
   only:
     - main
-  except:
-    - schedules
-
 
 run-setup-dev:
   extends: .run-setup
@@ -122,8 +121,6 @@ run-setup-dev:
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
   only:
     - main
-  except:
-    - schedules
 
 run-setup-devscr:
   extends: .run-setup
@@ -133,8 +130,6 @@ run-setup-devscr:
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
   only:
     - main
-  except:
-    - schedules
 
 run-setup-qa:
   extends: .run-setup
@@ -144,8 +139,6 @@ run-setup-qa:
     - echo "${ANSIBLE_VAULT_PASS_QA}" > /tmp/vault-pass
   only:
     - qa
-  except:
-    - schedules
 
 run-setup-prodnso:
   extends: .run-setup
@@ -155,8 +148,6 @@ run-setup-prodnso:
     - echo "${ANSIBLE_VAULT_PASS_PRODNSO}" > /tmp/vault-pass
   only:
     - prodnso
-  except:
-    - schedules
 
 ########
 ###   This Page: http://patorjk.com/software/taag/#p=display&f=Doom&t=kubernetes.yml
@@ -185,6 +176,8 @@ run-setup-prodnso:
     - ansible-playbook -i stage-${STAGE}-netgo-hcloud.yml kubernetes.yml --vault-password-file /tmp/vault-pass -u gitlabci
   after_script:
     - rm /tmp/vault-pass
+  except:
+    - schedules
 
 run-kubernetes-dev:
   extends: .run-kubernetes
@@ -194,8 +187,6 @@ run-kubernetes-dev:
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
   only:
     - main
-  except:
-    - schedules
 
 run-kubernetes-qa:
   extends: .run-kubernetes
@@ -205,8 +196,6 @@ run-kubernetes-qa:
     - echo "${ANSIBLE_VAULT_PASS_QA}" > /tmp/vault-pass
   only:
     - qa
-  except:
-    - schedules
 
 run-kubernetes-prodnso:
   extends: .run-kubernetes
@@ -216,8 +205,6 @@ run-kubernetes-prodnso:
     - echo "${ANSIBLE_VAULT_PASS_PRODNSO}" > /tmp/vault-pass
   only:
     - prodnso
-  except:
-    - schedules
 
 ########
 ###   http://patorjk.com/software/taag/#p=display&f=Doom&t=smardigo.yml
@@ -249,6 +236,8 @@ run-kubernetes-prodnso:
   only:
     changes:
       - smardigo/**/*
+  except:
+    - schedules
 
 run-management-update-dev:
   extends: .run-management-update
@@ -314,7 +303,6 @@ run-patchday-dev:
     - echo "${ANSIBLE_VAULT_PASS_DEV}" > /tmp/vault-pass
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: '$CI_COMMIT_BRANCH == "main"'
 
 run-patchday-qa:
   extends: .run-patchday
@@ -324,7 +312,6 @@ run-patchday-qa:
     - echo "${ANSIBLE_VAULT_PASS_QA}" > /tmp/vault-pass
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: '$CI_COMMIT_BRANCH == "qa"'
 
 run-patchday-prodnso:
   extends: .run-patchday