diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f078245cc4f3c629555d328d2d922955f94d5a4..218423a5beaa925901b97cc679e3b1de3f051823 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -341,6 +341,7 @@ setup-openappstack:
     - pytest -v -s -m 'kustomizations' --app="$APP" --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*' --reruns 120 --reruns-delay 20
   extends:
     - .ssh_setup
+    - .general_rules
   interruptible: true
 
 base-kustomizations-ready:
@@ -372,6 +373,7 @@ base-kustomizations-ready:
     - job: test-dns
   extends:
     - .helm-release
+    - .general_rules
 
 cert-manager-helm-release:
   variables:
diff --git a/.gitlab/issue_templates/update_all_components.md b/.gitlab/issue_templates/update_all_components.md
index 430f376561ab3a685567112d32487d88f558e25a..d7628fb8e7762cde98cba41b8b7db3a64e108af0 100644
--- a/.gitlab/issue_templates/update_all_components.md
+++ b/.gitlab/issue_templates/update_all_components.md
@@ -1,8 +1,11 @@
 To update all applications, check the following files:
 
-* [ ] Docker image in `Dockerfile`
-* [ ] requirements.txt
-* [ ] mitogen in `ansible/plugins`
+* [ ] Docker base image in `Dockerfile` (`FROM`)
+* [ ] All app versions in `Dockerfile`, especially:
+  * [ ] flux (Make sure the version is the same as in `ansible/group_vars/all/oas.yml`, `flux.version`)
+* [ ] `requirements.in`
+  * [ ] Run `pip install -r requirements-dev.txt && pip-compile`
+* [ ] mitogen version in `ansible/plugins`
 
 In `group_vars/all/oas.yml`:
 
@@ -13,19 +16,6 @@ In `group_vars/all/oas.yml`:
 
 Installed by flux:
 
-* [ ] ./kube-system/metallb.yaml
-* [ ] ./kube-system/local-path-provisioner.yaml
-* [ ] ./oas/grafana.yaml
-* [ ] ./oas/letsencrypt-production.yaml
-* [ ] ./oas/single-sign-on.yaml
-* [ ] ./oas/prometheus.yaml
-* [ ] ./oas/letsencrypt-staging.yaml
-* [ ] ./oas/ingress.yaml
-* [ ] ./oas/loki.yaml
-* [ ] ./oas/promtail.yaml
-* [ ] ./velero/velero.yaml
-* [ ] ./oas-custom/flux-custom.yaml
-* [ ] ./cert-manager/cert-manager.yaml
-* [ ] ./oas-apps/nextcloud.yaml (make sure to also update our nextcloud helm chart)
-* [ ] ./oas-apps/wordpress.yaml (make sure that our wordpress chart installs the newest version)
-* [ ] ./oas-apps/rocketchat.yaml
+* [ ] Run `find flux2 -name '*release*.yaml'` and paste the resulting list here
+* [ ] make sure to also update our [nextcloud helm chart](https://open.greenhost.net/openappstack/nextcloud)
+* [ ] make sure that our wordpress chart installs the newest version