diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0b53bdb74c..2c9218d669 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -71,7 +71,7 @@
 - project:
     name: opendev/ansible-role-puppet
     templates:
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
 
 - project:
     name: opendev/askbot-theme
@@ -351,8 +351,8 @@
     name: opendev/puppet-accessbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -362,8 +362,8 @@
     name: opendev/puppet-ansible
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -373,8 +373,8 @@
     name: opendev/puppet-apparmor
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -384,8 +384,8 @@
     name: opendev/puppet-askbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -395,8 +395,8 @@
     name: opendev/puppet-asterisk
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -406,8 +406,8 @@
     name: opendev/puppet-bandersnatch
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -417,8 +417,8 @@
     name: opendev/puppet-bugdaystats
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -428,8 +428,8 @@
     name: opendev/puppet-bup
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -439,8 +439,8 @@
     name: opendev/puppet-cgit
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -450,8 +450,8 @@
     name: opendev/puppet-ciwatch
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -461,8 +461,8 @@
     name: opendev/puppet-diskimage_builder
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -472,8 +472,8 @@
     name: opendev/puppet-drupal
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -483,8 +483,8 @@
     name: opendev/puppet-elastic_recheck
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -494,8 +494,8 @@
     name: opendev/puppet-elasticsearch
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -505,8 +505,8 @@
     name: opendev/puppet-ethercalc
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -516,8 +516,8 @@
     name: opendev/puppet-etherpad_lite
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -527,8 +527,8 @@
     name: opendev/puppet-exim
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -538,7 +538,7 @@
     name: opendev/puppet-germqtt
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -548,8 +548,8 @@
     name: opendev/puppet-gerrit
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -559,8 +559,8 @@
     name: opendev/puppet-gerritbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -570,8 +570,8 @@
     name: opendev/puppet-github
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -581,8 +581,8 @@
     name: opendev/puppet-grafyaml
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -592,8 +592,8 @@
     name: opendev/puppet-graphite
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -603,8 +603,8 @@
     name: opendev/puppet-haveged
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -614,8 +614,8 @@
     name: opendev/puppet-hound
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -625,8 +625,8 @@
     name: opendev/puppet-httpd
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -645,8 +645,7 @@
     name: opendev/puppet-infracloud
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra-nv
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -656,8 +655,8 @@
     name: opendev/puppet-ipsilon
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -667,8 +666,8 @@
     name: opendev/puppet-iptables
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -678,8 +677,8 @@
     name: opendev/puppet-jeepyb
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -689,8 +688,8 @@
     name: opendev/puppet-jenkins
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -700,8 +699,8 @@
     name: opendev/puppet-kerberos
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -711,8 +710,8 @@
     name: opendev/puppet-kibana
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -722,8 +721,8 @@
     name: opendev/puppet-lodgeit
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -733,8 +732,8 @@
     name: opendev/puppet-log_processor
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -744,7 +743,7 @@
     name: opendev/puppet-logrotate
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -754,8 +753,8 @@
     name: opendev/puppet-logstash
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -765,7 +764,7 @@
     name: opendev/puppet-lpmqtt
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -775,8 +774,8 @@
     name: opendev/puppet-mailman
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -786,8 +785,8 @@
     name: opendev/puppet-mediawiki
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -797,8 +796,8 @@
     name: opendev/puppet-meetbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -808,7 +807,7 @@
     name: opendev/puppet-mosquitto
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -818,7 +817,7 @@
     name: opendev/puppet-mqtt_statsd
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -828,8 +827,8 @@
     name: opendev/puppet-mysql_backup
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -839,8 +838,8 @@
     name: opendev/puppet-nodepool
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -850,8 +849,8 @@
     name: opendev/puppet-openafs
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -861,8 +860,8 @@
     name: opendev/puppet-openstack_health
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -884,7 +883,7 @@
     name: opendev/puppet-openstackci
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
       - publish-tox-docs-infra
     check:
       queue: system-config
@@ -895,8 +894,8 @@
     name: opendev/puppet-openstackid
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -906,8 +905,8 @@
     name: opendev/puppet-os_client_config
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -917,8 +916,8 @@
     name: opendev/puppet-packagekit
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -928,8 +927,8 @@
     name: opendev/puppet-pgsql_backup
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -939,8 +938,8 @@
     name: opendev/puppet-phabricator
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -950,8 +949,8 @@
     name: opendev/puppet-pip
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -961,8 +960,8 @@
     name: opendev/puppet-planet
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -972,8 +971,8 @@
     name: opendev/puppet-project_config
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -983,8 +982,8 @@
     name: opendev/puppet-ptgbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -994,8 +993,8 @@
     name: opendev/puppet-puppet
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1005,8 +1004,8 @@
     name: opendev/puppet-redis
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1016,7 +1015,7 @@
     name: opendev/puppet-refstack
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
+      - system-config-puppet-apply-jobs
     check:
       queue: system-config
     gate:
@@ -1026,8 +1025,8 @@
     name: opendev/puppet-reviewday
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1037,8 +1036,8 @@
     name: opendev/puppet-simpleproxy
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1048,8 +1047,8 @@
     name: opendev/puppet-snmpd
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1059,8 +1058,8 @@
     name: opendev/puppet-ssh
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1070,8 +1069,8 @@
     name: opendev/puppet-ssl_cert_check
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1081,8 +1080,8 @@
     name: opendev/puppet-statusbot
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1092,8 +1091,8 @@
     name: opendev/puppet-storyboard
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1103,8 +1102,8 @@
     name: opendev/puppet-subunit2sql
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1114,8 +1113,8 @@
     name: opendev/puppet-sudoers
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1125,8 +1124,8 @@
     name: opendev/puppet-tmpreaper
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1136,8 +1135,8 @@
     name: opendev/puppet-translation_checksite
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1147,8 +1146,8 @@
     name: opendev/puppet-ulimit
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1158,8 +1157,8 @@
     name: opendev/puppet-unattended_upgrades
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1169,8 +1168,8 @@
     name: opendev/puppet-unbound
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1180,8 +1179,8 @@
     name: opendev/puppet-user
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1200,8 +1199,8 @@
     name: opendev/puppet-zanata
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -1211,8 +1210,8 @@
     name: opendev/puppet-zuul
     templates:
       - infra-puppet-check-jobs
-      - infra-puppet-apply-jobs
-      - puppet-beaker-jobs-xenial-infra
+      - system-config-puppet-apply-jobs
+      - system-config-puppet-beaker-jobs
     check:
       queue: system-config
     gate:
@@ -2130,7 +2129,7 @@
 - project:
     name: openstack/logstash-filters
     templates:
-      - infra-logstash-filter-jobs
+      - system-config-logstash-filter-jobs
 
 - project:
     name: openstack/magnum