diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 2c9218d669..893cf124c9 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -438,13 +438,7 @@
 - project:
     name: opendev/puppet-cgit
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-ciwatch
@@ -515,24 +509,12 @@
 - project:
     name: opendev/puppet-etherpad_lite
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-exim
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-germqtt
@@ -547,35 +529,17 @@
 - project:
     name: opendev/puppet-gerrit
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-gerritbot
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-github
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-grafyaml
@@ -644,34 +608,17 @@
 - project:
     name: opendev/puppet-infracloud
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-ipsilon
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-iptables
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-jeepyb
@@ -687,13 +634,7 @@
 - project:
     name: opendev/puppet-jenkins
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-kerberos
@@ -837,13 +778,7 @@
 - project:
     name: opendev/puppet-nodepool
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-openafs
@@ -882,13 +817,7 @@
 - project:
     name: opendev/puppet-openstackci
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - publish-tox-docs-infra
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-openstackid
@@ -904,24 +833,12 @@
 - project:
     name: opendev/puppet-os_client_config
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-packagekit
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-pgsql_backup
@@ -937,13 +854,7 @@
 - project:
     name: opendev/puppet-phabricator
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-pip
@@ -1209,13 +1120,7 @@
 - project:
     name: opendev/puppet-zuul
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-      - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/pynotedb