diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9223e034c7..ae9c3f3a58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,6 +194,14 @@ stages:
 
 ### Job Templates
 
+.api-schedules-tags-triggers-web-triggering-rules: &api_schedules_tags_triggers_web_triggering_rules
+  only:
+    - api
+    - schedules
+    - tags
+    - triggers
+    - web
+
 .api-schedules-triggers-web-triggering-rules: &api_schedules_triggers_web_triggering_rules
   only:
     - api
@@ -210,14 +218,6 @@ stages:
     - web
     - schedules
 
-.schedules-tags-web-triggering-rules: &schedules_tags_web_triggering_rules
-  only:
-    - api
-    - schedules
-    - tags
-    - triggers
-    - web
-
 .precheck: &precheck_job
   <<: *default_triggering_rules
   <<: *base_image
@@ -610,12 +610,12 @@ gcc:stretch:amd64:
     EXTRA_CONFIGURE: "--without-cmocka --without-gssapi"
   <<: *debian_stretch_amd64_image
   <<: *build_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
 
 system:gcc:stretch:amd64:
   <<: *debian_stretch_amd64_image
   <<: *system_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:stretch:amd64
       artifacts: true
@@ -623,7 +623,7 @@ system:gcc:stretch:amd64:
 unit:gcc:stretch:amd64:
   <<: *debian_stretch_amd64_image
   <<: *unit_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:stretch:amd64
       artifacts: true
@@ -637,12 +637,12 @@ gcc:buster:amd64:
     EXTRA_CONFIGURE: "--with-libidn2"
   <<: *debian_buster_amd64_image
   <<: *build_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
 
 system:gcc:buster:amd64:
   <<: *debian_buster_amd64_image
   <<: *system_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:buster:amd64
       artifacts: true
@@ -650,7 +650,7 @@ system:gcc:buster:amd64:
 unit:gcc:buster:amd64:
   <<: *debian_buster_amd64_image
   <<: *unit_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:buster:amd64
       artifacts: true
@@ -803,7 +803,7 @@ system:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *system_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
 
 unit:gcc:out-of-tree:
   variables:
@@ -813,7 +813,7 @@ unit:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *unit_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
 
 # Jobs for tarball GCC builds on Debian 11 "bullseye" (amd64)
 
@@ -833,7 +833,7 @@ gcc:tarball:
 system:gcc:tarball:
   <<: *base_image
   <<: *system_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   before_script:
     - cd bind-*
     - *setup_interfaces
@@ -844,7 +844,7 @@ system:gcc:tarball:
 unit:gcc:tarball:
   <<: *base_image
   <<: *unit_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   before_script:
     - cd bind-*
   needs:
@@ -884,12 +884,12 @@ gcc:bionic:amd64:
     EXTRA_CONFIGURE: "--disable-dnstap"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
 
 system:gcc:bionic:amd64:
   <<: *ubuntu_bionic_amd64_image
   <<: *system_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:bionic:amd64
       artifacts: true
@@ -897,7 +897,7 @@ system:gcc:bionic:amd64:
 unit:gcc:bionic:amd64:
   <<: *ubuntu_bionic_amd64_image
   <<: *unit_test_job
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:bionic:amd64
       artifacts: true
@@ -1256,7 +1256,7 @@ coverity:
 
 respdiff:
   <<: *base_image
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   stage: system
   variables:
     CC: gcc
@@ -1288,7 +1288,7 @@ respdiff:
 
 respdiff-third-party:
   <<: *base_image
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   stage: system
   variables:
     CC: gcc