diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 473420dba0..9c11623c05 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -53,10 +53,10 @@ fuel-tracker:
     - change-merged
   projects:
     - ^openstack/fuel.*
-    - x/network-checker
     - openstack/python-fuelclient
     - openstack/shotgun
     - openstack/tuning-box
+    - x/network-checker
   branches:
     - master
 
@@ -75,9 +75,9 @@ heat:
     - patchset-created
     - change-merged
   projects:
-    - openstack/heat-cfnclient
     - openstack/heat
     - openstack/heat-agents
+    - openstack/heat-cfnclient
     - openstack/heat-cfntools
     - openstack/heat-dashboard
     - openstack/heat-specs
@@ -92,8 +92,8 @@ midonet:
     - patchset-created
     - change-merged
   projects:
-    - x/fuel-plugin-midonet
     - openstack/networking-midonet
+    - x/fuel-plugin-midonet
     - x/puppet-midonet
   branches:
     - master
@@ -108,9 +108,9 @@ murano:
     - openstack/murano-apps
     - openstack/murano-dashboard
     - openstack/murano-pkg-check
-    - x/murano-plugin-networking-sfc
     - openstack/murano-specs
     - openstack/python-muranoclient
+    - x/murano-plugin-networking-sfc
   branches:
     - master
 
@@ -128,57 +128,30 @@ opendev:
     - patchset-created
     - change-merged
   projects:
-    - opendev/base-jobs
-    - openstack/cookiecutter
-    - openstack/hacking
-    - openstack/openstack-nose
-    - openstack/pbr
-    - openstack/specs-cookiecutter
     - opendev/afsmon
-    - openstack-infra/ansible-build-image
     - opendev/ansible-role-puppet
     - opendev/askbot-theme
+    - opendev/base-jobs
     - opendev/bindep
-    - openstack/bugdaystats
-    - x/ciwatch
-    - openstack/devstack-gate
     - opendev/elastic-recheck
     - opendev/gear
-    - x/gearman-plugin
     - opendev/germqtt
     - opendev/gerrit
     - opendev/gerritbot
     - opendev/gerritlib
     - opendev/git-restack
     - opendev/git-review
-    - x/gitdm
     - opendev/glean
     - opendev/grafyaml
-    - osf/groups
-    - osf/groups-static-pages
-    - x/infra-ansible
-    - openstack/infra-manual
     - opendev/infra-specs
     - opendev/irc-meetings
     - opendev/jeepyb
     - opendev/lodgeit
     - opendev/log-classify
     - opendev/log_processor
-    - openstack/logstash-filters
     - opendev/lpmqtt
     - opendev/meetbot
     - opendev/mqtt_statsd
-    - zuul/nodepool
-    - openstack/nose-html-output
-    - osf/odsreg
-    - openstack-infra/opendev-website
-    - openstack/openstack-zuul-jobs
-    - openstack/openstack-zuul-roles
-    - osf/openstackid
-    - osf/openstackid-resources
-    - osf/openstackweb
-    - openstack/os-loganalyze
-    - openstack/project-config
     - opendev/project-config-example
     - opendev/publications
     - opendev/puppet-accessbot
@@ -264,17 +237,51 @@ opendev:
     - opendev/puppet-zanata
     - opendev/puppet-zuul
     - opendev/python-storyboardclient
-    - openstack/reviewday
-    - openstack/reviewstats
     - opendev/statusbot
     - opendev/storyboard
     - opendev/storyboard-webclient
     - opendev/subunit2sql
     - opendev/system-config
     - opendev/yaml2ical
-    - x/zmq-event-publisher
+    - openstack-infra/ansible-build-image
+    - openstack-infra/opendev-website
     - openstack-infra/zone-opendev.org
     - openstack-infra/zone-zuul-ci.org
+    - openstack/bugdaystats
+    - openstack/cookiecutter
+    - openstack/devstack-gate
+    - openstack/diskimage-builder
+    - openstack/hacking
+    - openstack/infra-manual
+    - openstack/logstash-filters
+    - openstack/nose-html-output
+    - openstack/openstack-nose
+    - openstack/openstack-zuul-jobs
+    - openstack/openstack-zuul-roles
+    - openstack/os-loganalyze
+    - openstack/os-performance-tools
+    - openstack/os-testr
+    - openstack/pbr
+    - openstack/project-config
+    - openstack/ptgbot
+    - openstack/reviewday
+    - openstack/reviewstats
+    - openstack/specs-cookiecutter
+    - osf/groups
+    - osf/groups-static-pages
+    - osf/odsreg
+    - osf/openstackid
+    - osf/openstackid-resources
+    - osf/openstackweb
+    - ttygroup/boartty
+    - ttygroup/gertty
+    - x/ansible-role-cloud-launcher
+    - x/ciwatch
+    - x/gearman-plugin
+    - x/gitdm
+    - x/infra-ansible
+    - x/zmq-event-publisher
+    - zuul/nodepool
     - zuul/zuul
     - zuul/zuul-base-jobs
     - zuul/zuul-jobs
@@ -282,13 +289,6 @@ opendev:
     - zuul/zuul-sphinx
     - zuul/zuul-website
     - zuul/zuul-website-media
-    - x/ansible-role-cloud-launcher
-    - ttygroup/boartty
-    - openstack/diskimage-builder
-    - ttygroup/gertty
-    - openstack/os-performance-tools
-    - openstack/os-testr
-    - openstack/ptgbot
   branches:
     - master
     - debian/sid #zuul-packaging repo
@@ -323,8 +323,8 @@ openstack-almanach:
     - patchset-created
     - change-merged
   projects:
-    - x/almanach
     - openstack/openstack-ansible-os_almanach
+    - x/almanach
     - x/python-almanachclient
   branches:
     - master
@@ -757,13 +757,9 @@ openstack-horizon:
     - openstack/ui-cookiecutter
     - openstack/xstatic-angular
     - openstack/xstatic-angular-bootstrap
-    - x/xstatic-angular-cookies
-    - x/xstatic-angular-fileupload
     - openstack/xstatic-angular-lrdragndrop
     - openstack/xstatic-angular-material
-    - x/xstatic-angular-mock
     - openstack/xstatic-angular-notify
-    - x/xstatic-angular-sanitize
     - openstack/xstatic-angular-smart-table
     - openstack/xstatic-angular-ui-router
     - openstack/xstatic-angular-uuid
@@ -777,7 +773,6 @@ openstack-horizon:
     - openstack/xstatic-hogan
     - openstack/xstatic-jasmine
     - openstack/xstatic-jquery-migrate
-    - x/xstatic-jquery.bootstrap.wizard
     - openstack/xstatic-jquery.quicksearch
     - openstack/xstatic-jquery.tablesorter
     - openstack/xstatic-js-yaml
@@ -785,10 +780,15 @@ openstack-horizon:
     - openstack/xstatic-json2yaml
     - openstack/xstatic-magic-search
     - openstack/xstatic-mdi
-    - x/xstatic-qunit
     - openstack/xstatic-rickshaw
     - openstack/xstatic-spin
     - openstack/xstatic-vis
+    - x/xstatic-angular-cookies
+    - x/xstatic-angular-fileupload
+    - x/xstatic-angular-mock
+    - x/xstatic-angular-sanitize
+    - x/xstatic-jquery.bootstrap.wizard
+    - x/xstatic-qunit
   branches:
     - master
 
@@ -797,10 +797,10 @@ openstack-hyper-v:
     - patchset-created
     - change-merged
   projects:
-    - x/compute-hyperv
     - openstack/networking-hyperv
     - openstack/os-win
     - openstack/oswin-tempest-plugin
+    - x/compute-hyperv
     - x/python-hnvclient
   branches:
     - master
@@ -820,57 +820,30 @@ openstack-infra:
     - patchset-created
     - change-merged
   projects:
-    - opendev/base-jobs
-    - openstack/cookiecutter
-    - openstack/hacking
-    - openstack/openstack-nose
-    - openstack/pbr
-    - openstack/specs-cookiecutter
     - opendev/afsmon
-    - openstack-infra/ansible-build-image
     - opendev/ansible-role-puppet
     - opendev/askbot-theme
+    - opendev/base-jobs
     - opendev/bindep
-    - openstack/bugdaystats
-    - x/ciwatch
-    - openstack/devstack-gate
     - opendev/elastic-recheck
     - opendev/gear
-    - x/gearman-plugin
     - opendev/germqtt
     - opendev/gerrit
     - opendev/gerritbot
     - opendev/gerritlib
     - opendev/git-restack
     - opendev/git-review
-    - x/gitdm
     - opendev/glean
     - opendev/grafyaml
-    - osf/groups
-    - osf/groups-static-pages
-    - x/infra-ansible
-    - openstack/infra-manual
     - opendev/infra-specs
     - opendev/irc-meetings
     - opendev/jeepyb
     - opendev/lodgeit
     - opendev/log-classify
     - opendev/log_processor
-    - openstack/logstash-filters
     - opendev/lpmqtt
     - opendev/meetbot
     - opendev/mqtt_statsd
-    - zuul/nodepool
-    - openstack/nose-html-output
-    - osf/odsreg
-    - openstack-infra/opendev-website
-    - openstack/openstack-zuul-jobs
-    - openstack/openstack-zuul-roles
-    - osf/openstackid
-    - osf/openstackid-resources
-    - osf/openstackweb
-    - openstack/os-loganalyze
-    - openstack/project-config
     - opendev/project-config-example
     - opendev/publications
     - opendev/puppet-accessbot
@@ -956,17 +929,51 @@ openstack-infra:
     - opendev/puppet-zanata
     - opendev/puppet-zuul
     - opendev/python-storyboardclient
-    - openstack/reviewday
-    - openstack/reviewstats
     - opendev/statusbot
     - opendev/storyboard
     - opendev/storyboard-webclient
     - opendev/subunit2sql
     - opendev/system-config
     - opendev/yaml2ical
-    - x/zmq-event-publisher
+    - openstack-infra/ansible-build-image
+    - openstack-infra/opendev-website
     - openstack-infra/zone-opendev.org
     - openstack-infra/zone-zuul-ci.org
+    - openstack/bugdaystats
+    - openstack/cookiecutter
+    - openstack/devstack-gate
+    - openstack/diskimage-builder
+    - openstack/hacking
+    - openstack/infra-manual
+    - openstack/logstash-filters
+    - openstack/nose-html-output
+    - openstack/openstack-nose
+    - openstack/openstack-zuul-jobs
+    - openstack/openstack-zuul-roles
+    - openstack/os-loganalyze
+    - openstack/os-performance-tools
+    - openstack/os-testr
+    - openstack/pbr
+    - openstack/project-config
+    - openstack/ptgbot
+    - openstack/reviewday
+    - openstack/reviewstats
+    - openstack/specs-cookiecutter
+    - osf/groups
+    - osf/groups-static-pages
+    - osf/odsreg
+    - osf/openstackid
+    - osf/openstackid-resources
+    - osf/openstackweb
+    - ttygroup/boartty
+    - ttygroup/gertty
+    - x/ansible-role-cloud-launcher
+    - x/ciwatch
+    - x/gearman-plugin
+    - x/gitdm
+    - x/infra-ansible
+    - x/zmq-event-publisher
+    - zuul/nodepool
     - zuul/zuul
     - zuul/zuul-base-jobs
     - zuul/zuul-jobs
@@ -974,13 +981,6 @@ openstack-infra:
     - zuul/zuul-sphinx
     - zuul/zuul-website
     - zuul/zuul-website-media
-    - x/ansible-role-cloud-launcher
-    - ttygroup/boartty
-    - openstack/diskimage-builder
-    - ttygroup/gertty
-    - openstack/os-performance-tools
-    - openstack/os-testr
-    - openstack/ptgbot
   branches:
     - master
     - debian/sid #zuul-packaging repo
@@ -1056,11 +1056,11 @@ openstack-javascript:
     - patchset-created
     - change-merged
   projects:
+    - openstack/eslint-config-openstack
+    - openstack/js-openstack-lib
     - x/js-afs-blob-store
     - x/js-generator-openstack
     - x/js-openstack-registry-hooks
-    - openstack/eslint-config-openstack
-    - openstack/js-openstack-lib
   branches:
     - master
 
@@ -1211,47 +1211,21 @@ openstack-merges:
   projects:
     # grep openstack governance/reference/programs.yaml | grep -v url
     - ^openstack/sahara.*
-    - openstack/cookiecutter
-    - openstack/devstack
-    - openstack/devstack-plugin-cookiecutter
-    - openstack/grenade
-    - openstack/hacking
-    - openstack/heat-cfnclient
-    - openstack/openstack-nose
-    - openstack/pbr
-    - openstack/specs-cookiecutter
-    - openstack/activity-board
+    - jjb/jenkins-job-builder
     - opendev/askbot-theme
-    - openstack/devstack-gate
     - opendev/elastic-recheck
-    - x/err2d2
     - opendev/gear
-    - x/gearman-plugin
     - opendev/germqtt
     - opendev/gerrit
     - opendev/gerritbot
     - opendev/gerritlib
     - opendev/git-restack
     - opendev/git-review
-    - x/gitdm
     - opendev/grafyaml
-    - osf/groups
     - opendev/jeepyb
-    - jjb/jenkins-job-builder
-    - x/js-afs-blob-store
-    - x/js-generator-openstack
-    - x/js-openstack-registry-hooks
     - opendev/lodgeit
     - opendev/lpmqtt
     - opendev/meetbot
-    - zuul/nodepool
-    - openstack/nose-html-output
-    - osf/odsreg
-    - osf/openstackid
-    - osf/openstackid-resources
-    - osf/openstackweb
-    - openstack/os-loganalyze
-    - openstack/project-config
     - opendev/project-config-example
     - opendev/publications
     - opendev/puppet-accessbot
@@ -1266,7 +1240,6 @@ openstack-merges:
     - opendev/puppet-ciwatch
     - opendev/puppet-dashboard
     - opendev/puppet-diskimage_builder
-    - openstack-infra/puppet-docker_registry
     - opendev/puppet-drupal
     - opendev/puppet-elastic_recheck
     - opendev/puppet-elasticsearch
@@ -1337,29 +1310,31 @@ openstack-merges:
     - opendev/puppet-zuul
     - opendev/pypi-mirror
     - opendev/python-storyboardclient
-    - openstack/releasestatus
-    - openstack/reviewday
-    - openstack/reviewstats
     - opendev/statusbot
     - opendev/storyboard
     - opendev/system-config
-    - openstack/tripleo-ci
-    - x/zmq-event-publisher
-    - zuul/zuul
-    - openstack/zuul-packaging
+    - openstack-infra/puppet-docker_registry
+    - openstack/activity-board
     - openstack/api-site
     - openstack/arch-wg
     - openstack/ceilometer
     - openstack/ceilometermiddleware
     - openstack/cinder
     - openstack/compute-api
+    - openstack/cookiecutter
+    - openstack/devstack
+    - openstack/devstack-gate
+    - openstack/devstack-plugin-cookiecutter
     - openstack/diskimage-builder
     - openstack/django_openstack_auth
     - openstack/eslint-config-openstack
     - openstack/glance
     - openstack/governance
+    - openstack/grenade
+    - openstack/hacking
     - openstack/heat
     - openstack/heat-agents
+    - openstack/heat-cfnclient
     - openstack/heat-cfntools
     - openstack/heat-templates
     - openstack/horizon
@@ -1371,14 +1346,17 @@ openstack-merges:
     - openstack/keystonemiddleware
     - openstack/netconn-api
     - openstack/neutron
+    - openstack/nose-html-output
     - openstack/nova
     - openstack/object-api
     - openstack/openstack-doc-tools
     - openstack/openstack-manuals
+    - openstack/openstack-nose
     - openstack/openstack-planet
     - openstack/operations-guide
     - openstack/os-apply-config
     - openstack/os-collect-config
+    - openstack/os-loganalyze
     - openstack/os-net-config
     - openstack/os-refresh-config
     - openstack/os-testr
@@ -1400,6 +1378,8 @@ openstack-merges:
     - openstack/oslo.tools
     - openstack/oslo.utils
     - openstack/oslo.vmware
+    - openstack/pbr
+    - openstack/project-config
     - openstack/project-team-guide
     - openstack/ptgbot
     - openstack/publiccloud-wg
@@ -1415,16 +1395,36 @@ openstack-merges:
     - openstack/python-troveclient
     - openstack/python-zaqarclient
     - openstack/python-zunclient
+    - openstack/releasestatus
+    - openstack/reviewday
+    - openstack/reviewstats
+    - openstack/specs-cookiecutter
     - openstack/swift
     - openstack/swift-bench
     - openstack/tempest
     - openstack/tempest-lib
+    - openstack/tripleo-ci
     - openstack/tripleo-heat-templates
     - openstack/tripleo-image-elements
     - openstack/trove
     - openstack/trove-dashboard
     - openstack/volume-api
     - openstack/zaqar
+    - openstack/zuul-packaging
+    - osf/groups
+    - osf/odsreg
+    - osf/openstackid
+    - osf/openstackid-resources
+    - osf/openstackweb
+    - x/err2d2
+    - x/gearman-plugin
+    - x/gitdm
+    - x/js-afs-blob-store
+    - x/js-generator-openstack
+    - x/js-openstack-registry-hooks
+    - x/zmq-event-publisher
+    - zuul/nodepool
+    - zuul/zuul
 openstack-merlin:
   events:
     - patchset-created
@@ -1583,10 +1583,8 @@ openstack-oslo:
     - patchset-created
     - change-merged
   projects:
-    - openstack/cookiecutter
-    - openstack/oslo-cookiecutter
-    - openstack/pbr
     - openstack/automaton
+    - openstack/cookiecutter
     - openstack/debtcollector
     - openstack/devstack-plugin-amqp1
     - openstack/devstack-plugin-kafka
@@ -1594,6 +1592,7 @@ openstack-oslo:
     - openstack/devstack-plugin-zmq
     - openstack/futurist
     - openstack/mox3
+    - openstack/oslo-cookiecutter
     - openstack/oslo-incubator
     - openstack/oslo-specs
     - openstack/oslo.cache
@@ -1620,6 +1619,7 @@ openstack-oslo:
     - openstack/oslosphinx
     - openstack/oslotest
     - openstack/osprofiler
+    - openstack/pbr
     - openstack/pycadf
     - openstack/sphinx-feature-classification
     - openstack/stevedore
@@ -1697,18 +1697,18 @@ openstack-qa:
     - patchset-created
     - change-merged
   projects:
-    - openstack/bashate
-    - openstack/devstack
-    - openstack/devstack-plugin-cookiecutter
-    - openstack/grenade
-    - openstack/hacking
-    - openstack/devstack-gate
     - opendev/elastic-recheck
     - opendev/subunit2sql
+    - openstack/bashate
     - openstack/coverage2sql
+    - openstack/devstack
+    - openstack/devstack-gate
     - openstack/devstack-plugin-ceph
+    - openstack/devstack-plugin-cookiecutter
     - openstack/devstack-tools
     - openstack/eslint-config-openstack
+    - openstack/grenade
+    - openstack/hacking
     - openstack/karma-subunit-reporter
     - openstack/openstack-health
     - openstack/os-performance-tools
@@ -1759,9 +1759,9 @@ openstack-release:
     - patchset-created
     - change-merged
   projects:
-    - openstack/releasestatus
     - openstack/release-test
     - openstack/releases
+    - openstack/releasestatus
     - openstack/reno
   branches:
     - master
@@ -1817,25 +1817,25 @@ openstack-sdks:
     - change-merged
   projects:
     - openstack-dev/os-http
-    - openstack/requestsexceptions
-    - openstack/shade
     - openstack/api-sig
     - openstack/cliff
-    - x/golang-client
     - openstack/js-openstack-lib
     - openstack/keystoneauth
     - openstack/microversion-parse
-    - x/oaktree
-    - x/oaktreemodel
     - openstack/openstackclient
     - openstack/openstacksdk
     - openstack/os-api-ref
     - openstack/os-client-config
     - openstack/os-service-types
     - openstack/osc-lib
-    - x/promstat
     - openstack/python-openstackclient
+    - openstack/requestsexceptions
     - openstack/service-types-authority
+    - openstack/shade
+    - x/golang-client
+    - x/oaktree
+    - x/oaktreemodel
+    - x/promstat
   branches:
     - master
     - feature/osc4
@@ -1872,9 +1872,9 @@ openstack-self-healing:
     - change-merged
   projects:
     - openstack/ha-guide
+    - openstack/self-healing-sig
     - x/openstack-resource-agents
     - x/openstack-resource-agents-specs
-    - openstack/self-healing-sig
   branches:
     - master
 
@@ -1949,13 +1949,13 @@ openstack-swift:
     - patchset-created
     - change-merged
   projects:
-    - x/liberasurecode
-    - x/pyeclib
     - openstack/python-swiftclient
-    - x/slogging
     - openstack/swift
     - openstack/swift-bench
     - openstack/swift-specs
+    - x/liberasurecode
+    - x/pyeclib
+    - x/slogging
   branches:
     - ^.*
 
@@ -1994,9 +1994,9 @@ openstack-third-party-ci:
     - patchset-created
     - change-merged
   projects:
-    - x/ciwatch
     - opendev/project-config-example
     - opendev/puppet-ciwatch
+    - x/ciwatch
     - x/third-party-ci-tools
   branches:
     - master
@@ -2116,22 +2116,16 @@ openstack-windmill:
     - change-merged
   projects:
     - windmill/ansible-role-ansible
-    - x/ansible-role-bindep
     - windmill/ansible-role-borgbackup
     - windmill/ansible-role-borgmatic
     - windmill/ansible-role-carbon
     - windmill/ansible-role-diskimage-builder
-    - x/ansible-role-fedmsg
     - windmill/ansible-role-gear
     - windmill/ansible-role-grafyaml
-    - x/ansible-role-jenkins
-    - x/ansible-role-jenkins-job-builder
-    - x/ansible-role-jenkins-plugins
     - windmill/ansible-role-logrotate
     - windmill/ansible-role-nginx
     - windmill/ansible-role-nodepool
     - windmill/ansible-role-openstacksdk
-    - x/ansible-role-shade
     - windmill/ansible-role-ssh
     - windmill/ansible-role-statsd
     - windmill/ansible-role-sudoers
@@ -2143,6 +2137,12 @@ openstack-windmill:
     - windmill/windmill-backup
     - windmill/windmill-config
     - windmill/windmill-ops
+    - x/ansible-role-bindep
+    - x/ansible-role-fedmsg
+    - x/ansible-role-jenkins
+    - x/ansible-role-jenkins-job-builder
+    - x/ansible-role-jenkins-plugins
+    - x/ansible-role-shade
   branches:
     - master
 
@@ -2196,7 +2196,6 @@ puppet-openstack:
     - openstack/puppet-congress
     - openstack/puppet-designate
     - openstack/puppet-ec2api
-    - x/puppet-fenix
     - openstack/puppet-freezer
     - openstack/puppet-glance
     - openstack/puppet-glare
@@ -2208,7 +2207,6 @@ puppet-openstack:
     - openstack/puppet-magnum
     - openstack/puppet-manila
     - openstack/puppet-mistral
-    - x/puppet-modulesync-configs
     - openstack/puppet-monasca
     - openstack/puppet-murano
     - openstack/puppet-neutron
@@ -2233,11 +2231,13 @@ puppet-openstack:
     - openstack/puppet-tacker
     - openstack/puppet-tempest
     - openstack/puppet-trove
-    - x/puppet-tuskar
     - openstack/puppet-vitrage
     - openstack/puppet-vswitch
     - openstack/puppet-watcher
     - openstack/puppet-zaqar
+    - x/puppet-fenix
+    - x/puppet-modulesync-configs
+    - x/puppet-tuskar
   branches:
     - master
     - ^stable/.*
@@ -2357,11 +2357,11 @@ syscompass:
     - patchset-created
     - change-merged
   projects:
+    - stackforge/compass-install
     - x/compass-adapters
     - x/compass-core
     - x/compass-specs
     - x/compass-web
-    - stackforge/compass-install
   branches:
     - master
 
@@ -2395,7 +2395,6 @@ tripleo:
   projects:
     - ^openstack/ansible-role-tripleo-.*
     - ^openstack/tripleo.*
-    - openstack/tripleo-ci
     - openstack/ansible-role-chrony
     - openstack/ansible-role-collect-logs
     - openstack/ansible-role-container-registry
@@ -2414,6 +2413,7 @@ tripleo:
     - openstack/puppet-tripleo
     - openstack/python-tripleoclient
     - openstack/tempest-tripleo-ui
+    - openstack/tripleo-ci
   branches:
     - master
     - ^stable/.*
@@ -2432,8 +2432,10 @@ zuul:
     - patchset-created
     - change-merged
   projects:
-    - zuul/nodepool
     - openstack-infra/zone-zuul-ci.org
+    - x/pbrx
+    - zuul/nodepool
+    - zuul/project-config
     - zuul/zuul
     - zuul/zuul-base-jobs
     - zuul/zuul-jobs
@@ -2441,8 +2443,6 @@ zuul:
     - zuul/zuul-sphinx
     - zuul/zuul-website
     - zuul/zuul-website-media
-    - x/pbrx
-    - zuul/project-config
   branches:
     - master
     - feature/gearman-zk-shim