diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 35a76cb5e0..eb6c83bb4e 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -19,10 +19,7 @@
 
 - project:
     name: ^starlingx/.*$
-    check:
-      queue: starlingx
-    gate:
-      queue: starlingx
+    queue: starlingx
 
 - project:
     name: ansible/ansible
@@ -115,13 +112,10 @@
 
 - project:
     name: opendev/glean
+    queue: glean
     templates:
       - publish-tox-docs-infra
       - publish-to-pypi
-    check:
-      queue: glean
-    gate:
-      queue: glean
 
 - project:
     name: opendev/grafyaml
@@ -309,230 +303,168 @@
 
 - project:
     name: opendev/puppet-bup
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-elastic_recheck
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-ethercalc
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-httpd
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-jeepyb
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-logrotate
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-mysql_backup
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-openstack_health
+    queue: system-config
     templates:
       - noop-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-openstack_infra_spec_helper
+    queue: system-config
     check:
-      queue: system-config
       jobs:
         - legacy-puppet-openstack-infra-spec-helper-unit
-
     gate:
-      queue: system-config
       jobs:
         - legacy-puppet-openstack-infra-spec-helper-unit
 
 - project:
     name: opendev/puppet-pip
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-project_config
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-redis
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-reviewday
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-simpleproxy
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-ssh
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-storyboard
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-tmpreaper
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-ulimit
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-user
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-vcsrepo
+    queue: system-config
     templates:
       - noop-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/puppet-zanata
+    queue: system-config
     templates:
       - infra-puppet-check-jobs
       - system-config-puppet-apply-jobs
       - system-config-puppet-beaker-jobs
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
 
 - project:
     name: opendev/python-storyboardclient
@@ -594,10 +526,7 @@
 
 - project:
     name: opendev/system-config
-    check:
-      queue: system-config
-    gate:
-      queue: system-config
+    queue: system-config
 
 - project:
     name: opendev/yaml2ical
@@ -734,13 +663,10 @@
 
 - project:
     name: openstack/ansible-role-container-registry
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/ansible-role-lunasa-hsm
@@ -812,13 +738,10 @@
 
 - project:
     name: openstack/ansible-role-tripleo-modify-image
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/ansible-role-uwsgi
@@ -866,16 +789,13 @@
 
 - project:
     name: openstack/barbican
+    queue: barbican
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - api-guide-jobs
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: barbican
-    gate:
-      queue: barbican
 
 - project:
     name: openstack/barbican-specs
@@ -884,13 +804,10 @@
 
 - project:
     name: openstack/barbican-tempest-plugin
+    queue: barbican
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: barbican
-    gate:
-      queue: barbican
 
 - project:
     name: openstack/barbican-ui
@@ -911,14 +828,11 @@
 
 - project:
     name: openstack/blazar
+    queue: blazar
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
       - api-ref-jobs
-    check:
-      queue: blazar
-    gate:
-      queue: blazar
 
 - project:
     name: openstack/blazar-dashboard
@@ -939,13 +853,10 @@
 
 - project:
     name: openstack/blazar-tempest-plugin
+    queue: blazar
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: blazar
-    gate:
-      queue: blazar
 
 - project:
     name: openstack/bugdaystats
@@ -970,16 +881,13 @@
 
 - project:
     name: openstack/ceilometer
+    queue: telemetry
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
       - translation-jobs-master-only
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: telemetry
-    gate:
-      queue: telemetry
 
 - project:
     name: openstack/ceilometer-powervm
@@ -1769,16 +1677,13 @@
 
 - project:
     name: openstack/cinder
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
       - periodic-jobs-with-oslo-master
       - translation-jobs-master-only
       - api-ref-jobs
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/cinder-specs
@@ -1787,13 +1692,10 @@
 
 - project:
     name: openstack/cinder-tempest-plugin
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/cinderlib
@@ -1809,13 +1711,10 @@
 
 - project:
     name: openstack/cloudkitty
+    queue: cloudkitty
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: cloudkitty
-    gate:
-      queue: cloudkitty
 
 - project:
     name: openstack/cloudkitty-dashboard
@@ -1831,13 +1730,10 @@
 
 - project:
     name: openstack/cloudkitty-tempest-plugin
+    queue: cloudkitty
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: cloudkitty
-    gate:
-      queue: cloudkitty
 
 - project:
     name: openstack/compute-hyperv
@@ -1969,13 +1865,10 @@
 
 - project:
     name: openstack/cyborg-tempest-plugin
+    queue: cyborg
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: cyborg
-    gate:
-      queue: cyborg
 
 - project:
     name: openstack/debtcollector
@@ -1985,16 +1878,13 @@
 
 - project:
     name: openstack/designate
+    queue: designate
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - api-ref-jobs
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: designate
-    gate:
-      queue: designate
 
 - project:
     name: openstack/designate-dashboard
@@ -2010,20 +1900,14 @@
 
 - project:
     name: openstack/designate-tempest-plugin
+    queue: designate
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: designate
-    gate:
-      queue: designate
 
 - project:
     name: openstack/devstack
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
+    queue: integrated
     periodic:
       jobs:
         - propose-updates:
@@ -2089,36 +1973,27 @@
 
 - project:
     name: openstack/diskimage-builder
+    queue: glean
     templates:
       - official-openstack-repo-jobs
       - publish-openstack-docs-pti
       - publish-to-pypi
-    check:
-      queue: glean
-    gate:
-      queue: glean
 
 - project:
     name: openstack/ec2-api
+    queue: ec2-api
     templates:
       - install-guide-jobs
       - api-ref-jobs
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: ec2-api
-    gate:
-      queue: ec2-api
 
 - project:
     name: openstack/ec2api-tempest-plugin
+    queue: ec2-api
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: ec2-api
-    gate:
-      queue: ec2-api
 
 - project:
     name: openstack/election
@@ -2139,13 +2014,10 @@
 
 - project:
     name: openstack/freezer
+    queue: freezer
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: freezer
-    gate:
-      queue: freezer
 
 - project:
     name: openstack/freezer-api
@@ -2167,13 +2039,10 @@
 
 - project:
     name: openstack/freezer-tempest-plugin
+    queue: freezer
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: freezer
-    gate:
-      queue: freezer
 
 - project:
     name: openstack/freezer-web-ui
@@ -2190,16 +2059,13 @@
 
 - project:
     name: openstack/glance
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
       - periodic-jobs-with-oslo-master
       - translation-jobs-master-only
       - api-ref-jobs
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/glance-specs
@@ -2246,10 +2112,7 @@
 
 - project:
     name: openstack/grenade
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
 
@@ -2266,6 +2129,7 @@
 
 - project:
     name: openstack/heat
+    queue: heat
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
@@ -2273,10 +2137,6 @@
       - api-ref-jobs
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: heat
-    gate:
-      queue: heat
 
 - project:
     name: openstack/heat-agents
@@ -2309,13 +2169,10 @@
 
 - project:
     name: openstack/heat-tempest-plugin
+    queue: heat
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: heat
-    gate:
-      queue: heat
 
 - project:
     name: openstack/heat-templates
@@ -2330,14 +2187,11 @@
 
 - project:
     name: openstack/horizon
+    queue: horizon
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-stable
       - publish-to-pypi
-    check:
-      queue: horizon
-    gate:
-      queue: horizon
 
 - project:
     name: openstack/i18n
@@ -2352,22 +2206,22 @@
 
 - project:
     name: openstack/instack-undercloud
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi-stable-only
     check:
-      queue: tripleo
       jobs:
         - noop:
             branches: master
     gate:
-      queue: tripleo
       jobs:
         - noop:
             branches: master
 
 - project:
     name: openstack/ironic
+    queue: ironic
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
@@ -2375,22 +2229,15 @@
       - api-ref-jobs
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: ironic
-    gate:
-      queue: ironic
 
 - project:
     name: openstack/ironic-inspector
+    queue: ironic
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
       - api-ref-jobs
-    check:
-      queue: ironic
-    gate:
-      queue: ironic
 
 - project:
     name: openstack/ironic-inspector-specs
@@ -2428,13 +2275,10 @@
 
 - project:
     name: openstack/ironic-tempest-plugin
+    queue: ironic
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: ironic
-    gate:
-      queue: ironic
 
 - project:
     name: openstack/ironic-ui
@@ -2473,16 +2317,13 @@
 
 - project:
     name: openstack/keystone
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
       - periodic-jobs-with-oslo-master
       - translation-jobs-master-only
       - api-ref-jobs
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/keystone-specs
@@ -2491,13 +2332,10 @@
 
 - project:
     name: openstack/keystone-tempest-plugin
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/keystoneauth
@@ -2526,13 +2364,10 @@
 
 - project:
     name: openstack/kuryr
+    queue: kuryr
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: kuryr
-    gate:
-      queue: kuryr
 
 - project:
     name: openstack/kuryr-kubernetes
@@ -2548,13 +2383,10 @@
 
 - project:
     name: openstack/kuryr-tempest-plugin
+    queue: kuryr
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: kuryr
-    gate:
-      queue: kuryr
 
 - project:
     name: openstack/ldappool
@@ -2579,16 +2411,13 @@
 
 - project:
     name: openstack/magnum
+    queue: magnum
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - install-guide-jobs
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: magnum
-    gate:
-      queue: magnum
 
 - project:
     name: openstack/magnum-specs
@@ -2597,13 +2426,10 @@
 
 - project:
     name: openstack/magnum-tempest-plugin
+    queue: magnum
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: magnum
-    gate:
-      queue: magnum
 
 - project:
     name: openstack/magnum-ui
@@ -2690,13 +2516,10 @@
 
 - project:
     name: openstack/mistral
+    queue: mistral
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: mistral
-    gate:
-      queue: mistral
 
 - project:
     name: openstack/mistral-dashboard
@@ -2723,13 +2546,10 @@
 
 - project:
     name: openstack/mistral-tempest-plugin
+    queue: mistral
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: mistral
-    gate:
-      queue: mistral
 
 - project:
     name: openstack/molteniron
@@ -2745,14 +2565,11 @@
 
 - project:
     name: openstack/monasca-api
+    queue: monasca
     templates:
       - api-ref-jobs
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: monasca
 
 - project:
     name: openstack/monasca-ceilometer
@@ -2770,25 +2587,19 @@
 
 - project:
     name: openstack/monasca-common
+    queue: monasca
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: monasca
 
 - project:
     name: openstack/monasca-events-api
+    queue: monasca
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: monasca
 
 - project:
     name: openstack/monasca-grafana-datasource
@@ -2805,16 +2616,15 @@
 
 - project:
     name: openstack/monasca-log-api
+    queue: monasca
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi-stable-only
     check:
-      queue: monasca
       jobs:
         - noop:
             branches: master
     gate:
-      queue: monasca
       jobs:
         - noop:
             branches: master
@@ -2844,13 +2654,10 @@
 
 - project:
     name: openstack/monasca-tempest-plugin
+    queue: monasca
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: monasca
 
 - project:
     name: openstack/monasca-thresh
@@ -2885,16 +2692,13 @@
 
 - project:
     name: openstack/murano
+    queue: murano
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - periodic-jobs-with-oslo-master
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: murano
 
 - project:
     name: openstack/murano-agent
@@ -2928,13 +2732,10 @@
 
 - project:
     name: openstack/murano-tempest-plugin
+    queue: murano
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: monasca
-    gate:
-      queue: murano
 
 - project:
     name: openstack/networking-bagpipe
@@ -2971,13 +2772,10 @@
 
 - project:
     name: openstack/networking-generic-switch
+    queue: networking-generic-switch
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: networking-generic-switch
-    gate:
-      queue: networking-generic-switch
 
 - project:
     name: openstack/networking-hyperv
@@ -3048,6 +2846,7 @@
 
 - project:
     name: openstack/neutron
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
@@ -3055,10 +2854,6 @@
       - periodic-jobs-with-neutron-lib-master
       - periodic-jobs-with-ovsdbapp-master
       - translation-jobs-master-only
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/neutron-dynamic-routing
@@ -3097,13 +2892,10 @@
 
 - project:
     name: openstack/neutron-tempest-plugin
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/neutron-vpnaas
@@ -3131,6 +2923,7 @@
 
 - project:
     name: openstack/nova
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
@@ -3138,10 +2931,6 @@
       - translation-jobs-master-only
       - api-guide-jobs
       - api-ref-jobs
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/nova-powervm
@@ -3159,16 +2948,13 @@
 
 - project:
     name: openstack/octavia
+    queue: octavia
     templates:
       - official-openstack-repo-jobs
       - periodic-jobs-with-oslo-master
       - translation-jobs-master-only
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: octavia
-    gate:
-      queue: octavia
 
 - project:
     name: openstack/octavia-dashboard
@@ -3179,23 +2965,17 @@
 
 - project:
     name: openstack/octavia-lib
+    queue: octavia
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: octavia
-    gate:
-      queue: octavia
 
 - project:
     name: openstack/octavia-tempest-plugin
+    queue: octavia
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: octavia
-    gate:
-      queue: octavia
 
 - project:
     name: openstack/openstack
@@ -3693,13 +3473,10 @@
 
 - project:
     name: openstack/openstacksdk
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/operations-guide
@@ -3715,13 +3492,10 @@
 
 - project:
     name: openstack/os-apply-config
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/os-brick
@@ -3737,13 +3511,10 @@
 
 - project:
     name: openstack/os-collect-config
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/os-ken
@@ -3753,13 +3524,10 @@
 
 - project:
     name: openstack/os-net-config
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/os-performance-tools
@@ -3769,13 +3537,10 @@
 
 - project:
     name: openstack/os-refresh-config
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/os-resource-classes
@@ -3809,13 +3574,10 @@
 
 - project:
     name: openstack/os-win
+    queue: os-win
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: os-win
-    gate:
-      queue: os-win
 
 - project:
     name: openstack/osc-lib
@@ -4008,13 +3770,10 @@
 
 - project:
     name: openstack/oswin-tempest-plugin
+    queue: os-win
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: os-win
-    gate:
-      queue: os-win
 
 - project:
     name: openstack/ovn-octavia-provider
@@ -4050,16 +3809,15 @@
 
 - project:
     name: openstack/paunch
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi-stable-only
     check:
-      queue: tripleo
       jobs:
         - noop:
             branches: master
     gate:
-      queue: tripleo
       jobs:
         - noop:
             branches: master
@@ -4077,19 +3835,16 @@
 
 - project:
     name: openstack/placement
+    queue: integrated
     templates:
       - api-ref-jobs
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/project-config
+    queue: project-config
     check:
-      queue: project-config
       jobs:
         - opendev-buildset-registry
         - build-openstack-specs-site:
@@ -4116,7 +3871,6 @@
         - project-config-bindep-fallback-opensuse-15
         - project-config-bindep-fallback-ubuntu-xenial
     gate:
-      queue: project-config
       jobs:
         # NOTE(ianw) 2022-08-03 : this files filter is just because
         # grafana is currently the only test that wants the
@@ -4431,13 +4185,10 @@
 
 - project:
     name: openstack/puppet-tripleo
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - puppet-release-jobs
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/puppet-trove
@@ -4644,14 +4395,11 @@
 
 - project:
     name: openstack/python-openstackclient
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/python-pankoclient
@@ -4669,13 +4417,10 @@
 
 - project:
     name: openstack/python-saharaclient
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/python-senlinclient
@@ -4693,13 +4438,10 @@
 
 - project:
     name: openstack/python-swiftclient
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/python-tackerclient
@@ -4709,33 +4451,24 @@
 
 - project:
     name: openstack/python-tripleoclient
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/python-troveclient
+    queue: trove
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: trove
-    gate:
-      queue: trove
 
 - project:
     name: openstack/python-venusclient
+    queue: venus
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: venus
-    gate:
-      queue: venus
 
 - project:
     name: openstack/python-vitrageclient
@@ -4814,16 +4547,15 @@
 
 - project:
     name: openstack/requirements
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
     check:
-      queue: integrated
       jobs:
         - openstack-tox-docs:
             branches: master
     gate:
-      queue: integrated
       jobs:
         - openstack-tox-docs:
             branches: master
@@ -4907,15 +4639,12 @@
 
 - project:
     name: openstack/sahara
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-dashboard
@@ -4938,69 +4667,51 @@
 
 - project:
     name: openstack/sahara-plugin-ambari
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-plugin-cdh
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-plugin-mapr
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-plugin-spark
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-plugin-storm
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-plugin-vanilla
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/sahara-specs
@@ -5009,13 +4720,10 @@
 
 - project:
     name: openstack/sahara-tests
+    queue: sahara
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: sahara
-    gate:
-      queue: sahara
 
 - project:
     name: openstack/security-doc
@@ -5030,15 +4738,12 @@
 
 - project:
     name: openstack/senlin
+    queue: senlin
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - api-ref-jobs
       - publish-to-pypi
-    check:
-      queue: senlin
-    gate:
-      queue: senlin
 
 - project:
     name: openstack/senlin-dashboard
@@ -5049,13 +4754,10 @@
 
 - project:
     name: openstack/senlin-tempest-plugin
+    queue: senlin
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: senlin
-    gate:
-      queue: senlin
 
 - project:
     name: openstack/service-types-authority
@@ -5075,34 +4777,25 @@
 
 - project:
     name: openstack/skyline-apiserver
+    queue: skyline
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: skyline
-    gate:
-      queue: skyline
 
 - project:
     name: openstack/skyline-console
+    queue: skyline
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: skyline
-    gate:
-      queue: skyline
 
 - project:
     name: openstack/solum
+    queue: solum
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
-    check:
-      queue: solum
-    gate:
-      queue: solum
 
 - project:
     name: openstack/solum-dashboard
@@ -5118,13 +4811,10 @@
 
 - project:
     name: openstack/solum-tempest-plugin
+    queue: solum
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: solum
-    gate:
-      queue: solum
 
 - project:
     name: openstack/specs-cookiecutter
@@ -5175,16 +4865,13 @@
 
 - project:
     name: openstack/swift
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
       - translation-jobs-master-only
       - api-ref-jobs
       - install-guide-jobs
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/swift-bench
@@ -5230,23 +4917,17 @@
 
 - project:
     name: openstack/telemetry-tempest-plugin
+    queue: telemetry
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: telemetry
-    gate:
-      queue: telemetry
 
 - project:
     name: openstack/tempest
+    queue: integrated
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: integrated
-    gate:
-      queue: integrated
 
 - project:
     name: openstack/tempest-plugin-cookiecutter
@@ -5290,22 +4971,16 @@
 
 - project:
     name: openstack/tripleo-ci
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
 
 - project:
     name: openstack/tripleo-common
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-docs
@@ -5320,23 +4995,17 @@
 
 - project:
     name: openstack/tripleo-heat-templates
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-image-elements
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-ipsec
@@ -5346,46 +5015,34 @@
 
 - project:
     name: openstack/tripleo-operator-ansible
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
     release:
       jobs:
         - publish-openstack-python-tarball
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-puppet-elements
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-quickstart
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-quickstart-extras
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-repos
@@ -5400,26 +5057,21 @@
 
 - project:
     name: openstack/tripleo-upgrade
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/tripleo-validations
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/trove
+    queue: trove
     templates:
       - api-ref-jobs
       - install-guide-jobs
@@ -5427,10 +5079,6 @@
       - periodic-jobs-with-oslo-master
       - publish-to-pypi
       - translation-jobs-master-only
-    check:
-      queue: trove
-    gate:
-      queue: trove
 
 - project:
     name: openstack/trove-dashboard
@@ -5446,13 +5094,10 @@
 
 - project:
     name: openstack/trove-tempest-plugin
+    queue: trove
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: trove
-    gate:
-      queue: trove
 
 - project:
     name: openstack/ui-cookiecutter
@@ -5467,44 +5112,32 @@
 
 - project:
     name: openstack/validations-common
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/validations-libs
+    queue: tripleo
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: tripleo
-    gate:
-      queue: tripleo
 
 - project:
     name: openstack/venus
+    queue: venus
     templates:
       - api-ref-jobs
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: venus
-    gate:
-      queue: venus
 
 - project:
     name: openstack/venus-dashboard
+    queue: venus
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: venus
-    gate:
-      queue: venus
 
 - project:
     name: openstack/venus-specs
@@ -5513,13 +5146,10 @@
 
 - project:
     name: openstack/venus-tempest-plugin
+    queue: venus
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: venus
-    gate:
-      queue: venus
 
 - project:
     name: openstack/virtualbmc
@@ -5529,13 +5159,10 @@
 
 - project:
     name: openstack/vitrage
+    queue: vitrage
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: vitrage
-    gate:
-      queue: vitrage
 
 - project:
     name: openstack/vitrage-dashboard
@@ -5550,35 +5177,26 @@
 
 - project:
     name: openstack/vitrage-tempest-plugin
+    queue: vitrage
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: vitrage
-    gate:
-      queue: vitrage
 
 - project:
     name: openstack/watcher
+    queue: watcher
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - publish-to-pypi
       - api-ref-jobs
-    check:
-      queue: watcher
-    gate:
-      queue: watcher
 
 - project:
     name: openstack/watcher-dashboard
+    queue: watcher
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: watcher
-    gate:
-      queue: watcher
 
 - project:
     name: openstack/watcher-specs
@@ -5587,13 +5205,10 @@
 
 - project:
     name: openstack/watcher-tempest-plugin
+    queue: watcher
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: watcher
-    gate:
-      queue: watcher
 
 - project:
     name: openstack/whereto
@@ -5841,16 +5456,13 @@
 
 - project:
     name: openstack/zaqar
+    queue: zaqar
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
       - api-ref-jobs
       - install-guide-jobs
       - publish-to-pypi
-    check:
-      queue: zaqar
-    gate:
-      queue: zaqar
 
 - project:
     name: openstack/zaqar-specs
@@ -5859,13 +5471,10 @@
 
 - project:
     name: openstack/zaqar-tempest-plugin
+    queue: zaqar
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: zaqar
-    gate:
-      queue: zaqar
 
 - project:
     name: openstack/zaqar-ui
@@ -5876,24 +5485,18 @@
 
 - project:
     name: openstack/zun
+    queue: zun
     templates:
       - api-ref-jobs
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: zun
-    gate:
-      queue: zun
 
 - project:
     name: openstack/zun-tempest-plugin
+    queue: zun
     templates:
       - official-openstack-repo-jobs
       - publish-to-pypi
-    check:
-      queue: zun
-    gate:
-      queue: zun
 
 - project:
     name: openstack/zun-ui
@@ -6983,40 +6586,28 @@
 
 - project:
     name: x/novajoin
+    queue: novajoin
     templates:
       - publish-to-pypi
-    check:
-      queue: novajoin
-    gate:
-      queue: novajoin
 
 - project:
     name: x/novajoin-tempest-plugin
+    queue: novajoin
     templates:
       - check-requirements
       - tempest-plugin-jobs
-    check:
-      queue: novajoin
-    gate:
-      queue: novajoin
 
 - project:
     name: x/oaktree
+    queue: oaktree
     templates:
       - publish-to-pypi-quietly
       - openstack-python-jobs
       - openstack-python35-jobs
-    check:
-      queue: oaktree
-    gate:
-      queue: oaktree
 
 - project:
     name: x/oaktreemodel
-    check:
-      queue: oaktree
-    gate:
-      queue: oaktree
+    queue: oaktree
 
 - project:
     name: x/omni
@@ -7911,13 +7502,10 @@
 
 - project:
     name: x/vmware-nsx
+    queue: vmware-nsx
     templates:
       - periodic-jobs-with-neutron-lib-master
       - publish-to-pypi
-    check:
-      queue: vmware-nsx
-    gate:
-      queue: vmware-nsx
     periodic:
       jobs:
         - openstack-tox-py39-with-neutron-lib-master:
@@ -7935,12 +7523,9 @@
 
 - project:
     name: x/vmware-nsx-tempest-plugin
+    queue: vmware-nsx
     templates:
       - publish-to-pypi
-    check:
-      queue: vmware-nsx
-    gate:
-      queue: vmware-nsx
 
 - project:
     name: x/vmware-nsxlib