diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 90fe3a92..69fd56b3 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -4661,11 +4661,8 @@
     timeout: 1800
 
 - job:
-    name: legacy-openstackci-beaker
+    name: legacy-openstackci-base
     parent: legacy-base
-    run: playbooks/legacy/openstackci-beaker/run
-    timeout: 3600
-    voting: false
     required-projects:
       - openstack-infra/project-config
       - openstack-infra/puppet-accessbot
@@ -4715,8 +4712,8 @@
       - openstack-infra/puppet-openafs
       - openstack-infra/puppet-openstackci
       - openstack-infra/puppet-openstack_health
-      - openstack-infra/puppet-openstack_infra_spec_helper
       - openstack-infra/puppet-openstackid
+      - openstack-infra/puppet-openstack_infra_spec_helper
       - openstack-infra/puppet-os_client_config
       - openstack-infra/puppet-packagekit
       - openstack-infra/puppet-pgsql_backup
@@ -4744,179 +4741,29 @@
       - openstack-infra/puppet-user
       - openstack-infra/puppet-zanata
       - openstack-infra/puppet-zuul
+      - openstack/openstack
+      - openstack/puppet-openstack-integration
       - openstack-infra/system-config
 
+- job:
+    name: legacy-openstackci-beaker
+    parent: legacy-openstackci-base
+    run: playbooks/legacy/openstackci-beaker/run
+    timeout: 3600
+
 - job:
     name: legacy-openstackci-beaker-centos-7
-    parent: legacy-base
+    parent: legacy-openstackci-base
     run: playbooks/legacy/openstackci-beaker-centos-7/run
     timeout: 3600
     nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/project-config
-      - openstack-infra/puppet-accessbot
-      - openstack-infra/puppet-ansible
-      - openstack-infra/puppet-apps_site
-      - openstack-infra/puppet-askbot
-      - openstack-infra/puppet-asterisk
-      - openstack-infra/puppet-bandersnatch
-      - openstack-infra/puppet-bugdaystats
-      - openstack-infra/puppet-bup
-      - openstack-infra/puppet-cgit
-      - openstack-infra/puppet-diskimage_builder
-      - openstack-infra/puppet-drupal
-      - openstack-infra/puppet-elastic_recheck
-      - openstack-infra/puppet-elasticsearch
-      - openstack-infra/puppet-ethercalc
-      - openstack-infra/puppet-etherpad_lite
-      - openstack-infra/puppet-exim
-      - openstack-infra/puppet-germqtt
-      - openstack-infra/puppet-gerrit
-      - openstack-infra/puppet-gerritbot
-      - openstack-infra/puppet-github
-      - openstack-infra/puppet-grafyaml
-      - openstack-infra/puppet-graphite
-      - openstack-infra/puppet-haveged
-      - openstack-infra/puppet-hound
-      - openstack-infra/puppet-httpd
-      - openstack-infra/puppet-infracloud
-      - openstack-infra/puppet-iptables
-      - openstack-infra/puppet-jeepyb
-      - openstack-infra/puppet-jenkins
-      - openstack-infra/puppet-kerberos
-      - openstack-infra/puppet-kibana
-      - openstack-infra/puppet-lodgeit
-      - openstack-infra/puppet-log_processor
-      - openstack-infra/puppet-logrotate
-      - openstack-infra/puppet-logstash
-      - openstack-infra/puppet-lpmqtt
-      - openstack-infra/puppet-mailman
-      - openstack-infra/puppet-mediawiki
-      - openstack-infra/puppet-meetbot
-      - openstack-infra/puppet-mosquitto
-      - openstack-infra/puppet-mqtt_statsd
-      - openstack-infra/puppet-mysql_backup
-      - openstack-infra/puppet-nodepool
-      - openstack-infra/puppet-odsreg
-      - openstack-infra/puppet-openafs
-      - openstack-infra/puppet-openstackci
-      - openstack-infra/puppet-openstack_health
-      - openstack-infra/puppet-openstack_infra_spec_helper
-      - openstack-infra/puppet-openstackid
-      - openstack-infra/puppet-os_client_config
-      - openstack-infra/puppet-packagekit
-      - openstack-infra/puppet-pgsql_backup
-      - openstack-infra/puppet-phabricator
-      - openstack-infra/puppet-pip
-      - openstack-infra/puppet-planet
-      - openstack-infra/puppet-project_config
-      - openstack-infra/puppet-ptgbot
-      - openstack-infra/puppet-redis
-      - openstack-infra/puppet-refstack
-      - openstack-infra/puppet-reviewday
-      - openstack-infra/puppet-simpleproxy
-      - openstack-infra/puppet-snmpd
-      - openstack-infra/puppet-ssh
-      - openstack-infra/puppet-ssl_cert_check
-      - openstack-infra/puppet-stackalytics
-      - openstack-infra/puppet-statusbot
-      - openstack-infra/puppet-storyboard
-      - openstack-infra/puppet-subunit2sql
-      - openstack-infra/puppet-sudoers
-      - openstack-infra/puppet-tmpreaper
-      - openstack-infra/puppet-ulimit
-      - openstack-infra/puppet-unattended_upgrades
-      - openstack-infra/puppet-unbound
-      - openstack-infra/puppet-user
-      - openstack-infra/puppet-zanata
-      - openstack-infra/puppet-zuul
-      - openstack-infra/system-config
 
 - job:
     name: legacy-openstackci-beaker-ubuntu-trusty
-    parent: legacy-base
+    parent: legacy-openstackci-base
     run: playbooks/legacy/openstackci-beaker-ubuntu-trusty/run
     timeout: 3600
     nodeset: legacy-ubuntu-trusty
-    required-projects:
-      - openstack-infra/project-config
-      - openstack-infra/puppet-accessbot
-      - openstack-infra/puppet-ansible
-      - openstack-infra/puppet-apps_site
-      - openstack-infra/puppet-askbot
-      - openstack-infra/puppet-asterisk
-      - openstack-infra/puppet-bandersnatch
-      - openstack-infra/puppet-bugdaystats
-      - openstack-infra/puppet-bup
-      - openstack-infra/puppet-cgit
-      - openstack-infra/puppet-diskimage_builder
-      - openstack-infra/puppet-drupal
-      - openstack-infra/puppet-elastic_recheck
-      - openstack-infra/puppet-elasticsearch
-      - openstack-infra/puppet-ethercalc
-      - openstack-infra/puppet-etherpad_lite
-      - openstack-infra/puppet-exim
-      - openstack-infra/puppet-germqtt
-      - openstack-infra/puppet-gerrit
-      - openstack-infra/puppet-gerritbot
-      - openstack-infra/puppet-github
-      - openstack-infra/puppet-grafyaml
-      - openstack-infra/puppet-graphite
-      - openstack-infra/puppet-haveged
-      - openstack-infra/puppet-hound
-      - openstack-infra/puppet-httpd
-      - openstack-infra/puppet-infracloud
-      - openstack-infra/puppet-iptables
-      - openstack-infra/puppet-jeepyb
-      - openstack-infra/puppet-jenkins
-      - openstack-infra/puppet-kerberos
-      - openstack-infra/puppet-kibana
-      - openstack-infra/puppet-lodgeit
-      - openstack-infra/puppet-log_processor
-      - openstack-infra/puppet-logrotate
-      - openstack-infra/puppet-logstash
-      - openstack-infra/puppet-lpmqtt
-      - openstack-infra/puppet-mailman
-      - openstack-infra/puppet-mediawiki
-      - openstack-infra/puppet-meetbot
-      - openstack-infra/puppet-mosquitto
-      - openstack-infra/puppet-mqtt_statsd
-      - openstack-infra/puppet-mysql_backup
-      - openstack-infra/puppet-nodepool
-      - openstack-infra/puppet-odsreg
-      - openstack-infra/puppet-openafs
-      - openstack-infra/puppet-openstackci
-      - openstack-infra/puppet-openstack_health
-      - openstack-infra/puppet-openstack_infra_spec_helper
-      - openstack-infra/puppet-openstackid
-      - openstack-infra/puppet-os_client_config
-      - openstack-infra/puppet-packagekit
-      - openstack-infra/puppet-pgsql_backup
-      - openstack-infra/puppet-phabricator
-      - openstack-infra/puppet-pip
-      - openstack-infra/puppet-planet
-      - openstack-infra/puppet-project_config
-      - openstack-infra/puppet-ptgbot
-      - openstack-infra/puppet-redis
-      - openstack-infra/puppet-refstack
-      - openstack-infra/puppet-reviewday
-      - openstack-infra/puppet-simpleproxy
-      - openstack-infra/puppet-snmpd
-      - openstack-infra/puppet-ssh
-      - openstack-infra/puppet-ssl_cert_check
-      - openstack-infra/puppet-stackalytics
-      - openstack-infra/puppet-statusbot
-      - openstack-infra/puppet-storyboard
-      - openstack-infra/puppet-subunit2sql
-      - openstack-infra/puppet-sudoers
-      - openstack-infra/puppet-tmpreaper
-      - openstack-infra/puppet-ulimit
-      - openstack-infra/puppet-unattended_upgrades
-      - openstack-infra/puppet-unbound
-      - openstack-infra/puppet-user
-      - openstack-infra/puppet-zanata
-      - openstack-infra/puppet-zuul
-      - openstack-infra/system-config
 
 - job:
     name: legacy-osbackup-freezer-api-dsvm
@@ -6464,38 +6311,26 @@
 
 - job:
     name: legacy-puppet-openstackci-puppet-beaker-rspec
-    parent: legacy-puppet-openstack-integration
+    parent: legacy-openstackci-base
     run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run
     post-run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/post
     timeout: 3600
-    required-projects:
-      - openstack-infra/puppet-openstackci
-      - openstack/openstack
-      - openstack/puppet-openstack-integration
 
 - job:
     name: legacy-puppet-openstackci-puppet-beaker-rspec-centos-7
-    parent: legacy-puppet-openstack-integration
+    parent: legacy-openstackci-base
     run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run
     post-run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/post
     timeout: 3600
     nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/puppet-openstackci
-      - openstack/openstack
-      - openstack/puppet-openstack-integration
 
 - job:
     name: legacy-puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty
-    parent: legacy-puppet-openstack-integration
+    parent: legacy-openstackci-base
     run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run
     post-run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/post
     timeout: 3600
     nodeset: legacy-ubuntu-trusty
-    required-projects:
-      - openstack-infra/puppet-openstackci
-      - openstack/openstack
-      - openstack/puppet-openstack-integration
 
 - job:
     name: legacy-puppet-storyboard-forge-upload