diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 040ad21381..6d30de1d63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,18 +194,25 @@ 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
+    - schedules
+    - triggers
+    - web
+
 .default-triggering-rules: &default_triggering_rules
   only:
     - api
     - merge_requests
-    - tags
-    - triggers
-    - web
-    - schedules
-
-.schedules-tags-web-triggering-rules: &schedules_tags_web_triggering_rules
-  only:
-    - api
     - schedules
     - tags
     - triggers
@@ -603,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
@@ -616,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
@@ -630,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
@@ -643,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
@@ -666,6 +673,16 @@ system:gcc:bullseye:amd64:
     - job: unit:gcc:bullseye:amd64
       artifacts: true
 
+system:gcc:bullseye:unstable:amd64:
+  <<: *debian_bullseye_amd64_image
+  <<: *system_test_job
+  <<: *api_schedules_triggers_web_triggering_rules
+  variables:
+    CI_ENABLE_ALL_TESTS: 1
+  needs:
+    - job: gcc:bullseye:amd64
+      artifacts: true
+
 unit:gcc:bullseye:amd64:
   <<: *debian_bullseye_amd64_image
   <<: *unit_test_gcov_job
@@ -676,16 +693,12 @@ unit:gcc:bullseye:amd64:
 unit:gcc:bullseye:unstable:amd64:
   <<: *debian_bullseye_amd64_image
   <<: *unit_test_job
+  <<: *api_schedules_triggers_web_triggering_rules
   variables:
     CI_ENABLE_ALL_TESTS: 1
   needs:
     - job: gcc:bullseye:amd64
       artifacts: true
-  only:
-    - api
-    - schedules
-    - triggers
-    - web
 
 # Jobs for cross-compiled GCC builds on Debian 11 "bullseye" (amd64) with
 # 32-bit libraries
@@ -790,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:
@@ -800,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)
 
@@ -820,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
@@ -831,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:
@@ -871,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
@@ -884,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
@@ -1137,16 +1150,12 @@ clang:openbsd:amd64:
 system:clang:openbsd:amd64:
   <<: *openbsd_amd64_image
   <<: *system_test_job
+  <<: *api_schedules_triggers_web_triggering_rules
   variables:
     USER: gitlab-runner
   needs:
     - job: clang:openbsd:amd64
       artifacts: true
-  only:
-    - api
-    - schedules
-    - triggers
-    - web
 
 unit:clang:openbsd:amd64:
   <<: *openbsd_amd64_image
@@ -1247,7 +1256,7 @@ coverity:
 
 respdiff:
   <<: *base_image
-  <<: *schedules_tags_web_triggering_rules
+  <<: *api_schedules_tags_triggers_web_triggering_rules
   stage: system
   variables:
     CC: gcc
@@ -1279,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