diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f1a148abe9..2f36abf252 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -90,9 +90,7 @@
 - project:
     name: opendev/germqtt
     templates:
-      - openstack-python-jobs-no-constraints
-      - openstack-python35-jobs-no-constraints
-      - publish-to-pypi
+      - noop-jobs
 
 - project:
     name: opendev/gerritbot
@@ -234,9 +232,7 @@
 - project:
     name: opendev/lpmqtt
     templates:
-      - openstack-python-jobs-no-constraints
-      - openstack-python35-jobs-no-constraints
-      - publish-to-pypi
+      - noop-jobs
 
 - project:
     name: opendev/meetbot
@@ -246,8 +242,7 @@
 - project:
     name: opendev/mqtt_statsd
     templates:
-      - openstack-python-jobs-no-constraints
-      - publish-to-pypi
+      - noop-jobs
 
 - project:
     name: opendev/project-config-example
@@ -277,57 +272,27 @@
 - project:
     name: opendev/puppet-apparmor
     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-askbot
     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-asterisk
     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-bandersnatch
     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-bugdaystats
     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-bup
@@ -343,24 +308,12 @@
 - project:
     name: opendev/puppet-ciwatch
     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-diskimage_builder
     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-elastic_recheck
@@ -398,56 +351,27 @@
 - project:
     name: opendev/puppet-germqtt
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-grafyaml
     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-graphite
     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-haveged
     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-hound
     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-httpd
@@ -464,10 +388,6 @@
     name: opendev/puppet-infra-cookiecutter
     templates:
       - noop-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-jeepyb
@@ -483,24 +403,12 @@
 - 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
     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-kibana
@@ -516,13 +424,7 @@
 - project:
     name: opendev/puppet-lodgeit
     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-log_processor
@@ -559,65 +461,32 @@
 - project:
     name: opendev/puppet-lpmqtt
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-mailman
     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-mediawiki
     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-meetbot
     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-mosquitto
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-mqtt_statsd
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-mysql_backup
@@ -633,24 +502,12 @@
 - 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
     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-openstack_health
@@ -678,24 +535,12 @@
 - project:
     name: opendev/puppet-openstackci
     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
     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
@@ -711,13 +556,7 @@
 - project:
     name: opendev/puppet-planet
     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-project_config
@@ -733,24 +572,12 @@
 - project:
     name: opendev/puppet-ptgbot
     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-puppet
     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-redis
@@ -766,12 +593,7 @@
 - project:
     name: opendev/puppet-refstack
     templates:
-      - infra-puppet-check-jobs
-      - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+      - noop-jobs
 
 - project:
     name: opendev/puppet-reviewday
@@ -809,24 +631,12 @@
 - project:
     name: opendev/puppet-ssl_cert_check
     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-statusbot
     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-storyboard
@@ -853,13 +663,7 @@
 - project:
     name: opendev/puppet-sudoers
     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-tmpreaper
@@ -875,13 +679,7 @@
 - project:
     name: opendev/puppet-translation_checksite
     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-ulimit
@@ -897,24 +695,12 @@
 - project:
     name: opendev/puppet-unattended_upgrades
     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-unbound
     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-user
@@ -950,13 +736,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/python-storyboardclient