diff --git a/.gitreview b/.gitreview
index ccbd364a6f..7210c5553b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-infra/project-config.git
+project=openstack/project-config.git
diff --git a/gerrit/acls/openstack-infra/jenkins-job-builder.config b/gerrit/acls/jjb/jenkins-job-builder.config
similarity index 100%
rename from gerrit/acls/openstack-infra/jenkins-job-builder.config
rename to gerrit/acls/jjb/jenkins-job-builder.config
diff --git a/gerrit/acls/openstack/python-jenkins.config b/gerrit/acls/jjb/python-jenkins.config
similarity index 100%
rename from gerrit/acls/openstack/python-jenkins.config
rename to gerrit/acls/jjb/python-jenkins.config
diff --git a/gerrit/acls/openstack/limestone-ci-cloud.config b/gerrit/acls/limestone/ci-cloud-config.config
similarity index 100%
rename from gerrit/acls/openstack/limestone-ci-cloud.config
rename to gerrit/acls/limestone/ci-cloud-config.config
diff --git a/gerrit/acls/openstack-infra/afsmon.config b/gerrit/acls/opendev/afsmon.config
similarity index 100%
rename from gerrit/acls/openstack-infra/afsmon.config
rename to gerrit/acls/opendev/afsmon.config
diff --git a/gerrit/acls/openstack-infra/ansible-role-puppet.config b/gerrit/acls/opendev/ansible-role-puppet.config
similarity index 100%
rename from gerrit/acls/openstack-infra/ansible-role-puppet.config
rename to gerrit/acls/opendev/ansible-role-puppet.config
diff --git a/gerrit/acls/openstack-infra/askbot-theme.config b/gerrit/acls/opendev/askbot-theme.config
similarity index 100%
rename from gerrit/acls/openstack-infra/askbot-theme.config
rename to gerrit/acls/opendev/askbot-theme.config
diff --git a/gerrit/acls/openstack-infra/bindep.config b/gerrit/acls/opendev/bindep.config
similarity index 100%
rename from gerrit/acls/openstack-infra/bindep.config
rename to gerrit/acls/opendev/bindep.config
diff --git a/gerrit/acls/openstack-infra/elastic-recheck.config b/gerrit/acls/opendev/elastic-recheck.config
similarity index 100%
rename from gerrit/acls/openstack-infra/elastic-recheck.config
rename to gerrit/acls/opendev/elastic-recheck.config
diff --git a/gerrit/acls/openstack-infra/gear.config b/gerrit/acls/opendev/gear.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gear.config
rename to gerrit/acls/opendev/gear.config
diff --git a/gerrit/acls/openstack-infra/germqtt.config b/gerrit/acls/opendev/germqtt.config
similarity index 100%
rename from gerrit/acls/openstack-infra/germqtt.config
rename to gerrit/acls/opendev/germqtt.config
diff --git a/gerrit/acls/openstack-infra/gerrit.config b/gerrit/acls/opendev/gerrit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gerrit.config
rename to gerrit/acls/opendev/gerrit.config
diff --git a/gerrit/acls/openstack-infra/gerritbot.config b/gerrit/acls/opendev/gerritbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gerritbot.config
rename to gerrit/acls/opendev/gerritbot.config
diff --git a/gerrit/acls/openstack-infra/gerritlib.config b/gerrit/acls/opendev/gerritlib.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gerritlib.config
rename to gerrit/acls/opendev/gerritlib.config
diff --git a/gerrit/acls/openstack-infra/git-restack.config b/gerrit/acls/opendev/git-restack.config
similarity index 100%
rename from gerrit/acls/openstack-infra/git-restack.config
rename to gerrit/acls/opendev/git-restack.config
diff --git a/gerrit/acls/openstack-infra/glean.config b/gerrit/acls/opendev/glean.config
similarity index 100%
rename from gerrit/acls/openstack-infra/glean.config
rename to gerrit/acls/opendev/glean.config
diff --git a/gerrit/acls/openstack-infra/grafyaml.config b/gerrit/acls/opendev/grafyaml.config
similarity index 100%
rename from gerrit/acls/openstack-infra/grafyaml.config
rename to gerrit/acls/opendev/grafyaml.config
diff --git a/gerrit/acls/openstack-infra/infra-specs.config b/gerrit/acls/opendev/infra-specs.config
similarity index 100%
rename from gerrit/acls/openstack-infra/infra-specs.config
rename to gerrit/acls/opendev/infra-specs.config
diff --git a/gerrit/acls/openstack-infra/irc-meetings.config b/gerrit/acls/opendev/irc-meetings.config
similarity index 100%
rename from gerrit/acls/openstack-infra/irc-meetings.config
rename to gerrit/acls/opendev/irc-meetings.config
diff --git a/gerrit/acls/openstack-infra/jeepyb.config b/gerrit/acls/opendev/jeepyb.config
similarity index 100%
rename from gerrit/acls/openstack-infra/jeepyb.config
rename to gerrit/acls/opendev/jeepyb.config
diff --git a/gerrit/acls/openstack-infra/lodgeit.config b/gerrit/acls/opendev/lodgeit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/lodgeit.config
rename to gerrit/acls/opendev/lodgeit.config
diff --git a/gerrit/acls/openstack-infra/log-classify.config b/gerrit/acls/opendev/log-classify.config
similarity index 100%
rename from gerrit/acls/openstack-infra/log-classify.config
rename to gerrit/acls/opendev/log-classify.config
diff --git a/gerrit/acls/openstack-infra/log_processor.config b/gerrit/acls/opendev/log_processor.config
similarity index 100%
rename from gerrit/acls/openstack-infra/log_processor.config
rename to gerrit/acls/opendev/log_processor.config
diff --git a/gerrit/acls/openstack-infra/lpmqtt.config b/gerrit/acls/opendev/lpmqtt.config
similarity index 100%
rename from gerrit/acls/openstack-infra/lpmqtt.config
rename to gerrit/acls/opendev/lpmqtt.config
diff --git a/gerrit/acls/openstack-infra/meetbot.config b/gerrit/acls/opendev/meetbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/meetbot.config
rename to gerrit/acls/opendev/meetbot.config
diff --git a/gerrit/acls/openstack-infra/mqtt_statsd.config b/gerrit/acls/opendev/mqtt_statsd.config
similarity index 100%
rename from gerrit/acls/openstack-infra/mqtt_statsd.config
rename to gerrit/acls/opendev/mqtt_statsd.config
diff --git a/gerrit/acls/openstack-infra/project-config-example.config b/gerrit/acls/opendev/project-config-example.config
similarity index 100%
rename from gerrit/acls/openstack-infra/project-config-example.config
rename to gerrit/acls/opendev/project-config-example.config
diff --git a/gerrit/acls/openstack-infra/publications.config b/gerrit/acls/opendev/publications.config
similarity index 100%
rename from gerrit/acls/openstack-infra/publications.config
rename to gerrit/acls/opendev/publications.config
diff --git a/gerrit/acls/openstack-infra/puppet-accessbot.config b/gerrit/acls/opendev/puppet-accessbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-accessbot.config
rename to gerrit/acls/opendev/puppet-accessbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-ansible.config b/gerrit/acls/opendev/puppet-ansible.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ansible.config
rename to gerrit/acls/opendev/puppet-ansible.config
diff --git a/gerrit/acls/openstack-infra/puppet-apparmor.config b/gerrit/acls/opendev/puppet-apparmor.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-apparmor.config
rename to gerrit/acls/opendev/puppet-apparmor.config
diff --git a/gerrit/acls/openstack-infra/puppet-askbot.config b/gerrit/acls/opendev/puppet-askbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-askbot.config
rename to gerrit/acls/opendev/puppet-askbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-asterisk.config b/gerrit/acls/opendev/puppet-asterisk.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-asterisk.config
rename to gerrit/acls/opendev/puppet-asterisk.config
diff --git a/gerrit/acls/openstack-infra/puppet-bandersnatch.config b/gerrit/acls/opendev/puppet-bandersnatch.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-bandersnatch.config
rename to gerrit/acls/opendev/puppet-bandersnatch.config
diff --git a/gerrit/acls/openstack-infra/puppet-bugdaystats.config b/gerrit/acls/opendev/puppet-bugdaystats.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-bugdaystats.config
rename to gerrit/acls/opendev/puppet-bugdaystats.config
diff --git a/gerrit/acls/openstack-infra/puppet-bup.config b/gerrit/acls/opendev/puppet-bup.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-bup.config
rename to gerrit/acls/opendev/puppet-bup.config
diff --git a/gerrit/acls/openstack-infra/puppet-cgit.config b/gerrit/acls/opendev/puppet-cgit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-cgit.config
rename to gerrit/acls/opendev/puppet-cgit.config
diff --git a/gerrit/acls/openstack-infra/puppet-ciwatch.config b/gerrit/acls/opendev/puppet-ciwatch.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ciwatch.config
rename to gerrit/acls/opendev/puppet-ciwatch.config
diff --git a/gerrit/acls/openstack-infra/puppet-diskimage_builder.config b/gerrit/acls/opendev/puppet-diskimage_builder.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-diskimage_builder.config
rename to gerrit/acls/opendev/puppet-diskimage_builder.config
diff --git a/gerrit/acls/openstack-infra/puppet-drupal.config b/gerrit/acls/opendev/puppet-drupal.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-drupal.config
rename to gerrit/acls/opendev/puppet-drupal.config
diff --git a/gerrit/acls/openstack-infra/puppet-elastic_recheck.config b/gerrit/acls/opendev/puppet-elastic_recheck.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-elastic_recheck.config
rename to gerrit/acls/opendev/puppet-elastic_recheck.config
diff --git a/gerrit/acls/openstack-infra/puppet-elasticsearch.config b/gerrit/acls/opendev/puppet-elasticsearch.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-elasticsearch.config
rename to gerrit/acls/opendev/puppet-elasticsearch.config
diff --git a/gerrit/acls/openstack-infra/puppet-ethercalc.config b/gerrit/acls/opendev/puppet-ethercalc.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ethercalc.config
rename to gerrit/acls/opendev/puppet-ethercalc.config
diff --git a/gerrit/acls/openstack-infra/puppet-etherpad_lite.config b/gerrit/acls/opendev/puppet-etherpad_lite.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-etherpad_lite.config
rename to gerrit/acls/opendev/puppet-etherpad_lite.config
diff --git a/gerrit/acls/openstack-infra/puppet-exim.config b/gerrit/acls/opendev/puppet-exim.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-exim.config
rename to gerrit/acls/opendev/puppet-exim.config
diff --git a/gerrit/acls/openstack-infra/puppet-germqtt.config b/gerrit/acls/opendev/puppet-germqtt.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-germqtt.config
rename to gerrit/acls/opendev/puppet-germqtt.config
diff --git a/gerrit/acls/openstack-infra/puppet-gerrit.config b/gerrit/acls/opendev/puppet-gerrit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-gerrit.config
rename to gerrit/acls/opendev/puppet-gerrit.config
diff --git a/gerrit/acls/openstack-infra/puppet-gerritbot.config b/gerrit/acls/opendev/puppet-gerritbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-gerritbot.config
rename to gerrit/acls/opendev/puppet-gerritbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-github.config b/gerrit/acls/opendev/puppet-github.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-github.config
rename to gerrit/acls/opendev/puppet-github.config
diff --git a/gerrit/acls/openstack-infra/puppet-grafyaml.config b/gerrit/acls/opendev/puppet-grafyaml.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-grafyaml.config
rename to gerrit/acls/opendev/puppet-grafyaml.config
diff --git a/gerrit/acls/openstack-infra/puppet-graphite.config b/gerrit/acls/opendev/puppet-graphite.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-graphite.config
rename to gerrit/acls/opendev/puppet-graphite.config
diff --git a/gerrit/acls/openstack-infra/puppet-haveged.config b/gerrit/acls/opendev/puppet-haveged.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-haveged.config
rename to gerrit/acls/opendev/puppet-haveged.config
diff --git a/gerrit/acls/openstack-infra/puppet-hound.config b/gerrit/acls/opendev/puppet-hound.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-hound.config
rename to gerrit/acls/opendev/puppet-hound.config
diff --git a/gerrit/acls/openstack-infra/puppet-httpd.config b/gerrit/acls/opendev/puppet-httpd.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-httpd.config
rename to gerrit/acls/opendev/puppet-httpd.config
diff --git a/gerrit/acls/openstack-infra/puppet-infra-cookiecutter.config b/gerrit/acls/opendev/puppet-infra-cookiecutter.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-infra-cookiecutter.config
rename to gerrit/acls/opendev/puppet-infra-cookiecutter.config
diff --git a/gerrit/acls/openstack-infra/puppet-infracloud.config b/gerrit/acls/opendev/puppet-infracloud.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-infracloud.config
rename to gerrit/acls/opendev/puppet-infracloud.config
diff --git a/gerrit/acls/openstack-infra/puppet-ipsilon.config b/gerrit/acls/opendev/puppet-ipsilon.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ipsilon.config
rename to gerrit/acls/opendev/puppet-ipsilon.config
diff --git a/gerrit/acls/openstack-infra/puppet-iptables.config b/gerrit/acls/opendev/puppet-iptables.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-iptables.config
rename to gerrit/acls/opendev/puppet-iptables.config
diff --git a/gerrit/acls/openstack-infra/puppet-jeepyb.config b/gerrit/acls/opendev/puppet-jeepyb.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-jeepyb.config
rename to gerrit/acls/opendev/puppet-jeepyb.config
diff --git a/gerrit/acls/openstack-infra/puppet-jenkins.config b/gerrit/acls/opendev/puppet-jenkins.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-jenkins.config
rename to gerrit/acls/opendev/puppet-jenkins.config
diff --git a/gerrit/acls/openstack-infra/puppet-kerberos.config b/gerrit/acls/opendev/puppet-kerberos.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-kerberos.config
rename to gerrit/acls/opendev/puppet-kerberos.config
diff --git a/gerrit/acls/openstack-infra/puppet-kibana.config b/gerrit/acls/opendev/puppet-kibana.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-kibana.config
rename to gerrit/acls/opendev/puppet-kibana.config
diff --git a/gerrit/acls/openstack-infra/puppet-lodgeit.config b/gerrit/acls/opendev/puppet-lodgeit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-lodgeit.config
rename to gerrit/acls/opendev/puppet-lodgeit.config
diff --git a/gerrit/acls/openstack-infra/puppet-log_processor.config b/gerrit/acls/opendev/puppet-log_processor.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-log_processor.config
rename to gerrit/acls/opendev/puppet-log_processor.config
diff --git a/gerrit/acls/openstack-infra/puppet-logrotate.config b/gerrit/acls/opendev/puppet-logrotate.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-logrotate.config
rename to gerrit/acls/opendev/puppet-logrotate.config
diff --git a/gerrit/acls/openstack-infra/puppet-logstash.config b/gerrit/acls/opendev/puppet-logstash.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-logstash.config
rename to gerrit/acls/opendev/puppet-logstash.config
diff --git a/gerrit/acls/openstack-infra/puppet-lpmqtt.config b/gerrit/acls/opendev/puppet-lpmqtt.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-lpmqtt.config
rename to gerrit/acls/opendev/puppet-lpmqtt.config
diff --git a/gerrit/acls/openstack-infra/puppet-mailman.config b/gerrit/acls/opendev/puppet-mailman.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-mailman.config
rename to gerrit/acls/opendev/puppet-mailman.config
diff --git a/gerrit/acls/openstack-infra/puppet-mediawiki.config b/gerrit/acls/opendev/puppet-mediawiki.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-mediawiki.config
rename to gerrit/acls/opendev/puppet-mediawiki.config
diff --git a/gerrit/acls/openstack-infra/puppet-meetbot.config b/gerrit/acls/opendev/puppet-meetbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-meetbot.config
rename to gerrit/acls/opendev/puppet-meetbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-mosquitto.config b/gerrit/acls/opendev/puppet-mosquitto.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-mosquitto.config
rename to gerrit/acls/opendev/puppet-mosquitto.config
diff --git a/gerrit/acls/openstack-infra/puppet-mqtt_statsd.config b/gerrit/acls/opendev/puppet-mqtt_statsd.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-mqtt_statsd.config
rename to gerrit/acls/opendev/puppet-mqtt_statsd.config
diff --git a/gerrit/acls/openstack-infra/puppet-mysql_backup.config b/gerrit/acls/opendev/puppet-mysql_backup.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-mysql_backup.config
rename to gerrit/acls/opendev/puppet-mysql_backup.config
diff --git a/gerrit/acls/openstack-infra/puppet-nodepool.config b/gerrit/acls/opendev/puppet-nodepool.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-nodepool.config
rename to gerrit/acls/opendev/puppet-nodepool.config
diff --git a/gerrit/acls/openstack-infra/puppet-openafs.config b/gerrit/acls/opendev/puppet-openafs.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-openafs.config
rename to gerrit/acls/opendev/puppet-openafs.config
diff --git a/gerrit/acls/openstack-infra/puppet-openstack_health.config b/gerrit/acls/opendev/puppet-openstack_health.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-openstack_health.config
rename to gerrit/acls/opendev/puppet-openstack_health.config
diff --git a/gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config b/gerrit/acls/opendev/puppet-openstack_infra_spec_helper.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config
rename to gerrit/acls/opendev/puppet-openstack_infra_spec_helper.config
diff --git a/gerrit/acls/openstack-infra/puppet-openstackci.config b/gerrit/acls/opendev/puppet-openstackci.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-openstackci.config
rename to gerrit/acls/opendev/puppet-openstackci.config
diff --git a/gerrit/acls/openstack-infra/puppet-openstackid.config b/gerrit/acls/opendev/puppet-openstackid.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-openstackid.config
rename to gerrit/acls/opendev/puppet-openstackid.config
diff --git a/gerrit/acls/openstack-infra/puppet-os_client_config.config b/gerrit/acls/opendev/puppet-os_client_config.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-os_client_config.config
rename to gerrit/acls/opendev/puppet-os_client_config.config
diff --git a/gerrit/acls/openstack-infra/puppet-packagekit.config b/gerrit/acls/opendev/puppet-packagekit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-packagekit.config
rename to gerrit/acls/opendev/puppet-packagekit.config
diff --git a/gerrit/acls/openstack-infra/puppet-pgsql_backup.config b/gerrit/acls/opendev/puppet-pgsql_backup.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-pgsql_backup.config
rename to gerrit/acls/opendev/puppet-pgsql_backup.config
diff --git a/gerrit/acls/openstack-infra/puppet-phabricator.config b/gerrit/acls/opendev/puppet-phabricator.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-phabricator.config
rename to gerrit/acls/opendev/puppet-phabricator.config
diff --git a/gerrit/acls/openstack-infra/puppet-pip.config b/gerrit/acls/opendev/puppet-pip.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-pip.config
rename to gerrit/acls/opendev/puppet-pip.config
diff --git a/gerrit/acls/openstack-infra/puppet-planet.config b/gerrit/acls/opendev/puppet-planet.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-planet.config
rename to gerrit/acls/opendev/puppet-planet.config
diff --git a/gerrit/acls/openstack-infra/puppet-project_config.config b/gerrit/acls/opendev/puppet-project_config.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-project_config.config
rename to gerrit/acls/opendev/puppet-project_config.config
diff --git a/gerrit/acls/openstack-infra/puppet-ptgbot.config b/gerrit/acls/opendev/puppet-ptgbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ptgbot.config
rename to gerrit/acls/opendev/puppet-ptgbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-puppet.config b/gerrit/acls/opendev/puppet-puppet.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-puppet.config
rename to gerrit/acls/opendev/puppet-puppet.config
diff --git a/gerrit/acls/openstack-infra/puppet-redis.config b/gerrit/acls/opendev/puppet-redis.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-redis.config
rename to gerrit/acls/opendev/puppet-redis.config
diff --git a/gerrit/acls/openstack-infra/puppet-refstack.config b/gerrit/acls/opendev/puppet-refstack.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-refstack.config
rename to gerrit/acls/opendev/puppet-refstack.config
diff --git a/gerrit/acls/openstack-infra/puppet-reviewday.config b/gerrit/acls/opendev/puppet-reviewday.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-reviewday.config
rename to gerrit/acls/opendev/puppet-reviewday.config
diff --git a/gerrit/acls/openstack-infra/puppet-simpleproxy.config b/gerrit/acls/opendev/puppet-simpleproxy.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-simpleproxy.config
rename to gerrit/acls/opendev/puppet-simpleproxy.config
diff --git a/gerrit/acls/openstack-infra/puppet-snmpd.config b/gerrit/acls/opendev/puppet-snmpd.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-snmpd.config
rename to gerrit/acls/opendev/puppet-snmpd.config
diff --git a/gerrit/acls/openstack-infra/puppet-ssh.config b/gerrit/acls/opendev/puppet-ssh.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ssh.config
rename to gerrit/acls/opendev/puppet-ssh.config
diff --git a/gerrit/acls/openstack-infra/puppet-ssl_cert_check.config b/gerrit/acls/opendev/puppet-ssl_cert_check.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ssl_cert_check.config
rename to gerrit/acls/opendev/puppet-ssl_cert_check.config
diff --git a/gerrit/acls/openstack-infra/puppet-statusbot.config b/gerrit/acls/opendev/puppet-statusbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-statusbot.config
rename to gerrit/acls/opendev/puppet-statusbot.config
diff --git a/gerrit/acls/openstack-infra/puppet-storyboard.config b/gerrit/acls/opendev/puppet-storyboard.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-storyboard.config
rename to gerrit/acls/opendev/puppet-storyboard.config
diff --git a/gerrit/acls/openstack-infra/puppet-subunit2sql.config b/gerrit/acls/opendev/puppet-subunit2sql.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-subunit2sql.config
rename to gerrit/acls/opendev/puppet-subunit2sql.config
diff --git a/gerrit/acls/openstack-infra/puppet-sudoers.config b/gerrit/acls/opendev/puppet-sudoers.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-sudoers.config
rename to gerrit/acls/opendev/puppet-sudoers.config
diff --git a/gerrit/acls/openstack-infra/puppet-tmpreaper.config b/gerrit/acls/opendev/puppet-tmpreaper.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-tmpreaper.config
rename to gerrit/acls/opendev/puppet-tmpreaper.config
diff --git a/gerrit/acls/openstack-infra/puppet-translation_checksite.config b/gerrit/acls/opendev/puppet-translation_checksite.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-translation_checksite.config
rename to gerrit/acls/opendev/puppet-translation_checksite.config
diff --git a/gerrit/acls/openstack-infra/puppet-ulimit.config b/gerrit/acls/opendev/puppet-ulimit.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-ulimit.config
rename to gerrit/acls/opendev/puppet-ulimit.config
diff --git a/gerrit/acls/openstack-infra/puppet-unattended_upgrades.config b/gerrit/acls/opendev/puppet-unattended_upgrades.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-unattended_upgrades.config
rename to gerrit/acls/opendev/puppet-unattended_upgrades.config
diff --git a/gerrit/acls/openstack-infra/puppet-unbound.config b/gerrit/acls/opendev/puppet-unbound.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-unbound.config
rename to gerrit/acls/opendev/puppet-unbound.config
diff --git a/gerrit/acls/openstack-infra/puppet-user.config b/gerrit/acls/opendev/puppet-user.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-user.config
rename to gerrit/acls/opendev/puppet-user.config
diff --git a/gerrit/acls/openstack-infra/puppet-vcsrepo.config b/gerrit/acls/opendev/puppet-vcsrepo.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-vcsrepo.config
rename to gerrit/acls/opendev/puppet-vcsrepo.config
diff --git a/gerrit/acls/openstack-infra/puppet-yum.config b/gerrit/acls/opendev/puppet-yum.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-yum.config
rename to gerrit/acls/opendev/puppet-yum.config
diff --git a/gerrit/acls/openstack-infra/puppet-zanata.config b/gerrit/acls/opendev/puppet-zanata.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-zanata.config
rename to gerrit/acls/opendev/puppet-zanata.config
diff --git a/gerrit/acls/openstack-infra/puppet-zuul.config b/gerrit/acls/opendev/puppet-zuul.config
similarity index 100%
rename from gerrit/acls/openstack-infra/puppet-zuul.config
rename to gerrit/acls/opendev/puppet-zuul.config
diff --git a/gerrit/acls/openstack-infra/pynotedb.config b/gerrit/acls/opendev/pynotedb.config
similarity index 100%
rename from gerrit/acls/openstack-infra/pynotedb.config
rename to gerrit/acls/opendev/pynotedb.config
diff --git a/gerrit/acls/openstack-infra/python-storyboardclient.config b/gerrit/acls/opendev/python-storyboardclient.config
similarity index 100%
rename from gerrit/acls/openstack-infra/python-storyboardclient.config
rename to gerrit/acls/opendev/python-storyboardclient.config
diff --git a/gerrit/acls/openstack-infra/statusbot.config b/gerrit/acls/opendev/statusbot.config
similarity index 100%
rename from gerrit/acls/openstack-infra/statusbot.config
rename to gerrit/acls/opendev/statusbot.config
diff --git a/gerrit/acls/openstack-infra/storyboard-webclient.config b/gerrit/acls/opendev/storyboard-webclient.config
similarity index 100%
rename from gerrit/acls/openstack-infra/storyboard-webclient.config
rename to gerrit/acls/opendev/storyboard-webclient.config
diff --git a/gerrit/acls/openstack-infra/storyboard.config b/gerrit/acls/opendev/storyboard.config
similarity index 100%
rename from gerrit/acls/openstack-infra/storyboard.config
rename to gerrit/acls/opendev/storyboard.config
diff --git a/gerrit/acls/openstack-infra/subunit2sql.config b/gerrit/acls/opendev/subunit2sql.config
similarity index 100%
rename from gerrit/acls/openstack-infra/subunit2sql.config
rename to gerrit/acls/opendev/subunit2sql.config
diff --git a/gerrit/acls/openstack-infra/system-config.config b/gerrit/acls/opendev/system-config.config
similarity index 100%
rename from gerrit/acls/openstack-infra/system-config.config
rename to gerrit/acls/opendev/system-config.config
diff --git a/gerrit/acls/openstack-infra/yaml2ical.config b/gerrit/acls/opendev/yaml2ical.config
similarity index 100%
rename from gerrit/acls/openstack-infra/yaml2ical.config
rename to gerrit/acls/opendev/yaml2ical.config
diff --git a/gerrit/acls/openstack-dev/bashate.config b/gerrit/acls/openstack/bashate.config
similarity index 100%
rename from gerrit/acls/openstack-dev/bashate.config
rename to gerrit/acls/openstack/bashate.config
diff --git a/gerrit/acls/openstack-infra/bugdaystats.config b/gerrit/acls/openstack/bugdaystats.config
similarity index 100%
rename from gerrit/acls/openstack-infra/bugdaystats.config
rename to gerrit/acls/openstack/bugdaystats.config
diff --git a/gerrit/acls/openstack-dev/cookiecutter.config b/gerrit/acls/openstack/cookiecutter.config
similarity index 100%
rename from gerrit/acls/openstack-dev/cookiecutter.config
rename to gerrit/acls/openstack/cookiecutter.config
diff --git a/gerrit/acls/openstack-infra/devstack-gate.config b/gerrit/acls/openstack/devstack-gate.config
similarity index 100%
rename from gerrit/acls/openstack-infra/devstack-gate.config
rename to gerrit/acls/openstack/devstack-gate.config
diff --git a/gerrit/acls/openstack-dev/devstack-vagrant.config b/gerrit/acls/openstack/devstack-vagrant.config
similarity index 100%
rename from gerrit/acls/openstack-dev/devstack-vagrant.config
rename to gerrit/acls/openstack/devstack-vagrant.config
diff --git a/gerrit/acls/openstack-dev/devstack.config b/gerrit/acls/openstack/devstack.config
similarity index 100%
rename from gerrit/acls/openstack-dev/devstack.config
rename to gerrit/acls/openstack/devstack.config
diff --git a/gerrit/acls/openstack-infra/git-review.config b/gerrit/acls/openstack/git-review.config
similarity index 100%
rename from gerrit/acls/openstack-infra/git-review.config
rename to gerrit/acls/openstack/git-review.config
diff --git a/gerrit/acls/openstack-dev/grenade.config b/gerrit/acls/openstack/grenade.config
similarity index 100%
rename from gerrit/acls/openstack-dev/grenade.config
rename to gerrit/acls/openstack/grenade.config
diff --git a/gerrit/acls/openstack-dev/hacking.config b/gerrit/acls/openstack/hacking.config
similarity index 100%
rename from gerrit/acls/openstack-dev/hacking.config
rename to gerrit/acls/openstack/hacking.config
diff --git a/gerrit/acls/openstack-dev/heat-cfnclient.config b/gerrit/acls/openstack/heat-cfnclient.config
similarity index 100%
rename from gerrit/acls/openstack-dev/heat-cfnclient.config
rename to gerrit/acls/openstack/heat-cfnclient.config
diff --git a/gerrit/acls/openstack-infra/infra-manual.config b/gerrit/acls/openstack/infra-manual.config
similarity index 100%
rename from gerrit/acls/openstack-infra/infra-manual.config
rename to gerrit/acls/openstack/infra-manual.config
diff --git a/gerrit/acls/openstack-infra/logstash-filters.config b/gerrit/acls/openstack/logstash-filters.config
similarity index 100%
rename from gerrit/acls/openstack-infra/logstash-filters.config
rename to gerrit/acls/openstack/logstash-filters.config
diff --git a/gerrit/acls/openstack-infra/nose-html-output.config b/gerrit/acls/openstack/nose-html-output.config
similarity index 100%
rename from gerrit/acls/openstack-infra/nose-html-output.config
rename to gerrit/acls/openstack/nose-html-output.config
diff --git a/gerrit/acls/openstack-dev/openstack-nose.config b/gerrit/acls/openstack/openstack-nose.config
similarity index 100%
rename from gerrit/acls/openstack-dev/openstack-nose.config
rename to gerrit/acls/openstack/openstack-nose.config
diff --git a/gerrit/acls/openstack-infra/openstack-zuul-jobs.config b/gerrit/acls/openstack/openstack-zuul-jobs.config
similarity index 100%
rename from gerrit/acls/openstack-infra/openstack-zuul-jobs.config
rename to gerrit/acls/openstack/openstack-zuul-jobs.config
diff --git a/gerrit/acls/openstack-infra/openstack-zuul-roles.config b/gerrit/acls/openstack/openstack-zuul-roles.config
similarity index 100%
rename from gerrit/acls/openstack-infra/openstack-zuul-roles.config
rename to gerrit/acls/openstack/openstack-zuul-roles.config
diff --git a/gerrit/acls/openstack-infra/os-loganalyze.config b/gerrit/acls/openstack/os-loganalyze.config
similarity index 100%
rename from gerrit/acls/openstack-infra/os-loganalyze.config
rename to gerrit/acls/openstack/os-loganalyze.config
diff --git a/gerrit/acls/openstack-dev/oslo-cookiecutter.config b/gerrit/acls/openstack/oslo-cookiecutter.config
similarity index 100%
rename from gerrit/acls/openstack-dev/oslo-cookiecutter.config
rename to gerrit/acls/openstack/oslo-cookiecutter.config
diff --git a/gerrit/acls/openstack-dev/pbr.config b/gerrit/acls/openstack/pbr.config
similarity index 100%
rename from gerrit/acls/openstack-dev/pbr.config
rename to gerrit/acls/openstack/pbr.config
diff --git a/gerrit/acls/openstack-infra/project-config.config b/gerrit/acls/openstack/project-config.config
similarity index 100%
rename from gerrit/acls/openstack-infra/project-config.config
rename to gerrit/acls/openstack/project-config.config
diff --git a/gerrit/acls/openstack-infra/requestsexceptions.config b/gerrit/acls/openstack/requestsexceptions.config
similarity index 100%
rename from gerrit/acls/openstack-infra/requestsexceptions.config
rename to gerrit/acls/openstack/requestsexceptions.config
diff --git a/gerrit/acls/openstack-infra/reviewday.config b/gerrit/acls/openstack/reviewday.config
similarity index 100%
rename from gerrit/acls/openstack-infra/reviewday.config
rename to gerrit/acls/openstack/reviewday.config
diff --git a/gerrit/acls/openstack-infra/reviewstats.config b/gerrit/acls/openstack/reviewstats.config
similarity index 100%
rename from gerrit/acls/openstack-infra/reviewstats.config
rename to gerrit/acls/openstack/reviewstats.config
diff --git a/gerrit/acls/openstack-dev/specs-cookiecutter.config b/gerrit/acls/openstack/specs-cookiecutter.config
similarity index 100%
rename from gerrit/acls/openstack-dev/specs-cookiecutter.config
rename to gerrit/acls/openstack/specs-cookiecutter.config
diff --git a/gerrit/acls/openstack-infra/tripleo-ci.config b/gerrit/acls/openstack/tripleo-ci.config
similarity index 100%
rename from gerrit/acls/openstack-infra/tripleo-ci.config
rename to gerrit/acls/openstack/tripleo-ci.config
diff --git a/gerrit/acls/openstack/edge-computing-group.config b/gerrit/acls/osf/edge-computing-group.config
similarity index 100%
rename from gerrit/acls/openstack/edge-computing-group.config
rename to gerrit/acls/osf/edge-computing-group.config
diff --git a/gerrit/acls/openstack/four-opens.config b/gerrit/acls/osf/four-opens.config
similarity index 100%
rename from gerrit/acls/openstack/four-opens.config
rename to gerrit/acls/osf/four-opens.config
diff --git a/gerrit/acls/openstack-infra/groups-static-pages.config b/gerrit/acls/osf/groups-static-pages.config
similarity index 100%
rename from gerrit/acls/openstack-infra/groups-static-pages.config
rename to gerrit/acls/osf/groups-static-pages.config
diff --git a/gerrit/acls/openstack-infra/groups.config b/gerrit/acls/osf/groups.config
similarity index 100%
rename from gerrit/acls/openstack-infra/groups.config
rename to gerrit/acls/osf/groups.config
diff --git a/gerrit/acls/openstack-infra/odsreg.config b/gerrit/acls/osf/odsreg.config
similarity index 100%
rename from gerrit/acls/openstack-infra/odsreg.config
rename to gerrit/acls/osf/odsreg.config
diff --git a/gerrit/acls/openstack/openstack-map.config b/gerrit/acls/osf/openstack-map.config
similarity index 100%
rename from gerrit/acls/openstack/openstack-map.config
rename to gerrit/acls/osf/openstack-map.config
diff --git a/gerrit/acls/openstack-infra/openstackid-resources.config b/gerrit/acls/osf/openstackid-resources.config
similarity index 100%
rename from gerrit/acls/openstack-infra/openstackid-resources.config
rename to gerrit/acls/osf/openstackid-resources.config
diff --git a/gerrit/acls/openstack-infra/openstackid.config b/gerrit/acls/osf/openstackid.config
similarity index 100%
rename from gerrit/acls/openstack-infra/openstackid.config
rename to gerrit/acls/osf/openstackid.config
diff --git a/gerrit/acls/openstack-infra/openstackweb.config b/gerrit/acls/osf/openstackweb.config
similarity index 100%
rename from gerrit/acls/openstack-infra/openstackweb.config
rename to gerrit/acls/osf/openstackweb.config
diff --git a/gerrit/acls/openstack/os-faults.config b/gerrit/acls/performa/os-faults.config
similarity index 100%
rename from gerrit/acls/openstack/os-faults.config
rename to gerrit/acls/performa/os-faults.config
diff --git a/gerrit/acls/openstack/shaker.config b/gerrit/acls/performa/shaker.config
similarity index 100%
rename from gerrit/acls/openstack/shaker.config
rename to gerrit/acls/performa/shaker.config
diff --git a/gerrit/acls/openstack/ansible-role-ara.config b/gerrit/acls/recordsansible/ansible-role-ara.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-ara.config
rename to gerrit/acls/recordsansible/ansible-role-ara.config
diff --git a/gerrit/acls/openstack/ara.config b/gerrit/acls/recordsansible/ara.config
similarity index 100%
rename from gerrit/acls/openstack/ara.config
rename to gerrit/acls/recordsansible/ara.config
diff --git a/gerrit/acls/openstack/sardonic.config b/gerrit/acls/sardonic/sardonic.config
similarity index 100%
rename from gerrit/acls/openstack/sardonic.config
rename to gerrit/acls/sardonic/sardonic.config
diff --git a/gerrit/acls/openstack/stx-clients.config b/gerrit/acls/starlingx/clients.config
similarity index 100%
rename from gerrit/acls/openstack/stx-clients.config
rename to gerrit/acls/starlingx/clients.config
diff --git a/gerrit/acls/openstack/stx-config.config b/gerrit/acls/starlingx/config.config
similarity index 100%
rename from gerrit/acls/openstack/stx-config.config
rename to gerrit/acls/starlingx/config.config
diff --git a/gerrit/acls/openstack/stx-distcloud-client.config b/gerrit/acls/starlingx/distcloud-client.config
similarity index 100%
rename from gerrit/acls/openstack/stx-distcloud-client.config
rename to gerrit/acls/starlingx/distcloud-client.config
diff --git a/gerrit/acls/openstack/stx-distcloud.config b/gerrit/acls/starlingx/distcloud.config
similarity index 100%
rename from gerrit/acls/openstack/stx-distcloud.config
rename to gerrit/acls/starlingx/distcloud.config
diff --git a/gerrit/acls/openstack/stx-docs.config b/gerrit/acls/starlingx/docs.config
similarity index 100%
rename from gerrit/acls/openstack/stx-docs.config
rename to gerrit/acls/starlingx/docs.config
diff --git a/gerrit/acls/openstack/stx-fault.config b/gerrit/acls/starlingx/fault.config
similarity index 100%
rename from gerrit/acls/openstack/stx-fault.config
rename to gerrit/acls/starlingx/fault.config
diff --git a/gerrit/acls/openstack/stx-governance.config b/gerrit/acls/starlingx/governance.config
similarity index 100%
rename from gerrit/acls/openstack/stx-governance.config
rename to gerrit/acls/starlingx/governance.config
diff --git a/gerrit/acls/openstack/stx-gui.config b/gerrit/acls/starlingx/gui.config
similarity index 100%
rename from gerrit/acls/openstack/stx-gui.config
rename to gerrit/acls/starlingx/gui.config
diff --git a/gerrit/acls/openstack/stx-ha.config b/gerrit/acls/starlingx/ha.config
similarity index 100%
rename from gerrit/acls/openstack/stx-ha.config
rename to gerrit/acls/starlingx/ha.config
diff --git a/gerrit/acls/openstack/stx-integ.config b/gerrit/acls/starlingx/integ.config
similarity index 100%
rename from gerrit/acls/openstack/stx-integ.config
rename to gerrit/acls/starlingx/integ.config
diff --git a/gerrit/acls/openstack/stx-manifest.config b/gerrit/acls/starlingx/manifest.config
similarity index 100%
rename from gerrit/acls/openstack/stx-manifest.config
rename to gerrit/acls/starlingx/manifest.config
diff --git a/gerrit/acls/openstack/stx-metal.config b/gerrit/acls/starlingx/metal.config
similarity index 100%
rename from gerrit/acls/openstack/stx-metal.config
rename to gerrit/acls/starlingx/metal.config
diff --git a/gerrit/acls/openstack/stx-nfv.config b/gerrit/acls/starlingx/nfv.config
similarity index 100%
rename from gerrit/acls/openstack/stx-nfv.config
rename to gerrit/acls/starlingx/nfv.config
diff --git a/gerrit/acls/openstack/stx-root.config b/gerrit/acls/starlingx/root.config
similarity index 100%
rename from gerrit/acls/openstack/stx-root.config
rename to gerrit/acls/starlingx/root.config
diff --git a/gerrit/acls/openstack/stx-specs.config b/gerrit/acls/starlingx/specs.config
similarity index 100%
rename from gerrit/acls/openstack/stx-specs.config
rename to gerrit/acls/starlingx/specs.config
diff --git a/gerrit/acls/openstack/stx-test.config b/gerrit/acls/starlingx/test.config
similarity index 100%
rename from gerrit/acls/openstack/stx-test.config
rename to gerrit/acls/starlingx/test.config
diff --git a/gerrit/acls/openstack/stx-tis-repo.config b/gerrit/acls/starlingx/tis-repo.config
similarity index 100%
rename from gerrit/acls/openstack/stx-tis-repo.config
rename to gerrit/acls/starlingx/tis-repo.config
diff --git a/gerrit/acls/openstack/stx-tools.config b/gerrit/acls/starlingx/tools.config
similarity index 100%
rename from gerrit/acls/openstack/stx-tools.config
rename to gerrit/acls/starlingx/tools.config
diff --git a/gerrit/acls/openstack/stx-update.config b/gerrit/acls/starlingx/update.config
similarity index 100%
rename from gerrit/acls/openstack/stx-update.config
rename to gerrit/acls/starlingx/update.config
diff --git a/gerrit/acls/openstack/stx-upstream.config b/gerrit/acls/starlingx/upstream.config
similarity index 100%
rename from gerrit/acls/openstack/stx-upstream.config
rename to gerrit/acls/starlingx/upstream.config
diff --git a/gerrit/acls/openstack/boartty.config b/gerrit/acls/ttygroup/boartty.config
similarity index 100%
rename from gerrit/acls/openstack/boartty.config
rename to gerrit/acls/ttygroup/boartty.config
diff --git a/gerrit/acls/openstack/gertty.config b/gerrit/acls/ttygroup/gertty.config
similarity index 100%
rename from gerrit/acls/openstack/gertty.config
rename to gerrit/acls/ttygroup/gertty.config
diff --git a/gerrit/acls/openstack/ansible-role-ansible.config b/gerrit/acls/windmill/ansible-role-ansible.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-ansible.config
rename to gerrit/acls/windmill/ansible-role-ansible.config
diff --git a/gerrit/acls/openstack/ansible-role-borgbackup.config b/gerrit/acls/windmill/ansible-role-borgbackup.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-borgbackup.config
rename to gerrit/acls/windmill/ansible-role-borgbackup.config
diff --git a/gerrit/acls/openstack/ansible-role-borgmatic.config b/gerrit/acls/windmill/ansible-role-borgmatic.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-borgmatic.config
rename to gerrit/acls/windmill/ansible-role-borgmatic.config
diff --git a/gerrit/acls/openstack/ansible-role-carbon.config b/gerrit/acls/windmill/ansible-role-carbon.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-carbon.config
rename to gerrit/acls/windmill/ansible-role-carbon.config
diff --git a/gerrit/acls/openstack/ansible-role-diskimage-builder.config b/gerrit/acls/windmill/ansible-role-diskimage-builder.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-diskimage-builder.config
rename to gerrit/acls/windmill/ansible-role-diskimage-builder.config
diff --git a/gerrit/acls/openstack/ansible-role-gearman.config b/gerrit/acls/windmill/ansible-role-gear.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-gearman.config
rename to gerrit/acls/windmill/ansible-role-gear.config
diff --git a/gerrit/acls/openstack/ansible-role-grafyaml.config b/gerrit/acls/windmill/ansible-role-grafyaml.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-grafyaml.config
rename to gerrit/acls/windmill/ansible-role-grafyaml.config
diff --git a/gerrit/acls/openstack/ansible-role-logrotate.config b/gerrit/acls/windmill/ansible-role-logrotate.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-logrotate.config
rename to gerrit/acls/windmill/ansible-role-logrotate.config
diff --git a/gerrit/acls/openstack/ansible-role-nginx.config b/gerrit/acls/windmill/ansible-role-nginx.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-nginx.config
rename to gerrit/acls/windmill/ansible-role-nginx.config
diff --git a/gerrit/acls/openstack/ansible-role-nodepool.config b/gerrit/acls/windmill/ansible-role-nodepool.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-nodepool.config
rename to gerrit/acls/windmill/ansible-role-nodepool.config
diff --git a/gerrit/acls/openstack/ansible-role-openstacksdk.config b/gerrit/acls/windmill/ansible-role-openstacksdk.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-openstacksdk.config
rename to gerrit/acls/windmill/ansible-role-openstacksdk.config
diff --git a/gerrit/acls/openstack/ansible-role-ssh.config b/gerrit/acls/windmill/ansible-role-ssh.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-ssh.config
rename to gerrit/acls/windmill/ansible-role-ssh.config
diff --git a/gerrit/acls/openstack/ansible-role-statsd.config b/gerrit/acls/windmill/ansible-role-statsd.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-statsd.config
rename to gerrit/acls/windmill/ansible-role-statsd.config
diff --git a/gerrit/acls/openstack/ansible-role-sudoers.config b/gerrit/acls/windmill/ansible-role-sudoers.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-sudoers.config
rename to gerrit/acls/windmill/ansible-role-sudoers.config
diff --git a/gerrit/acls/openstack/ansible-role-virtualenv.config b/gerrit/acls/windmill/ansible-role-virtualenv.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-virtualenv.config
rename to gerrit/acls/windmill/ansible-role-virtualenv.config
diff --git a/gerrit/acls/openstack/ansible-role-whisper.config b/gerrit/acls/windmill/ansible-role-whisper.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-whisper.config
rename to gerrit/acls/windmill/ansible-role-whisper.config
diff --git a/gerrit/acls/openstack/ansible-role-zookeeper.config b/gerrit/acls/windmill/ansible-role-zookeeper.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-zookeeper.config
rename to gerrit/acls/windmill/ansible-role-zookeeper.config
diff --git a/gerrit/acls/openstack/ansible-role-zuul.config b/gerrit/acls/windmill/ansible-role-zuul.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-zuul.config
rename to gerrit/acls/windmill/ansible-role-zuul.config
diff --git a/gerrit/acls/openstack/windmill-backup.config b/gerrit/acls/windmill/windmill-backup.config
similarity index 100%
rename from gerrit/acls/openstack/windmill-backup.config
rename to gerrit/acls/windmill/windmill-backup.config
diff --git a/gerrit/acls/openstack/windmill-config.config b/gerrit/acls/windmill/windmill-config.config
similarity index 100%
rename from gerrit/acls/openstack/windmill-config.config
rename to gerrit/acls/windmill/windmill-config.config
diff --git a/gerrit/acls/openstack/windmill-ops.config b/gerrit/acls/windmill/windmill-ops.config
similarity index 100%
rename from gerrit/acls/openstack/windmill-ops.config
rename to gerrit/acls/windmill/windmill-ops.config
diff --git a/gerrit/acls/openstack/windmill.config b/gerrit/acls/windmill/windmill.config
similarity index 100%
rename from gerrit/acls/openstack/windmill.config
rename to gerrit/acls/windmill/windmill.config
diff --git a/gerrit/acls/openstack/aeromancer.config b/gerrit/acls/x/aeromancer.config
similarity index 100%
rename from gerrit/acls/openstack/aeromancer.config
rename to gerrit/acls/x/aeromancer.config
diff --git a/gerrit/acls/openstack/ailuropoda.config b/gerrit/acls/x/ailuropoda.config
similarity index 100%
rename from gerrit/acls/openstack/ailuropoda.config
rename to gerrit/acls/x/ailuropoda.config
diff --git a/gerrit/acls/openstack/alexandria.config b/gerrit/acls/x/alexandria.config
similarity index 100%
rename from gerrit/acls/openstack/alexandria.config
rename to gerrit/acls/x/alexandria.config
diff --git a/gerrit/acls/openstack/almanach.config b/gerrit/acls/x/almanach.config
similarity index 100%
rename from gerrit/acls/openstack/almanach.config
rename to gerrit/acls/x/almanach.config
diff --git a/gerrit/acls/openstack/ansible-role-bindep.config b/gerrit/acls/x/ansible-role-bindep.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-bindep.config
rename to gerrit/acls/x/ansible-role-bindep.config
diff --git a/gerrit/acls/openstack/ansible-role-cloud-launcher.config b/gerrit/acls/x/ansible-role-cloud-launcher.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-cloud-launcher.config
rename to gerrit/acls/x/ansible-role-cloud-launcher.config
diff --git a/gerrit/acls/openstack/ansible-role-fedmsg.config b/gerrit/acls/x/ansible-role-fedmsg.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-fedmsg.config
rename to gerrit/acls/x/ansible-role-fedmsg.config
diff --git a/gerrit/acls/openstack/ansible-role-jenkins-job-builder.config b/gerrit/acls/x/ansible-role-jenkins-job-builder.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-jenkins-job-builder.config
rename to gerrit/acls/x/ansible-role-jenkins-job-builder.config
diff --git a/gerrit/acls/openstack/ansible-role-jenkins-plugins.config b/gerrit/acls/x/ansible-role-jenkins-plugins.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-jenkins-plugins.config
rename to gerrit/acls/x/ansible-role-jenkins-plugins.config
diff --git a/gerrit/acls/openstack/ansible-role-jenkins.config b/gerrit/acls/x/ansible-role-jenkins.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-jenkins.config
rename to gerrit/acls/x/ansible-role-jenkins.config
diff --git a/gerrit/acls/openstack/ansible-role-shade.config b/gerrit/acls/x/ansible-role-shade.config
similarity index 100%
rename from gerrit/acls/openstack/ansible-role-shade.config
rename to gerrit/acls/x/ansible-role-shade.config
diff --git a/gerrit/acls/openstack/apmec.config b/gerrit/acls/x/apmec.config
similarity index 100%
rename from gerrit/acls/openstack/apmec.config
rename to gerrit/acls/x/apmec.config
diff --git a/gerrit/acls/openstack/bareon-ironic.config b/gerrit/acls/x/bareon-ironic.config
similarity index 100%
rename from gerrit/acls/openstack/bareon-ironic.config
rename to gerrit/acls/x/bareon-ironic.config
diff --git a/gerrit/acls/openstack/bareon.config b/gerrit/acls/x/bareon.config
similarity index 100%
rename from gerrit/acls/openstack/bareon.config
rename to gerrit/acls/x/bareon.config
diff --git a/gerrit/acls/openstack/bilean.config b/gerrit/acls/x/bilean.config
similarity index 100%
rename from gerrit/acls/openstack/bilean.config
rename to gerrit/acls/x/bilean.config
diff --git a/gerrit/acls/openstack/broadview-collector.config b/gerrit/acls/x/broadview-collector.config
similarity index 100%
rename from gerrit/acls/openstack/broadview-collector.config
rename to gerrit/acls/x/broadview-collector.config
diff --git a/gerrit/acls/openstack/broadview-lib.config b/gerrit/acls/x/broadview-lib.config
similarity index 100%
rename from gerrit/acls/openstack/broadview-lib.config
rename to gerrit/acls/x/broadview-lib.config
diff --git a/gerrit/acls/openstack/broadview-ui.config b/gerrit/acls/x/broadview-ui.config
similarity index 100%
rename from gerrit/acls/openstack/broadview-ui.config
rename to gerrit/acls/x/broadview-ui.config
diff --git a/gerrit/acls/openstack/browbeat.config b/gerrit/acls/x/browbeat.config
similarity index 100%
rename from gerrit/acls/openstack/browbeat.config
rename to gerrit/acls/x/browbeat.config
diff --git a/gerrit/acls/openstack/cathead.config b/gerrit/acls/x/cathead.config
similarity index 100%
rename from gerrit/acls/openstack/cathead.config
rename to gerrit/acls/x/cathead.config
diff --git a/gerrit/acls/openstack/certbot-dns-openstack.config b/gerrit/acls/x/certbot-dns-openstack.config
similarity index 100%
rename from gerrit/acls/openstack/certbot-dns-openstack.config
rename to gerrit/acls/x/certbot-dns-openstack.config
diff --git a/gerrit/acls/openstack/charm-6wind-virtual-accelerator.config b/gerrit/acls/x/charm-6wind-virtual-accelerator.config
similarity index 100%
rename from gerrit/acls/openstack/charm-6wind-virtual-accelerator.config
rename to gerrit/acls/x/charm-6wind-virtual-accelerator.config
diff --git a/gerrit/acls/openstack/charm-vault.config b/gerrit/acls/x/charm-vault.config
similarity index 100%
rename from gerrit/acls/openstack/charm-vault.config
rename to gerrit/acls/x/charm-vault.config
diff --git a/gerrit/acls/openstack/ci-cd-pipeline-app-murano.config b/gerrit/acls/x/ci-cd-pipeline-app-murano.config
similarity index 100%
rename from gerrit/acls/openstack/ci-cd-pipeline-app-murano.config
rename to gerrit/acls/x/ci-cd-pipeline-app-murano.config
diff --git a/gerrit/acls/openstack/cinder-fusioncompute.config b/gerrit/acls/x/cinder-fusioncompute.config
similarity index 100%
rename from gerrit/acls/openstack/cinder-fusioncompute.config
rename to gerrit/acls/x/cinder-fusioncompute.config
diff --git a/gerrit/acls/openstack/cisco-ironic-contrib.config b/gerrit/acls/x/cisco-ironic-contrib.config
similarity index 100%
rename from gerrit/acls/openstack/cisco-ironic-contrib.config
rename to gerrit/acls/x/cisco-ironic-contrib.config
diff --git a/gerrit/acls/openstack-infra/ciwatch.config b/gerrit/acls/x/ciwatch.config
similarity index 100%
rename from gerrit/acls/openstack-infra/ciwatch.config
rename to gerrit/acls/x/ciwatch.config
diff --git a/gerrit/acls/openstack/cl-openstack-client.config b/gerrit/acls/x/cl-openstack-client.config
similarity index 100%
rename from gerrit/acls/openstack/cl-openstack-client.config
rename to gerrit/acls/x/cl-openstack-client.config
diff --git a/gerrit/acls/openstack/cloud-init.config b/gerrit/acls/x/cloud-init.config
similarity index 100%
rename from gerrit/acls/openstack/cloud-init.config
rename to gerrit/acls/x/cloud-init.config
diff --git a/gerrit/acls/openstack/cloudbase-init.config b/gerrit/acls/x/cloudbase-init.config
similarity index 100%
rename from gerrit/acls/openstack/cloudbase-init.config
rename to gerrit/acls/x/cloudbase-init.config
diff --git a/gerrit/acls/openstack/cloudcafe.config b/gerrit/acls/x/cloudcafe.config
similarity index 100%
rename from gerrit/acls/openstack/cloudcafe.config
rename to gerrit/acls/x/cloudcafe.config
diff --git a/gerrit/acls/openstack/cloudpulse.config b/gerrit/acls/x/cloudpulse.config
similarity index 100%
rename from gerrit/acls/openstack/cloudpulse.config
rename to gerrit/acls/x/cloudpulse.config
diff --git a/gerrit/acls/openstack/cloudroast.config b/gerrit/acls/x/cloudroast.config
similarity index 100%
rename from gerrit/acls/openstack/cloudroast.config
rename to gerrit/acls/x/cloudroast.config
diff --git a/gerrit/acls/openstack/coats.config b/gerrit/acls/x/coats.config
similarity index 100%
rename from gerrit/acls/openstack/coats.config
rename to gerrit/acls/x/coats.config
diff --git a/gerrit/acls/openstack/cognitive.config b/gerrit/acls/x/cognitive.config
similarity index 100%
rename from gerrit/acls/openstack/cognitive.config
rename to gerrit/acls/x/cognitive.config
diff --git a/gerrit/acls/openstack/collectd-openstack-plugins.config b/gerrit/acls/x/collectd-openstack-plugins.config
similarity index 100%
rename from gerrit/acls/openstack/collectd-openstack-plugins.config
rename to gerrit/acls/x/collectd-openstack-plugins.config
diff --git a/gerrit/acls/openstack/compass-install.config b/gerrit/acls/x/compass-install.config
similarity index 100%
rename from gerrit/acls/openstack/compass-install.config
rename to gerrit/acls/x/compass-install.config
diff --git a/gerrit/acls/openstack/compute-hyperv.config b/gerrit/acls/x/compute-hyperv.config
similarity index 100%
rename from gerrit/acls/openstack/compute-hyperv.config
rename to gerrit/acls/x/compute-hyperv.config
diff --git a/gerrit/acls/openstack/conveyor.config b/gerrit/acls/x/conveyor.config
similarity index 100%
rename from gerrit/acls/openstack/conveyor.config
rename to gerrit/acls/x/conveyor.config
diff --git a/gerrit/acls/openstack/coupler.config b/gerrit/acls/x/coupler.config
similarity index 100%
rename from gerrit/acls/openstack/coupler.config
rename to gerrit/acls/x/coupler.config
diff --git a/gerrit/acls/openstack/cursive.config b/gerrit/acls/x/cursive.config
similarity index 100%
rename from gerrit/acls/openstack/cursive.config
rename to gerrit/acls/x/cursive.config
diff --git a/gerrit/acls/openstack/daisycloud-core.config b/gerrit/acls/x/daisycloud-core.config
similarity index 100%
rename from gerrit/acls/openstack/daisycloud-core.config
rename to gerrit/acls/x/daisycloud-core.config
diff --git a/gerrit/acls/openstack/dash-stack.config b/gerrit/acls/x/dash-stack.config
similarity index 100%
rename from gerrit/acls/openstack/dash-stack.config
rename to gerrit/acls/x/dash-stack.config
diff --git a/gerrit/acls/openstack/delimiter.config b/gerrit/acls/x/delimiter.config
similarity index 100%
rename from gerrit/acls/openstack/delimiter.config
rename to gerrit/acls/x/delimiter.config
diff --git a/gerrit/acls/openstack/development-proposals.config b/gerrit/acls/x/development-proposals.config
similarity index 100%
rename from gerrit/acls/openstack/development-proposals.config
rename to gerrit/acls/x/development-proposals.config
diff --git a/gerrit/acls/openstack/devstack-plugin-additional-pkg-repos.config b/gerrit/acls/x/devstack-plugin-additional-pkg-repos.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-additional-pkg-repos.config
rename to gerrit/acls/x/devstack-plugin-additional-pkg-repos.config
diff --git a/gerrit/acls/openstack/devstack-plugin-bdd.config b/gerrit/acls/x/devstack-plugin-bdd.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-bdd.config
rename to gerrit/acls/x/devstack-plugin-bdd.config
diff --git a/gerrit/acls/openstack/devstack-plugin-glusterfs.config b/gerrit/acls/x/devstack-plugin-glusterfs.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-glusterfs.config
rename to gerrit/acls/x/devstack-plugin-glusterfs.config
diff --git a/gerrit/acls/openstack/devstack-plugin-hdfs.config b/gerrit/acls/x/devstack-plugin-hdfs.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-hdfs.config
rename to gerrit/acls/x/devstack-plugin-hdfs.config
diff --git a/gerrit/acls/openstack/devstack-plugin-libvirt-qemu.config b/gerrit/acls/x/devstack-plugin-libvirt-qemu.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-libvirt-qemu.config
rename to gerrit/acls/x/devstack-plugin-libvirt-qemu.config
diff --git a/gerrit/acls/openstack/devstack-plugin-mariadb.config b/gerrit/acls/x/devstack-plugin-mariadb.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-mariadb.config
rename to gerrit/acls/x/devstack-plugin-mariadb.config
diff --git a/gerrit/acls/openstack/devstack-plugin-nfs.config b/gerrit/acls/x/devstack-plugin-nfs.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-nfs.config
rename to gerrit/acls/x/devstack-plugin-nfs.config
diff --git a/gerrit/acls/openstack/devstack-plugin-sheepdog.config b/gerrit/acls/x/devstack-plugin-sheepdog.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-sheepdog.config
rename to gerrit/acls/x/devstack-plugin-sheepdog.config
diff --git a/gerrit/acls/openstack/devstack-plugin-tar-installer.config b/gerrit/acls/x/devstack-plugin-tar-installer.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-tar-installer.config
rename to gerrit/acls/x/devstack-plugin-tar-installer.config
diff --git a/gerrit/acls/openstack/devstack-plugin-vmax.config b/gerrit/acls/x/devstack-plugin-vmax.config
similarity index 100%
rename from gerrit/acls/openstack/devstack-plugin-vmax.config
rename to gerrit/acls/x/devstack-plugin-vmax.config
diff --git a/gerrit/acls/openstack/distil.config b/gerrit/acls/x/distil.config
similarity index 100%
rename from gerrit/acls/openstack/distil.config
rename to gerrit/acls/x/distil.config
diff --git a/gerrit/acls/openstack/doc8.config b/gerrit/acls/x/doc8.config
similarity index 100%
rename from gerrit/acls/openstack/doc8.config
rename to gerrit/acls/x/doc8.config
diff --git a/gerrit/acls/openstack/docker-machine-openstack.config b/gerrit/acls/x/docker-machine-openstack.config
similarity index 100%
rename from gerrit/acls/openstack/docker-machine-openstack.config
rename to gerrit/acls/x/docker-machine-openstack.config
diff --git a/gerrit/acls/openstack/downpour.config b/gerrit/acls/x/downpour.config
similarity index 100%
rename from gerrit/acls/openstack/downpour.config
rename to gerrit/acls/x/downpour.config
diff --git a/gerrit/acls/openstack/dox.config b/gerrit/acls/x/dox.config
similarity index 100%
rename from gerrit/acls/openstack/dox.config
rename to gerrit/acls/x/dox.config
diff --git a/gerrit/acls/openstack/drbd-devstack.config b/gerrit/acls/x/drbd-devstack.config
similarity index 100%
rename from gerrit/acls/openstack/drbd-devstack.config
rename to gerrit/acls/x/drbd-devstack.config
diff --git a/gerrit/acls/openstack/driverlog.config b/gerrit/acls/x/driverlog.config
similarity index 100%
rename from gerrit/acls/openstack/driverlog.config
rename to gerrit/acls/x/driverlog.config
diff --git a/gerrit/acls/openstack/ec2-driver.config b/gerrit/acls/x/ec2-driver.config
similarity index 100%
rename from gerrit/acls/openstack/ec2-driver.config
rename to gerrit/acls/x/ec2-driver.config
diff --git a/gerrit/acls/openstack/ekko.config b/gerrit/acls/x/ekko.config
similarity index 100%
rename from gerrit/acls/openstack/ekko.config
rename to gerrit/acls/x/ekko.config
diff --git a/gerrit/acls/openstack/entropy.config b/gerrit/acls/x/entropy.config
similarity index 100%
rename from gerrit/acls/openstack/entropy.config
rename to gerrit/acls/x/entropy.config
diff --git a/gerrit/acls/openstack/fenix.config b/gerrit/acls/x/fenix.config
similarity index 100%
rename from gerrit/acls/openstack/fenix.config
rename to gerrit/acls/x/fenix.config
diff --git a/gerrit/acls/openstack/flame.config b/gerrit/acls/x/flame.config
similarity index 100%
rename from gerrit/acls/openstack/flame.config
rename to gerrit/acls/x/flame.config
diff --git a/gerrit/acls/openstack/flare.config b/gerrit/acls/x/flare.config
similarity index 100%
rename from gerrit/acls/openstack/flare.config
rename to gerrit/acls/x/flare.config
diff --git a/gerrit/acls/openstack/foxnut.config b/gerrit/acls/x/foxnut.config
similarity index 100%
rename from gerrit/acls/openstack/foxnut.config
rename to gerrit/acls/x/foxnut.config
diff --git a/gerrit/acls/openstack/fuel-ccp-ceph.config b/gerrit/acls/x/fuel-ccp-ceph.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-ceph.config
rename to gerrit/acls/x/fuel-ccp-ceph.config
diff --git a/gerrit/acls/openstack/fuel-ccp-ci-config.config b/gerrit/acls/x/fuel-ccp-ci-config.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-ci-config.config
rename to gerrit/acls/x/fuel-ccp-ci-config.config
diff --git a/gerrit/acls/openstack/fuel-ccp-cinder.config b/gerrit/acls/x/fuel-ccp-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-cinder.config
rename to gerrit/acls/x/fuel-ccp-cinder.config
diff --git a/gerrit/acls/openstack/fuel-ccp-debian-base.config b/gerrit/acls/x/fuel-ccp-debian-base.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-debian-base.config
rename to gerrit/acls/x/fuel-ccp-debian-base.config
diff --git a/gerrit/acls/openstack/fuel-ccp-designate.config b/gerrit/acls/x/fuel-ccp-designate.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-designate.config
rename to gerrit/acls/x/fuel-ccp-designate.config
diff --git a/gerrit/acls/openstack/fuel-ccp-elasticsearch.config b/gerrit/acls/x/fuel-ccp-elasticsearch.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-elasticsearch.config
rename to gerrit/acls/x/fuel-ccp-elasticsearch.config
diff --git a/gerrit/acls/openstack/fuel-ccp-entrypoint.config b/gerrit/acls/x/fuel-ccp-entrypoint.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-entrypoint.config
rename to gerrit/acls/x/fuel-ccp-entrypoint.config
diff --git a/gerrit/acls/openstack/fuel-ccp-etcd.config b/gerrit/acls/x/fuel-ccp-etcd.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-etcd.config
rename to gerrit/acls/x/fuel-ccp-etcd.config
diff --git a/gerrit/acls/openstack/fuel-ccp-galera.config b/gerrit/acls/x/fuel-ccp-galera.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-galera.config
rename to gerrit/acls/x/fuel-ccp-galera.config
diff --git a/gerrit/acls/openstack/fuel-ccp-glance.config b/gerrit/acls/x/fuel-ccp-glance.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-glance.config
rename to gerrit/acls/x/fuel-ccp-glance.config
diff --git a/gerrit/acls/openstack/fuel-ccp-grafana.config b/gerrit/acls/x/fuel-ccp-grafana.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-grafana.config
rename to gerrit/acls/x/fuel-ccp-grafana.config
diff --git a/gerrit/acls/openstack/fuel-ccp-heat.config b/gerrit/acls/x/fuel-ccp-heat.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-heat.config
rename to gerrit/acls/x/fuel-ccp-heat.config
diff --git a/gerrit/acls/openstack/fuel-ccp-horizon.config b/gerrit/acls/x/fuel-ccp-horizon.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-horizon.config
rename to gerrit/acls/x/fuel-ccp-horizon.config
diff --git a/gerrit/acls/openstack/fuel-ccp-installer.config b/gerrit/acls/x/fuel-ccp-installer.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-installer.config
rename to gerrit/acls/x/fuel-ccp-installer.config
diff --git a/gerrit/acls/openstack/fuel-ccp-ironic.config b/gerrit/acls/x/fuel-ccp-ironic.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-ironic.config
rename to gerrit/acls/x/fuel-ccp-ironic.config
diff --git a/gerrit/acls/openstack/fuel-ccp-keystone.config b/gerrit/acls/x/fuel-ccp-keystone.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-keystone.config
rename to gerrit/acls/x/fuel-ccp-keystone.config
diff --git a/gerrit/acls/openstack/fuel-ccp-mariadb.config b/gerrit/acls/x/fuel-ccp-mariadb.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-mariadb.config
rename to gerrit/acls/x/fuel-ccp-mariadb.config
diff --git a/gerrit/acls/openstack/fuel-ccp-memcached.config b/gerrit/acls/x/fuel-ccp-memcached.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-memcached.config
rename to gerrit/acls/x/fuel-ccp-memcached.config
diff --git a/gerrit/acls/openstack/fuel-ccp-murano.config b/gerrit/acls/x/fuel-ccp-murano.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-murano.config
rename to gerrit/acls/x/fuel-ccp-murano.config
diff --git a/gerrit/acls/openstack/fuel-ccp-neutron.config b/gerrit/acls/x/fuel-ccp-neutron.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-neutron.config
rename to gerrit/acls/x/fuel-ccp-neutron.config
diff --git a/gerrit/acls/openstack/fuel-ccp-nginx.config b/gerrit/acls/x/fuel-ccp-nginx.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-nginx.config
rename to gerrit/acls/x/fuel-ccp-nginx.config
diff --git a/gerrit/acls/openstack/fuel-ccp-nova.config b/gerrit/acls/x/fuel-ccp-nova.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-nova.config
rename to gerrit/acls/x/fuel-ccp-nova.config
diff --git a/gerrit/acls/openstack/fuel-ccp-openstack-base.config b/gerrit/acls/x/fuel-ccp-openstack-base.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-openstack-base.config
rename to gerrit/acls/x/fuel-ccp-openstack-base.config
diff --git a/gerrit/acls/openstack/fuel-ccp-rabbitmq.config b/gerrit/acls/x/fuel-ccp-rabbitmq.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-rabbitmq.config
rename to gerrit/acls/x/fuel-ccp-rabbitmq.config
diff --git a/gerrit/acls/openstack/fuel-ccp-rally.config b/gerrit/acls/x/fuel-ccp-rally.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-rally.config
rename to gerrit/acls/x/fuel-ccp-rally.config
diff --git a/gerrit/acls/openstack/fuel-ccp-sahara.config b/gerrit/acls/x/fuel-ccp-sahara.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-sahara.config
rename to gerrit/acls/x/fuel-ccp-sahara.config
diff --git a/gerrit/acls/openstack/fuel-ccp-searchlight.config b/gerrit/acls/x/fuel-ccp-searchlight.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-searchlight.config
rename to gerrit/acls/x/fuel-ccp-searchlight.config
diff --git a/gerrit/acls/openstack/fuel-ccp-specs.config b/gerrit/acls/x/fuel-ccp-specs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-specs.config
rename to gerrit/acls/x/fuel-ccp-specs.config
diff --git a/gerrit/acls/openstack/fuel-ccp-stacklight.config b/gerrit/acls/x/fuel-ccp-stacklight.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-stacklight.config
rename to gerrit/acls/x/fuel-ccp-stacklight.config
diff --git a/gerrit/acls/openstack/fuel-ccp-tests.config b/gerrit/acls/x/fuel-ccp-tests.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-tests.config
rename to gerrit/acls/x/fuel-ccp-tests.config
diff --git a/gerrit/acls/openstack/fuel-ccp-zmq.config b/gerrit/acls/x/fuel-ccp-zmq.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp-zmq.config
rename to gerrit/acls/x/fuel-ccp-zmq.config
diff --git a/gerrit/acls/openstack/fuel-ccp.config b/gerrit/acls/x/fuel-ccp.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-ccp.config
rename to gerrit/acls/x/fuel-ccp.config
diff --git a/gerrit/acls/openstack/fuel-noop-fixtures.config b/gerrit/acls/x/fuel-noop-fixtures.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-noop-fixtures.config
rename to gerrit/acls/x/fuel-noop-fixtures.config
diff --git a/gerrit/acls/openstack/fuel-plugin-6wind-virtual-accelerator.config b/gerrit/acls/x/fuel-plugin-6wind-virtual-accelerator.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-6wind-virtual-accelerator.config
rename to gerrit/acls/x/fuel-plugin-6wind-virtual-accelerator.config
diff --git a/gerrit/acls/openstack/fuel-plugin-astara.config b/gerrit/acls/x/fuel-plugin-astara.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-astara.config
rename to gerrit/acls/x/fuel-plugin-astara.config
diff --git a/gerrit/acls/openstack/fuel-plugin-availability-zones.config b/gerrit/acls/x/fuel-plugin-availability-zones.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-availability-zones.config
rename to gerrit/acls/x/fuel-plugin-availability-zones.config
diff --git a/gerrit/acls/openstack/fuel-plugin-bgpvpn.config b/gerrit/acls/x/fuel-plugin-bgpvpn.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-bgpvpn.config
rename to gerrit/acls/x/fuel-plugin-bgpvpn.config
diff --git a/gerrit/acls/openstack/fuel-plugin-bigswitch.config b/gerrit/acls/x/fuel-plugin-bigswitch.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-bigswitch.config
rename to gerrit/acls/x/fuel-plugin-bigswitch.config
diff --git a/gerrit/acls/openstack/fuel-plugin-block-device.config b/gerrit/acls/x/fuel-plugin-block-device.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-block-device.config
rename to gerrit/acls/x/fuel-plugin-block-device.config
diff --git a/gerrit/acls/openstack/fuel-plugin-calamari.config b/gerrit/acls/x/fuel-plugin-calamari.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-calamari.config
rename to gerrit/acls/x/fuel-plugin-calamari.config
diff --git a/gerrit/acls/openstack/fuel-plugin-calico.config b/gerrit/acls/x/fuel-plugin-calico.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-calico.config
rename to gerrit/acls/x/fuel-plugin-calico.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ceilometer-redis.config b/gerrit/acls/x/fuel-plugin-ceilometer-redis.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ceilometer-redis.config
rename to gerrit/acls/x/fuel-plugin-ceilometer-redis.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ceph-multibackend.config b/gerrit/acls/x/fuel-plugin-ceph-multibackend.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ceph-multibackend.config
rename to gerrit/acls/x/fuel-plugin-ceph-multibackend.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ci.config b/gerrit/acls/x/fuel-plugin-ci.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ci.config
rename to gerrit/acls/x/fuel-plugin-ci.config
diff --git a/gerrit/acls/openstack/fuel-plugin-cinder-gcs.config b/gerrit/acls/x/fuel-plugin-cinder-gcs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-cinder-gcs.config
rename to gerrit/acls/x/fuel-plugin-cinder-gcs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-cinder-kaminario.config b/gerrit/acls/x/fuel-plugin-cinder-kaminario.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-cinder-kaminario.config
rename to gerrit/acls/x/fuel-plugin-cinder-kaminario.config
diff --git a/gerrit/acls/openstack/fuel-plugin-cinder-netapp.config b/gerrit/acls/x/fuel-plugin-cinder-netapp.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-cinder-netapp.config
rename to gerrit/acls/x/fuel-plugin-cinder-netapp.config
diff --git a/gerrit/acls/openstack/fuel-plugin-cisco-aci.config b/gerrit/acls/x/fuel-plugin-cisco-aci.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-cisco-aci.config
rename to gerrit/acls/x/fuel-plugin-cisco-aci.config
diff --git a/gerrit/acls/openstack/fuel-plugin-congress.config b/gerrit/acls/x/fuel-plugin-congress.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-congress.config
rename to gerrit/acls/x/fuel-plugin-congress.config
diff --git a/gerrit/acls/openstack/fuel-plugin-contrail.config b/gerrit/acls/x/fuel-plugin-contrail.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-contrail.config
rename to gerrit/acls/x/fuel-plugin-contrail.config
diff --git a/gerrit/acls/openstack/fuel-plugin-datera-cinder.config b/gerrit/acls/x/fuel-plugin-datera-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-datera-cinder.config
rename to gerrit/acls/x/fuel-plugin-datera-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-dbaas-trove.config b/gerrit/acls/x/fuel-plugin-dbaas-trove.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-dbaas-trove.config
rename to gerrit/acls/x/fuel-plugin-dbaas-trove.config
diff --git a/gerrit/acls/openstack/fuel-plugin-debug.config b/gerrit/acls/x/fuel-plugin-debug.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-debug.config
rename to gerrit/acls/x/fuel-plugin-debug.config
diff --git a/gerrit/acls/openstack/fuel-plugin-designate.config b/gerrit/acls/x/fuel-plugin-designate.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-designate.config
rename to gerrit/acls/x/fuel-plugin-designate.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-database.config b/gerrit/acls/x/fuel-plugin-detach-database.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-database.config
rename to gerrit/acls/x/fuel-plugin-detach-database.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-haproxy.config b/gerrit/acls/x/fuel-plugin-detach-haproxy.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-haproxy.config
rename to gerrit/acls/x/fuel-plugin-detach-haproxy.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-horizon.config b/gerrit/acls/x/fuel-plugin-detach-horizon.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-horizon.config
rename to gerrit/acls/x/fuel-plugin-detach-horizon.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-keystone.config b/gerrit/acls/x/fuel-plugin-detach-keystone.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-keystone.config
rename to gerrit/acls/x/fuel-plugin-detach-keystone.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-netnode.config b/gerrit/acls/x/fuel-plugin-detach-netnode.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-netnode.config
rename to gerrit/acls/x/fuel-plugin-detach-netnode.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-rabbitmq.config b/gerrit/acls/x/fuel-plugin-detach-rabbitmq.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-rabbitmq.config
rename to gerrit/acls/x/fuel-plugin-detach-rabbitmq.config
diff --git a/gerrit/acls/openstack/fuel-plugin-detach-swift.config b/gerrit/acls/x/fuel-plugin-detach-swift.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-detach-swift.config
rename to gerrit/acls/x/fuel-plugin-detach-swift.config
diff --git a/gerrit/acls/openstack/fuel-plugin-dns-updater.config b/gerrit/acls/x/fuel-plugin-dns-updater.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-dns-updater.config
rename to gerrit/acls/x/fuel-plugin-dns-updater.config
diff --git a/gerrit/acls/openstack/fuel-plugin-dynatrace.config b/gerrit/acls/x/fuel-plugin-dynatrace.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-dynatrace.config
rename to gerrit/acls/x/fuel-plugin-dynatrace.config
diff --git a/gerrit/acls/openstack/fuel-plugin-elasticsearch-kibana.config b/gerrit/acls/x/fuel-plugin-elasticsearch-kibana.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-elasticsearch-kibana.config
rename to gerrit/acls/x/fuel-plugin-elasticsearch-kibana.config
diff --git a/gerrit/acls/openstack/fuel-plugin-emailnotifyd.config b/gerrit/acls/x/fuel-plugin-emailnotifyd.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-emailnotifyd.config
rename to gerrit/acls/x/fuel-plugin-emailnotifyd.config
diff --git a/gerrit/acls/openstack/fuel-plugin-external-emc.config b/gerrit/acls/x/fuel-plugin-external-emc.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-external-emc.config
rename to gerrit/acls/x/fuel-plugin-external-emc.config
diff --git a/gerrit/acls/openstack/fuel-plugin-external-glusterfs.config b/gerrit/acls/x/fuel-plugin-external-glusterfs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-external-glusterfs.config
rename to gerrit/acls/x/fuel-plugin-external-glusterfs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-external-lb.config b/gerrit/acls/x/fuel-plugin-external-lb.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-external-lb.config
rename to gerrit/acls/x/fuel-plugin-external-lb.config
diff --git a/gerrit/acls/openstack/fuel-plugin-external-zabbix.config b/gerrit/acls/x/fuel-plugin-external-zabbix.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-external-zabbix.config
rename to gerrit/acls/x/fuel-plugin-external-zabbix.config
diff --git a/gerrit/acls/openstack/fuel-plugin-fortinet.config b/gerrit/acls/x/fuel-plugin-fortinet.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-fortinet.config
rename to gerrit/acls/x/fuel-plugin-fortinet.config
diff --git a/gerrit/acls/openstack/fuel-plugin-glance-nfs.config b/gerrit/acls/x/fuel-plugin-glance-nfs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-glance-nfs.config
rename to gerrit/acls/x/fuel-plugin-glance-nfs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-gluon.config b/gerrit/acls/x/fuel-plugin-gluon.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-gluon.config
rename to gerrit/acls/x/fuel-plugin-gluon.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ha-fencing.config b/gerrit/acls/x/fuel-plugin-ha-fencing.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ha-fencing.config
rename to gerrit/acls/x/fuel-plugin-ha-fencing.config
diff --git a/gerrit/acls/openstack/fuel-plugin-hedvig-cinder.config b/gerrit/acls/x/fuel-plugin-hedvig-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-hedvig-cinder.config
rename to gerrit/acls/x/fuel-plugin-hedvig-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-influxdb-grafana.config b/gerrit/acls/x/fuel-plugin-influxdb-grafana.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-influxdb-grafana.config
rename to gerrit/acls/x/fuel-plugin-influxdb-grafana.config
diff --git a/gerrit/acls/openstack/fuel-plugin-inkscope.config b/gerrit/acls/x/fuel-plugin-inkscope.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-inkscope.config
rename to gerrit/acls/x/fuel-plugin-inkscope.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ironic.config b/gerrit/acls/x/fuel-plugin-ironic.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ironic.config
rename to gerrit/acls/x/fuel-plugin-ironic.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ldap-slaves.config b/gerrit/acls/x/fuel-plugin-ldap-slaves.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ldap-slaves.config
rename to gerrit/acls/x/fuel-plugin-ldap-slaves.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ldap.config b/gerrit/acls/x/fuel-plugin-ldap.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ldap.config
rename to gerrit/acls/x/fuel-plugin-ldap.config
diff --git a/gerrit/acls/openstack/fuel-plugin-lma-collector.config b/gerrit/acls/x/fuel-plugin-lma-collector.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-lma-collector.config
rename to gerrit/acls/x/fuel-plugin-lma-collector.config
diff --git a/gerrit/acls/openstack/fuel-plugin-lma-infrastructure-alerting.config b/gerrit/acls/x/fuel-plugin-lma-infrastructure-alerting.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-lma-infrastructure-alerting.config
rename to gerrit/acls/x/fuel-plugin-lma-infrastructure-alerting.config
diff --git a/gerrit/acls/openstack/fuel-plugin-manila.config b/gerrit/acls/x/fuel-plugin-manila.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-manila.config
rename to gerrit/acls/x/fuel-plugin-manila.config
diff --git a/gerrit/acls/openstack/fuel-plugin-mellanox.config b/gerrit/acls/x/fuel-plugin-mellanox.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-mellanox.config
rename to gerrit/acls/x/fuel-plugin-mellanox.config
diff --git a/gerrit/acls/openstack/fuel-plugin-midonet.config b/gerrit/acls/x/fuel-plugin-midonet.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-midonet.config
rename to gerrit/acls/x/fuel-plugin-midonet.config
diff --git a/gerrit/acls/openstack/fuel-plugin-mistral.config b/gerrit/acls/x/fuel-plugin-mistral.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-mistral.config
rename to gerrit/acls/x/fuel-plugin-mistral.config
diff --git a/gerrit/acls/openstack/fuel-plugin-murano-networking-sfc.config b/gerrit/acls/x/fuel-plugin-murano-networking-sfc.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-murano-networking-sfc.config
rename to gerrit/acls/x/fuel-plugin-murano-networking-sfc.config
diff --git a/gerrit/acls/openstack/fuel-plugin-network-node.config b/gerrit/acls/x/fuel-plugin-network-node.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-network-node.config
rename to gerrit/acls/x/fuel-plugin-network-node.config
diff --git a/gerrit/acls/openstack/fuel-plugin-networking-sfc.config b/gerrit/acls/x/fuel-plugin-networking-sfc.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-networking-sfc.config
rename to gerrit/acls/x/fuel-plugin-networking-sfc.config
diff --git a/gerrit/acls/openstack/fuel-plugin-neutron-fwaas.config b/gerrit/acls/x/fuel-plugin-neutron-fwaas.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-neutron-fwaas.config
rename to gerrit/acls/x/fuel-plugin-neutron-fwaas.config
diff --git a/gerrit/acls/openstack/fuel-plugin-neutron-lbaas.config b/gerrit/acls/x/fuel-plugin-neutron-lbaas.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-neutron-lbaas.config
rename to gerrit/acls/x/fuel-plugin-neutron-lbaas.config
diff --git a/gerrit/acls/openstack/fuel-plugin-neutron-vpnaas.config b/gerrit/acls/x/fuel-plugin-neutron-vpnaas.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-neutron-vpnaas.config
rename to gerrit/acls/x/fuel-plugin-neutron-vpnaas.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nimblestorage-cinder.config b/gerrit/acls/x/fuel-plugin-nimblestorage-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nimblestorage-cinder.config
rename to gerrit/acls/x/fuel-plugin-nimblestorage-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nitrous.config b/gerrit/acls/x/fuel-plugin-nitrous.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nitrous.config
rename to gerrit/acls/x/fuel-plugin-nitrous.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nova-nfs.config b/gerrit/acls/x/fuel-plugin-nova-nfs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nova-nfs.config
rename to gerrit/acls/x/fuel-plugin-nova-nfs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nsx-t.config b/gerrit/acls/x/fuel-plugin-nsx-t.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nsx-t.config
rename to gerrit/acls/x/fuel-plugin-nsx-t.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nsxv.config b/gerrit/acls/x/fuel-plugin-nsxv.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nsxv.config
rename to gerrit/acls/x/fuel-plugin-nsxv.config
diff --git a/gerrit/acls/openstack/fuel-plugin-nuage.config b/gerrit/acls/x/fuel-plugin-nuage.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-nuage.config
rename to gerrit/acls/x/fuel-plugin-nuage.config
diff --git a/gerrit/acls/openstack/fuel-plugin-onos.config b/gerrit/acls/x/fuel-plugin-onos.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-onos.config
rename to gerrit/acls/x/fuel-plugin-onos.config
diff --git a/gerrit/acls/openstack/fuel-plugin-openbook.config b/gerrit/acls/x/fuel-plugin-openbook.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-openbook.config
rename to gerrit/acls/x/fuel-plugin-openbook.config
diff --git a/gerrit/acls/openstack/fuel-plugin-opendaylight.config b/gerrit/acls/x/fuel-plugin-opendaylight.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-opendaylight.config
rename to gerrit/acls/x/fuel-plugin-opendaylight.config
diff --git a/gerrit/acls/openstack/fuel-plugin-openstack-telemetry.config b/gerrit/acls/x/fuel-plugin-openstack-telemetry.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-openstack-telemetry.config
rename to gerrit/acls/x/fuel-plugin-openstack-telemetry.config
diff --git a/gerrit/acls/openstack/fuel-plugin-ovs.config b/gerrit/acls/x/fuel-plugin-ovs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-ovs.config
rename to gerrit/acls/x/fuel-plugin-ovs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-plumgrid.config b/gerrit/acls/x/fuel-plugin-plumgrid.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-plumgrid.config
rename to gerrit/acls/x/fuel-plugin-plumgrid.config
diff --git a/gerrit/acls/openstack/fuel-plugin-purestorage-cinder.config b/gerrit/acls/x/fuel-plugin-purestorage-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-purestorage-cinder.config
rename to gerrit/acls/x/fuel-plugin-purestorage-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-qemu.config b/gerrit/acls/x/fuel-plugin-qemu.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-qemu.config
rename to gerrit/acls/x/fuel-plugin-qemu.config
diff --git a/gerrit/acls/openstack/fuel-plugin-qlogic-sriov-vxlan.config b/gerrit/acls/x/fuel-plugin-qlogic-sriov-vxlan.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-qlogic-sriov-vxlan.config
rename to gerrit/acls/x/fuel-plugin-qlogic-sriov-vxlan.config
diff --git a/gerrit/acls/openstack/fuel-plugin-rally.config b/gerrit/acls/x/fuel-plugin-rally.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-rally.config
rename to gerrit/acls/x/fuel-plugin-rally.config
diff --git a/gerrit/acls/openstack/fuel-plugin-saltstack.config b/gerrit/acls/x/fuel-plugin-saltstack.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-saltstack.config
rename to gerrit/acls/x/fuel-plugin-saltstack.config
diff --git a/gerrit/acls/openstack/fuel-plugin-scaleio-cinder.config b/gerrit/acls/x/fuel-plugin-scaleio-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-scaleio-cinder.config
rename to gerrit/acls/x/fuel-plugin-scaleio-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-scaleio.config b/gerrit/acls/x/fuel-plugin-scaleio.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-scaleio.config
rename to gerrit/acls/x/fuel-plugin-scaleio.config
diff --git a/gerrit/acls/openstack/fuel-plugin-sensu.config b/gerrit/acls/x/fuel-plugin-sensu.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-sensu.config
rename to gerrit/acls/x/fuel-plugin-sensu.config
diff --git a/gerrit/acls/openstack/fuel-plugin-solidfire-cinder.config b/gerrit/acls/x/fuel-plugin-solidfire-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-solidfire-cinder.config
rename to gerrit/acls/x/fuel-plugin-solidfire-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-swiftstack.config b/gerrit/acls/x/fuel-plugin-swiftstack.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-swiftstack.config
rename to gerrit/acls/x/fuel-plugin-swiftstack.config
diff --git a/gerrit/acls/openstack/fuel-plugin-tacker.config b/gerrit/acls/x/fuel-plugin-tacker.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-tacker.config
rename to gerrit/acls/x/fuel-plugin-tacker.config
diff --git a/gerrit/acls/openstack/fuel-plugin-tempest.config b/gerrit/acls/x/fuel-plugin-tempest.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-tempest.config
rename to gerrit/acls/x/fuel-plugin-tempest.config
diff --git a/gerrit/acls/openstack/fuel-plugin-tintri-cinder.config b/gerrit/acls/x/fuel-plugin-tintri-cinder.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-tintri-cinder.config
rename to gerrit/acls/x/fuel-plugin-tintri-cinder.config
diff --git a/gerrit/acls/openstack/fuel-plugin-tls.config b/gerrit/acls/x/fuel-plugin-tls.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-tls.config
rename to gerrit/acls/x/fuel-plugin-tls.config
diff --git a/gerrit/acls/openstack/fuel-plugin-unity.config b/gerrit/acls/x/fuel-plugin-unity.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-unity.config
rename to gerrit/acls/x/fuel-plugin-unity.config
diff --git a/gerrit/acls/openstack/fuel-plugin-vmware-dvs.config b/gerrit/acls/x/fuel-plugin-vmware-dvs.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-vmware-dvs.config
rename to gerrit/acls/x/fuel-plugin-vmware-dvs.config
diff --git a/gerrit/acls/openstack/fuel-plugin-vxlan.config b/gerrit/acls/x/fuel-plugin-vxlan.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-vxlan.config
rename to gerrit/acls/x/fuel-plugin-vxlan.config
diff --git a/gerrit/acls/openstack/fuel-plugin-watcher.config b/gerrit/acls/x/fuel-plugin-watcher.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-watcher.config
rename to gerrit/acls/x/fuel-plugin-watcher.config
diff --git a/gerrit/acls/openstack/fuel-plugin-wstunnel.config b/gerrit/acls/x/fuel-plugin-wstunnel.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-wstunnel.config
rename to gerrit/acls/x/fuel-plugin-wstunnel.config
diff --git a/gerrit/acls/openstack/fuel-plugin-xenserver.config b/gerrit/acls/x/fuel-plugin-xenserver.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-xenserver.config
rename to gerrit/acls/x/fuel-plugin-xenserver.config
diff --git a/gerrit/acls/openstack/fuel-plugin-zabbix-agents.config b/gerrit/acls/x/fuel-plugin-zabbix-agents.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-zabbix-agents.config
rename to gerrit/acls/x/fuel-plugin-zabbix-agents.config
diff --git a/gerrit/acls/openstack/fuel-plugin-zabbix-monitoring-emc.config b/gerrit/acls/x/fuel-plugin-zabbix-monitoring-emc.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-zabbix-monitoring-emc.config
rename to gerrit/acls/x/fuel-plugin-zabbix-monitoring-emc.config
diff --git a/gerrit/acls/openstack/fuel-plugin-zabbix-monitoring-extreme-networks.config b/gerrit/acls/x/fuel-plugin-zabbix-monitoring-extreme-networks.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-zabbix-monitoring-extreme-networks.config
rename to gerrit/acls/x/fuel-plugin-zabbix-monitoring-extreme-networks.config
diff --git a/gerrit/acls/openstack/fuel-plugin-zabbix-snmptrapd.config b/gerrit/acls/x/fuel-plugin-zabbix-snmptrapd.config
similarity index 100%
rename from gerrit/acls/openstack/fuel-plugin-zabbix-snmptrapd.config
rename to gerrit/acls/x/fuel-plugin-zabbix-snmptrapd.config
diff --git a/gerrit/acls/openstack/gabbi-tempest.config b/gerrit/acls/x/gabbi-tempest.config
similarity index 100%
rename from gerrit/acls/openstack/gabbi-tempest.config
rename to gerrit/acls/x/gabbi-tempest.config
diff --git a/gerrit/acls/openstack/gce-api.config b/gerrit/acls/x/gce-api.config
similarity index 100%
rename from gerrit/acls/openstack/gce-api.config
rename to gerrit/acls/x/gce-api.config
diff --git a/gerrit/acls/openstack-infra/gearman-plugin.config b/gerrit/acls/x/gearman-plugin.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gearman-plugin.config
rename to gerrit/acls/x/gearman-plugin.config
diff --git a/gerrit/acls/openstack/gerrit-dash-creator.config b/gerrit/acls/x/gerrit-dash-creator.config
similarity index 100%
rename from gerrit/acls/openstack/gerrit-dash-creator.config
rename to gerrit/acls/x/gerrit-dash-creator.config
diff --git a/gerrit/acls/openstack/giftwrap.config b/gerrit/acls/x/giftwrap.config
similarity index 100%
rename from gerrit/acls/openstack/giftwrap.config
rename to gerrit/acls/x/giftwrap.config
diff --git a/gerrit/acls/openstack/git-nit.config b/gerrit/acls/x/git-nit.config
similarity index 100%
rename from gerrit/acls/openstack/git-nit.config
rename to gerrit/acls/x/git-nit.config
diff --git a/gerrit/acls/openstack/git-os-job.config b/gerrit/acls/x/git-os-job.config
similarity index 100%
rename from gerrit/acls/openstack/git-os-job.config
rename to gerrit/acls/x/git-os-job.config
diff --git a/gerrit/acls/openstack/git-repo-manifests.config b/gerrit/acls/x/git-repo-manifests.config
similarity index 100%
rename from gerrit/acls/openstack/git-repo-manifests.config
rename to gerrit/acls/x/git-repo-manifests.config
diff --git a/gerrit/acls/openstack/git-upstream.config b/gerrit/acls/x/git-upstream.config
similarity index 100%
rename from gerrit/acls/openstack/git-upstream.config
rename to gerrit/acls/x/git-upstream.config
diff --git a/gerrit/acls/openstack-infra/gitdm.config b/gerrit/acls/x/gitdm.config
similarity index 100%
rename from gerrit/acls/openstack-infra/gitdm.config
rename to gerrit/acls/x/gitdm.config
diff --git a/gerrit/acls/openstack/glare.config b/gerrit/acls/x/glare.config
similarity index 100%
rename from gerrit/acls/openstack/glare.config
rename to gerrit/acls/x/glare.config
diff --git a/gerrit/acls/openstack/gluon.config b/gerrit/acls/x/gluon.config
similarity index 100%
rename from gerrit/acls/openstack/gluon.config
rename to gerrit/acls/x/gluon.config
diff --git a/gerrit/acls/openstack/golang-client.config b/gerrit/acls/x/golang-client.config
similarity index 100%
rename from gerrit/acls/openstack/golang-client.config
rename to gerrit/acls/x/golang-client.config
diff --git a/gerrit/acls/openstack/golang-commons.config b/gerrit/acls/x/golang-commons.config
similarity index 100%
rename from gerrit/acls/openstack/golang-commons.config
rename to gerrit/acls/x/golang-commons.config
diff --git a/gerrit/acls/openstack/gos-brick.config b/gerrit/acls/x/gos-brick.config
similarity index 100%
rename from gerrit/acls/openstack/gos-brick.config
rename to gerrit/acls/x/gos-brick.config
diff --git a/gerrit/acls/openstack/group-based-policy.config b/gerrit/acls/x/group-based-policy.config
similarity index 100%
rename from gerrit/acls/openstack/group-based-policy.config
rename to gerrit/acls/x/group-based-policy.config
diff --git a/gerrit/acls/openstack/gyan.config b/gerrit/acls/x/gyan.config
similarity index 100%
rename from gerrit/acls/openstack/gyan.config
rename to gerrit/acls/x/gyan.config
diff --git a/gerrit/acls/openstack/horizon-mellanox.config b/gerrit/acls/x/horizon-mellanox.config
similarity index 100%
rename from gerrit/acls/openstack/horizon-mellanox.config
rename to gerrit/acls/x/horizon-mellanox.config
diff --git a/gerrit/acls/openstack/hurricane.config b/gerrit/acls/x/hurricane.config
similarity index 100%
rename from gerrit/acls/openstack/hurricane.config
rename to gerrit/acls/x/hurricane.config
diff --git a/gerrit/acls/openstack/inception.config b/gerrit/acls/x/inception.config
similarity index 100%
rename from gerrit/acls/openstack/inception.config
rename to gerrit/acls/x/inception.config
diff --git a/gerrit/acls/openstack-infra/infra-ansible.config b/gerrit/acls/x/infra-ansible.config
similarity index 100%
rename from gerrit/acls/openstack-infra/infra-ansible.config
rename to gerrit/acls/x/infra-ansible.config
diff --git a/gerrit/acls/openstack/intel-nfv-ci-tests.config b/gerrit/acls/x/intel-nfv-ci-tests.config
similarity index 100%
rename from gerrit/acls/openstack/intel-nfv-ci-tests.config
rename to gerrit/acls/x/intel-nfv-ci-tests.config
diff --git a/gerrit/acls/openstack/interop-workloads.config b/gerrit/acls/x/interop-workloads.config
similarity index 100%
rename from gerrit/acls/openstack/interop-workloads.config
rename to gerrit/acls/x/interop-workloads.config
diff --git a/gerrit/acls/openstack/iotronic.config b/gerrit/acls/x/iotronic.config
similarity index 100%
rename from gerrit/acls/openstack/iotronic.config
rename to gerrit/acls/x/iotronic.config
diff --git a/gerrit/acls/openstack/ipa-example-hardware-managers.config b/gerrit/acls/x/ipa-example-hardware-managers.config
similarity index 100%
rename from gerrit/acls/openstack/ipa-example-hardware-managers.config
rename to gerrit/acls/x/ipa-example-hardware-managers.config
diff --git a/gerrit/acls/openstack/ironic-staging-drivers.config b/gerrit/acls/x/ironic-staging-drivers.config
similarity index 100%
rename from gerrit/acls/openstack/ironic-staging-drivers.config
rename to gerrit/acls/x/ironic-staging-drivers.config
diff --git a/gerrit/acls/openstack/jacket.config b/gerrit/acls/x/jacket.config
similarity index 100%
rename from gerrit/acls/openstack/jacket.config
rename to gerrit/acls/x/jacket.config
diff --git a/gerrit/acls/openstack/jenkins-plugins-for-murano.config b/gerrit/acls/x/jenkins-plugins-for-murano.config
similarity index 100%
rename from gerrit/acls/openstack/jenkins-plugins-for-murano.config
rename to gerrit/acls/x/jenkins-plugins-for-murano.config
diff --git a/gerrit/acls/openstack/k8s-cloud-provider.config b/gerrit/acls/x/k8s-cloud-provider.config
similarity index 100%
rename from gerrit/acls/openstack/k8s-cloud-provider.config
rename to gerrit/acls/x/k8s-cloud-provider.config
diff --git a/gerrit/acls/openstack/k8s-docker-suite-app-murano.config b/gerrit/acls/x/k8s-docker-suite-app-murano.config
similarity index 100%
rename from gerrit/acls/openstack/k8s-docker-suite-app-murano.config
rename to gerrit/acls/x/k8s-docker-suite-app-murano.config
diff --git a/gerrit/acls/openstack/kayobe.config b/gerrit/acls/x/kayobe.config
similarity index 100%
rename from gerrit/acls/openstack/kayobe.config
rename to gerrit/acls/x/kayobe.config
diff --git a/gerrit/acls/openstack/kiloeyes.config b/gerrit/acls/x/kiloeyes.config
similarity index 100%
rename from gerrit/acls/openstack/kiloeyes.config
rename to gerrit/acls/x/kiloeyes.config
diff --git a/gerrit/acls/openstack/kingbird.config b/gerrit/acls/x/kingbird.config
similarity index 100%
rename from gerrit/acls/openstack/kingbird.config
rename to gerrit/acls/x/kingbird.config
diff --git a/gerrit/acls/openstack/kloudbuster.config b/gerrit/acls/x/kloudbuster.config
similarity index 100%
rename from gerrit/acls/openstack/kloudbuster.config
rename to gerrit/acls/x/kloudbuster.config
diff --git a/gerrit/acls/openstack/kosmos.config b/gerrit/acls/x/kosmos.config
similarity index 100%
rename from gerrit/acls/openstack/kosmos.config
rename to gerrit/acls/x/kosmos.config
diff --git a/gerrit/acls/openstack/ku.stella.config b/gerrit/acls/x/ku.stella.config
similarity index 100%
rename from gerrit/acls/openstack/ku.stella.config
rename to gerrit/acls/x/ku.stella.config
diff --git a/gerrit/acls/openstack/kwapi.config b/gerrit/acls/x/kwapi.config
similarity index 100%
rename from gerrit/acls/openstack/kwapi.config
rename to gerrit/acls/x/kwapi.config
diff --git a/gerrit/acls/openstack/liberasurecode.config b/gerrit/acls/x/liberasurecode.config
similarity index 100%
rename from gerrit/acls/openstack/liberasurecode.config
rename to gerrit/acls/x/liberasurecode.config
diff --git a/gerrit/acls/openstack/marshal.config b/gerrit/acls/x/marshal.config
similarity index 100%
rename from gerrit/acls/openstack/marshal.config
rename to gerrit/acls/x/marshal.config
diff --git a/gerrit/acls/openstack/meghdwar.config b/gerrit/acls/x/meghdwar.config
similarity index 100%
rename from gerrit/acls/openstack/meghdwar.config
rename to gerrit/acls/x/meghdwar.config
diff --git a/gerrit/acls/openstack/merlin.config b/gerrit/acls/x/merlin.config
similarity index 100%
rename from gerrit/acls/openstack/merlin.config
rename to gerrit/acls/x/merlin.config
diff --git a/gerrit/acls/openstack/meteos-ui.config b/gerrit/acls/x/meteos-ui.config
similarity index 100%
rename from gerrit/acls/openstack/meteos-ui.config
rename to gerrit/acls/x/meteos-ui.config
diff --git a/gerrit/acls/openstack/meteos.config b/gerrit/acls/x/meteos.config
similarity index 100%
rename from gerrit/acls/openstack/meteos.config
rename to gerrit/acls/x/meteos.config
diff --git a/gerrit/acls/openstack/mitmstack.config b/gerrit/acls/x/mitmstack.config
similarity index 100%
rename from gerrit/acls/openstack/mitmstack.config
rename to gerrit/acls/x/mitmstack.config
diff --git a/gerrit/acls/openstack/mixmatch.config b/gerrit/acls/x/mixmatch.config
similarity index 100%
rename from gerrit/acls/openstack/mixmatch.config
rename to gerrit/acls/x/mixmatch.config
diff --git a/gerrit/acls/openstack/mogan.config b/gerrit/acls/x/mogan.config
similarity index 100%
rename from gerrit/acls/openstack/mogan.config
rename to gerrit/acls/x/mogan.config
diff --git a/gerrit/acls/openstack/mors.config b/gerrit/acls/x/mors.config
similarity index 100%
rename from gerrit/acls/openstack/mors.config
rename to gerrit/acls/x/mors.config
diff --git a/gerrit/acls/openstack/murano-plugin-networking-sfc.config b/gerrit/acls/x/murano-plugin-networking-sfc.config
similarity index 100%
rename from gerrit/acls/openstack/murano-plugin-networking-sfc.config
rename to gerrit/acls/x/murano-plugin-networking-sfc.config
diff --git a/gerrit/acls/openstack/namos.config b/gerrit/acls/x/namos.config
similarity index 100%
rename from gerrit/acls/openstack/namos.config
rename to gerrit/acls/x/namos.config
diff --git a/gerrit/acls/openstack/nemesis.config b/gerrit/acls/x/nemesis.config
similarity index 100%
rename from gerrit/acls/openstack/nemesis.config
rename to gerrit/acls/x/nemesis.config
diff --git a/gerrit/acls/openstack/nerd-reviewer.config b/gerrit/acls/x/nerd-reviewer.config
similarity index 100%
rename from gerrit/acls/openstack/nerd-reviewer.config
rename to gerrit/acls/x/nerd-reviewer.config
diff --git a/gerrit/acls/openstack/network-checker.config b/gerrit/acls/x/network-checker.config
similarity index 100%
rename from gerrit/acls/openstack/network-checker.config
rename to gerrit/acls/x/network-checker.config
diff --git a/gerrit/acls/openstack/networking-6wind.config b/gerrit/acls/x/networking-6wind.config
similarity index 100%
rename from gerrit/acls/openstack/networking-6wind.config
rename to gerrit/acls/x/networking-6wind.config
diff --git a/gerrit/acls/openstack/networking-ale-omniswitch.config b/gerrit/acls/x/networking-ale-omniswitch.config
similarity index 100%
rename from gerrit/acls/openstack/networking-ale-omniswitch.config
rename to gerrit/acls/x/networking-ale-omniswitch.config
diff --git a/gerrit/acls/openstack/networking-ansible.config b/gerrit/acls/x/networking-ansible.config
similarity index 100%
rename from gerrit/acls/openstack/networking-ansible.config
rename to gerrit/acls/x/networking-ansible.config
diff --git a/gerrit/acls/openstack/networking-arista.config b/gerrit/acls/x/networking-arista.config
similarity index 100%
rename from gerrit/acls/openstack/networking-arista.config
rename to gerrit/acls/x/networking-arista.config
diff --git a/gerrit/acls/openstack/networking-avaya.config b/gerrit/acls/x/networking-avaya.config
similarity index 100%
rename from gerrit/acls/openstack/networking-avaya.config
rename to gerrit/acls/x/networking-avaya.config
diff --git a/gerrit/acls/openstack/networking-bigswitch.config b/gerrit/acls/x/networking-bigswitch.config
similarity index 100%
rename from gerrit/acls/openstack/networking-bigswitch.config
rename to gerrit/acls/x/networking-bigswitch.config
diff --git a/gerrit/acls/openstack/networking-brocade.config b/gerrit/acls/x/networking-brocade.config
similarity index 100%
rename from gerrit/acls/openstack/networking-brocade.config
rename to gerrit/acls/x/networking-brocade.config
diff --git a/gerrit/acls/openstack/networking-cisco.config b/gerrit/acls/x/networking-cisco.config
similarity index 100%
rename from gerrit/acls/openstack/networking-cisco.config
rename to gerrit/acls/x/networking-cisco.config
diff --git a/gerrit/acls/openstack/networking-cumulus.config b/gerrit/acls/x/networking-cumulus.config
similarity index 100%
rename from gerrit/acls/openstack/networking-cumulus.config
rename to gerrit/acls/x/networking-cumulus.config
diff --git a/gerrit/acls/openstack/networking-dpm.config b/gerrit/acls/x/networking-dpm.config
similarity index 100%
rename from gerrit/acls/openstack/networking-dpm.config
rename to gerrit/acls/x/networking-dpm.config
diff --git a/gerrit/acls/openstack/networking-edge-vpn.config b/gerrit/acls/x/networking-edge-vpn.config
similarity index 100%
rename from gerrit/acls/openstack/networking-edge-vpn.config
rename to gerrit/acls/x/networking-edge-vpn.config
diff --git a/gerrit/acls/openstack/networking-extreme.config b/gerrit/acls/x/networking-extreme.config
similarity index 100%
rename from gerrit/acls/openstack/networking-extreme.config
rename to gerrit/acls/x/networking-extreme.config
diff --git a/gerrit/acls/openstack/networking-fortinet.config b/gerrit/acls/x/networking-fortinet.config
similarity index 100%
rename from gerrit/acls/openstack/networking-fortinet.config
rename to gerrit/acls/x/networking-fortinet.config
diff --git a/gerrit/acls/openstack/networking-fujitsu.config b/gerrit/acls/x/networking-fujitsu.config
similarity index 100%
rename from gerrit/acls/openstack/networking-fujitsu.config
rename to gerrit/acls/x/networking-fujitsu.config
diff --git a/gerrit/acls/openstack/networking-gluon.config b/gerrit/acls/x/networking-gluon.config
similarity index 100%
rename from gerrit/acls/openstack/networking-gluon.config
rename to gerrit/acls/x/networking-gluon.config
diff --git a/gerrit/acls/openstack/networking-h3c.config b/gerrit/acls/x/networking-h3c.config
similarity index 100%
rename from gerrit/acls/openstack/networking-h3c.config
rename to gerrit/acls/x/networking-h3c.config
diff --git a/gerrit/acls/openstack/networking-hpe.config b/gerrit/acls/x/networking-hpe.config
similarity index 100%
rename from gerrit/acls/openstack/networking-hpe.config
rename to gerrit/acls/x/networking-hpe.config
diff --git a/gerrit/acls/openstack/networking-huawei.config b/gerrit/acls/x/networking-huawei.config
similarity index 100%
rename from gerrit/acls/openstack/networking-huawei.config
rename to gerrit/acls/x/networking-huawei.config
diff --git a/gerrit/acls/openstack/networking-icc.config b/gerrit/acls/x/networking-icc.config
similarity index 100%
rename from gerrit/acls/openstack/networking-icc.config
rename to gerrit/acls/x/networking-icc.config
diff --git a/gerrit/acls/openstack/networking-infoblox.config b/gerrit/acls/x/networking-infoblox.config
similarity index 100%
rename from gerrit/acls/openstack/networking-infoblox.config
rename to gerrit/acls/x/networking-infoblox.config
diff --git a/gerrit/acls/openstack/networking-lagopus.config b/gerrit/acls/x/networking-lagopus.config
similarity index 100%
rename from gerrit/acls/openstack/networking-lagopus.config
rename to gerrit/acls/x/networking-lagopus.config
diff --git a/gerrit/acls/openstack/networking-lenovo.config b/gerrit/acls/x/networking-lenovo.config
similarity index 100%
rename from gerrit/acls/openstack/networking-lenovo.config
rename to gerrit/acls/x/networking-lenovo.config
diff --git a/gerrit/acls/openstack/networking-mlnx.config b/gerrit/acls/x/networking-mlnx.config
similarity index 100%
rename from gerrit/acls/openstack/networking-mlnx.config
rename to gerrit/acls/x/networking-mlnx.config
diff --git a/gerrit/acls/openstack/networking-nec.config b/gerrit/acls/x/networking-nec.config
similarity index 100%
rename from gerrit/acls/openstack/networking-nec.config
rename to gerrit/acls/x/networking-nec.config
diff --git a/gerrit/acls/openstack/networking-omnipath.config b/gerrit/acls/x/networking-omnipath.config
similarity index 100%
rename from gerrit/acls/openstack/networking-omnipath.config
rename to gerrit/acls/x/networking-omnipath.config
diff --git a/gerrit/acls/openstack/networking-opencontrail.config b/gerrit/acls/x/networking-opencontrail.config
similarity index 100%
rename from gerrit/acls/openstack/networking-opencontrail.config
rename to gerrit/acls/x/networking-opencontrail.config
diff --git a/gerrit/acls/openstack/networking-ovs-dpdk.config b/gerrit/acls/x/networking-ovs-dpdk.config
similarity index 100%
rename from gerrit/acls/openstack/networking-ovs-dpdk.config
rename to gerrit/acls/x/networking-ovs-dpdk.config
diff --git a/gerrit/acls/openstack/networking-peregrine.config b/gerrit/acls/x/networking-peregrine.config
similarity index 100%
rename from gerrit/acls/openstack/networking-peregrine.config
rename to gerrit/acls/x/networking-peregrine.config
diff --git a/gerrit/acls/openstack/networking-plumgrid.config b/gerrit/acls/x/networking-plumgrid.config
similarity index 100%
rename from gerrit/acls/openstack/networking-plumgrid.config
rename to gerrit/acls/x/networking-plumgrid.config
diff --git a/gerrit/acls/openstack/networking-spp.config b/gerrit/acls/x/networking-spp.config
similarity index 100%
rename from gerrit/acls/openstack/networking-spp.config
rename to gerrit/acls/x/networking-spp.config
diff --git a/gerrit/acls/openstack/networking-vpp.config b/gerrit/acls/x/networking-vpp.config
similarity index 100%
rename from gerrit/acls/openstack/networking-vpp.config
rename to gerrit/acls/x/networking-vpp.config
diff --git a/gerrit/acls/openstack/networking-vsphere.config b/gerrit/acls/x/networking-vsphere.config
similarity index 100%
rename from gerrit/acls/openstack/networking-vsphere.config
rename to gerrit/acls/x/networking-vsphere.config
diff --git a/gerrit/acls/openstack/networking-zte.config b/gerrit/acls/x/networking-zte.config
similarity index 100%
rename from gerrit/acls/openstack/networking-zte.config
rename to gerrit/acls/x/networking-zte.config
diff --git a/gerrit/acls/openstack/networking-zvm.config b/gerrit/acls/x/networking-zvm.config
similarity index 100%
rename from gerrit/acls/openstack/networking-zvm.config
rename to gerrit/acls/x/networking-zvm.config
diff --git a/gerrit/acls/openstack/neutron-classifier.config b/gerrit/acls/x/neutron-classifier.config
similarity index 100%
rename from gerrit/acls/openstack/neutron-classifier.config
rename to gerrit/acls/x/neutron-classifier.config
diff --git a/gerrit/acls/openstack/nfv-filters.config b/gerrit/acls/x/nfv-filters.config
similarity index 100%
rename from gerrit/acls/openstack/nfv-filters.config
rename to gerrit/acls/x/nfv-filters.config
diff --git a/gerrit/acls/openstack/nova-dpm.config b/gerrit/acls/x/nova-dpm.config
similarity index 100%
rename from gerrit/acls/openstack/nova-dpm.config
rename to gerrit/acls/x/nova-dpm.config
diff --git a/gerrit/acls/openstack/nova-fusioncompute.config b/gerrit/acls/x/nova-fusioncompute.config
similarity index 100%
rename from gerrit/acls/openstack/nova-fusioncompute.config
rename to gerrit/acls/x/nova-fusioncompute.config
diff --git a/gerrit/acls/openstack/nova-lxd.config b/gerrit/acls/x/nova-lxd.config
similarity index 100%
rename from gerrit/acls/openstack/nova-lxd.config
rename to gerrit/acls/x/nova-lxd.config
diff --git a/gerrit/acls/openstack/nova-mksproxy.config b/gerrit/acls/x/nova-mksproxy.config
similarity index 100%
rename from gerrit/acls/openstack/nova-mksproxy.config
rename to gerrit/acls/x/nova-mksproxy.config
diff --git a/gerrit/acls/openstack/nova-solver-scheduler.config b/gerrit/acls/x/nova-solver-scheduler.config
similarity index 100%
rename from gerrit/acls/openstack/nova-solver-scheduler.config
rename to gerrit/acls/x/nova-solver-scheduler.config
diff --git a/gerrit/acls/openstack/nova-zvm-virt-driver.config b/gerrit/acls/x/nova-zvm-virt-driver.config
similarity index 100%
rename from gerrit/acls/openstack/nova-zvm-virt-driver.config
rename to gerrit/acls/x/nova-zvm-virt-driver.config
diff --git a/gerrit/acls/openstack/novajoin.config b/gerrit/acls/x/novajoin.config
similarity index 100%
rename from gerrit/acls/openstack/novajoin.config
rename to gerrit/acls/x/novajoin.config
diff --git a/gerrit/acls/openstack/oaktree.config b/gerrit/acls/x/oaktree.config
similarity index 100%
rename from gerrit/acls/openstack/oaktree.config
rename to gerrit/acls/x/oaktree.config
diff --git a/gerrit/acls/openstack/omni.config b/gerrit/acls/x/omni.config
similarity index 100%
rename from gerrit/acls/openstack/omni.config
rename to gerrit/acls/x/omni.config
diff --git a/gerrit/acls/openstack/ooi.config b/gerrit/acls/x/ooi.config
similarity index 100%
rename from gerrit/acls/openstack/ooi.config
rename to gerrit/acls/x/ooi.config
diff --git a/gerrit/acls/openstack/opencafe.config b/gerrit/acls/x/opencafe.config
similarity index 100%
rename from gerrit/acls/openstack/opencafe.config
rename to gerrit/acls/x/opencafe.config
diff --git a/gerrit/acls/openstack/openstack-mentoring-scripts.config b/gerrit/acls/x/openstack-mentoring-scripts.config
similarity index 100%
rename from gerrit/acls/openstack/openstack-mentoring-scripts.config
rename to gerrit/acls/x/openstack-mentoring-scripts.config
diff --git a/gerrit/acls/openstack/openstack-resource-agents.config b/gerrit/acls/x/openstack-resource-agents.config
similarity index 100%
rename from gerrit/acls/openstack/openstack-resource-agents.config
rename to gerrit/acls/x/openstack-resource-agents.config
diff --git a/gerrit/acls/openstack/openstack-service-broker.config b/gerrit/acls/x/openstack-service-broker.config
similarity index 100%
rename from gerrit/acls/openstack/openstack-service-broker.config
rename to gerrit/acls/x/openstack-service-broker.config
diff --git a/gerrit/acls/openstack/openstack-spaceport.config b/gerrit/acls/x/openstack-spaceport.config
similarity index 100%
rename from gerrit/acls/openstack/openstack-spaceport.config
rename to gerrit/acls/x/openstack-spaceport.config
diff --git a/gerrit/acls/openstack/ops-telecom-nfv.config b/gerrit/acls/x/ops-telecom-nfv.config
similarity index 100%
rename from gerrit/acls/openstack/ops-telecom-nfv.config
rename to gerrit/acls/x/ops-telecom-nfv.config
diff --git a/gerrit/acls/openstack/os-dpm.config b/gerrit/acls/x/os-dpm.config
similarity index 100%
rename from gerrit/acls/openstack/os-dpm.config
rename to gerrit/acls/x/os-dpm.config
diff --git a/gerrit/acls/openstack/os-log-merger.config b/gerrit/acls/x/os-log-merger.config
similarity index 100%
rename from gerrit/acls/openstack/os-log-merger.config
rename to gerrit/acls/x/os-log-merger.config
diff --git a/gerrit/acls/openstack/os-xenapi.config b/gerrit/acls/x/os-xenapi.config
similarity index 100%
rename from gerrit/acls/openstack/os-xenapi.config
rename to gerrit/acls/x/os-xenapi.config
diff --git a/gerrit/acls/openstack/osc-summit-counter.config b/gerrit/acls/x/osc-summit-counter.config
similarity index 100%
rename from gerrit/acls/openstack/osc-summit-counter.config
rename to gerrit/acls/x/osc-summit-counter.config
diff --git a/gerrit/acls/openstack/osel.config b/gerrit/acls/x/osel.config
similarity index 100%
rename from gerrit/acls/openstack/osel.config
rename to gerrit/acls/x/osel.config
diff --git a/gerrit/acls/openstack/ospurge.config b/gerrit/acls/x/ospurge.config
similarity index 100%
rename from gerrit/acls/openstack/ospurge.config
rename to gerrit/acls/x/ospurge.config
diff --git a/gerrit/acls/openstack/packetary.config b/gerrit/acls/x/packetary.config
similarity index 100%
rename from gerrit/acls/openstack/packetary.config
rename to gerrit/acls/x/packetary.config
diff --git a/gerrit/acls/openstack/packstack.config b/gerrit/acls/x/packstack.config
similarity index 100%
rename from gerrit/acls/openstack/packstack.config
rename to gerrit/acls/x/packstack.config
diff --git a/gerrit/acls/openstack/pandaman.config b/gerrit/acls/x/pandaman.config
similarity index 100%
rename from gerrit/acls/openstack/pandaman.config
rename to gerrit/acls/x/pandaman.config
diff --git a/gerrit/acls/openstack/pbrx.config b/gerrit/acls/x/pbrx.config
similarity index 100%
rename from gerrit/acls/openstack/pbrx.config
rename to gerrit/acls/x/pbrx.config
diff --git a/gerrit/acls/openstack/performa.config b/gerrit/acls/x/performa.config
similarity index 100%
rename from gerrit/acls/openstack/performa.config
rename to gerrit/acls/x/performa.config
diff --git a/gerrit/acls/openstack/picasso.config b/gerrit/acls/x/picasso.config
similarity index 100%
rename from gerrit/acls/openstack/picasso.config
rename to gerrit/acls/x/picasso.config
diff --git a/gerrit/acls/openstack/poppy.config b/gerrit/acls/x/poppy.config
similarity index 100%
rename from gerrit/acls/openstack/poppy.config
rename to gerrit/acls/x/poppy.config
diff --git a/gerrit/acls/openstack/powervc-driver.config b/gerrit/acls/x/powervc-driver.config
similarity index 100%
rename from gerrit/acls/openstack/powervc-driver.config
rename to gerrit/acls/x/powervc-driver.config
diff --git a/gerrit/acls/openstack/proliantutils.config b/gerrit/acls/x/proliantutils.config
similarity index 100%
rename from gerrit/acls/openstack/proliantutils.config
rename to gerrit/acls/x/proliantutils.config
diff --git a/gerrit/acls/openstack/promstat.config b/gerrit/acls/x/promstat.config
similarity index 100%
rename from gerrit/acls/openstack/promstat.config
rename to gerrit/acls/x/promstat.config
diff --git a/gerrit/acls/openstack/puppet-midonet.config b/gerrit/acls/x/puppet-midonet.config
similarity index 100%
rename from gerrit/acls/openstack/puppet-midonet.config
rename to gerrit/acls/x/puppet-midonet.config
diff --git a/gerrit/acls/openstack/puppet-n1k-vsm.config b/gerrit/acls/x/puppet-n1k-vsm.config
similarity index 100%
rename from gerrit/acls/openstack/puppet-n1k-vsm.config
rename to gerrit/acls/x/puppet-n1k-vsm.config
diff --git a/gerrit/acls/openstack/pyghmi.config b/gerrit/acls/x/pyghmi.config
similarity index 100%
rename from gerrit/acls/openstack/pyghmi.config
rename to gerrit/acls/x/pyghmi.config
diff --git a/gerrit/acls/openstack/python-don.config b/gerrit/acls/x/python-don.config
similarity index 100%
rename from gerrit/acls/openstack/python-don.config
rename to gerrit/acls/x/python-don.config
diff --git a/gerrit/acls/openstack/python-hnvclient.config b/gerrit/acls/x/python-hnvclient.config
similarity index 100%
rename from gerrit/acls/openstack/python-hnvclient.config
rename to gerrit/acls/x/python-hnvclient.config
diff --git a/gerrit/acls/openstack/python-k8sclient.config b/gerrit/acls/x/python-k8sclient.config
similarity index 100%
rename from gerrit/acls/openstack/python-k8sclient.config
rename to gerrit/acls/x/python-k8sclient.config
diff --git a/gerrit/acls/openstack/python-oneviewclient.config b/gerrit/acls/x/python-oneviewclient.config
similarity index 100%
rename from gerrit/acls/openstack/python-oneviewclient.config
rename to gerrit/acls/x/python-oneviewclient.config
diff --git a/gerrit/acls/openstack/python-opentsdbclient.config b/gerrit/acls/x/python-opentsdbclient.config
similarity index 100%
rename from gerrit/acls/openstack/python-opentsdbclient.config
rename to gerrit/acls/x/python-opentsdbclient.config
diff --git a/gerrit/acls/openstack/python-redfish.config b/gerrit/acls/x/python-redfish.config
similarity index 100%
rename from gerrit/acls/openstack/python-redfish.config
rename to gerrit/acls/x/python-redfish.config
diff --git a/gerrit/acls/openstack/python-scciclient.config b/gerrit/acls/x/python-scciclient.config
similarity index 100%
rename from gerrit/acls/openstack/python-scciclient.config
rename to gerrit/acls/x/python-scciclient.config
diff --git a/gerrit/acls/openstack/quark.config b/gerrit/acls/x/quark.config
similarity index 100%
rename from gerrit/acls/openstack/quark.config
rename to gerrit/acls/x/quark.config
diff --git a/gerrit/acls/openstack/rack.config b/gerrit/acls/x/rack.config
similarity index 100%
rename from gerrit/acls/openstack/rack.config
rename to gerrit/acls/x/rack.config
diff --git a/gerrit/acls/openstack/radar.config b/gerrit/acls/x/radar.config
similarity index 100%
rename from gerrit/acls/openstack/radar.config
rename to gerrit/acls/x/radar.config
diff --git a/gerrit/acls/openstack/ranger.config b/gerrit/acls/x/ranger.config
similarity index 100%
rename from gerrit/acls/openstack/ranger.config
rename to gerrit/acls/x/ranger.config
diff --git a/gerrit/acls/openstack/rsd-virt-for-nova.config b/gerrit/acls/x/rsd-virt-for-nova.config
similarity index 100%
rename from gerrit/acls/openstack/rsd-virt-for-nova.config
rename to gerrit/acls/x/rsd-virt-for-nova.config
diff --git a/gerrit/acls/openstack/sahara-ci-config.config b/gerrit/acls/x/sahara-ci-config.config
similarity index 100%
rename from gerrit/acls/openstack/sahara-ci-config.config
rename to gerrit/acls/x/sahara-ci-config.config
diff --git a/gerrit/acls/openstack/scalpels.config b/gerrit/acls/x/scalpels.config
similarity index 100%
rename from gerrit/acls/openstack/scalpels.config
rename to gerrit/acls/x/scalpels.config
diff --git a/gerrit/acls/openstack/shovel-horizon.config b/gerrit/acls/x/shovel-horizon.config
similarity index 100%
rename from gerrit/acls/openstack/shovel-horizon.config
rename to gerrit/acls/x/shovel-horizon.config
diff --git a/gerrit/acls/openstack/shovel.config b/gerrit/acls/x/shovel.config
similarity index 100%
rename from gerrit/acls/openstack/shovel.config
rename to gerrit/acls/x/shovel.config
diff --git a/gerrit/acls/openstack/slogging.config b/gerrit/acls/x/slogging.config
similarity index 100%
rename from gerrit/acls/openstack/slogging.config
rename to gerrit/acls/x/slogging.config
diff --git a/gerrit/acls/openstack/solar.config b/gerrit/acls/x/solar.config
similarity index 100%
rename from gerrit/acls/openstack/solar.config
rename to gerrit/acls/x/solar.config
diff --git a/gerrit/acls/openstack/spanner.config b/gerrit/acls/x/spanner.config
similarity index 100%
rename from gerrit/acls/openstack/spanner.config
rename to gerrit/acls/x/spanner.config
diff --git a/gerrit/acls/openstack/sqlalchemy-migrate.config b/gerrit/acls/x/sqlalchemy-migrate.config
similarity index 100%
rename from gerrit/acls/openstack/sqlalchemy-migrate.config
rename to gerrit/acls/x/sqlalchemy-migrate.config
diff --git a/gerrit/acls/openstack/stackalytics.config b/gerrit/acls/x/stackalytics.config
similarity index 100%
rename from gerrit/acls/openstack/stackalytics.config
rename to gerrit/acls/x/stackalytics.config
diff --git a/gerrit/acls/openstack/stacklight-integration-tests.config b/gerrit/acls/x/stacklight-integration-tests.config
similarity index 100%
rename from gerrit/acls/openstack/stacklight-integration-tests.config
rename to gerrit/acls/x/stacklight-integration-tests.config
diff --git a/gerrit/acls/openstack/stacktach.config b/gerrit/acls/x/stacktach.config
similarity index 100%
rename from gerrit/acls/openstack/stacktach.config
rename to gerrit/acls/x/stacktach.config
diff --git a/gerrit/acls/openstack/stackube.config b/gerrit/acls/x/stackube.config
similarity index 100%
rename from gerrit/acls/openstack/stackube.config
rename to gerrit/acls/x/stackube.config
diff --git a/gerrit/acls/openstack/steth.config b/gerrit/acls/x/steth.config
similarity index 100%
rename from gerrit/acls/openstack/steth.config
rename to gerrit/acls/x/steth.config
diff --git a/gerrit/acls/openstack/surveil.config b/gerrit/acls/x/surveil.config
similarity index 100%
rename from gerrit/acls/openstack/surveil.config
rename to gerrit/acls/x/surveil.config
diff --git a/gerrit/acls/openstack/swauth.config b/gerrit/acls/x/swauth.config
similarity index 100%
rename from gerrit/acls/openstack/swauth.config
rename to gerrit/acls/x/swauth.config
diff --git a/gerrit/acls/openstack/swift-ceph-backend.config b/gerrit/acls/x/swift-ceph-backend.config
similarity index 100%
rename from gerrit/acls/openstack/swift-ceph-backend.config
rename to gerrit/acls/x/swift-ceph-backend.config
diff --git a/gerrit/acls/openstack/swift3.config b/gerrit/acls/x/swift3.config
similarity index 100%
rename from gerrit/acls/openstack/swift3.config
rename to gerrit/acls/x/swift3.config
diff --git a/gerrit/acls/openstack/swiftonfile.config b/gerrit/acls/x/swiftonfile.config
similarity index 100%
rename from gerrit/acls/openstack/swiftonfile.config
rename to gerrit/acls/x/swiftonfile.config
diff --git a/gerrit/acls/openstack/swiftonhpss.config b/gerrit/acls/x/swiftonhpss.config
similarity index 100%
rename from gerrit/acls/openstack/swiftonhpss.config
rename to gerrit/acls/x/swiftonhpss.config
diff --git a/gerrit/acls/openstack/tap-as-a-service.config b/gerrit/acls/x/tap-as-a-service.config
similarity index 100%
rename from gerrit/acls/openstack/tap-as-a-service.config
rename to gerrit/acls/x/tap-as-a-service.config
diff --git a/gerrit/acls/openstack/tatu.config b/gerrit/acls/x/tatu.config
similarity index 100%
rename from gerrit/acls/openstack/tatu.config
rename to gerrit/acls/x/tatu.config
diff --git a/gerrit/acls/openstack/tc-as-a-service.config b/gerrit/acls/x/tc-as-a-service.config
similarity index 100%
rename from gerrit/acls/openstack/tc-as-a-service.config
rename to gerrit/acls/x/tc-as-a-service.config
diff --git a/gerrit/acls/openstack/telcowg-usecases.config b/gerrit/acls/x/telcowg-usecases.config
similarity index 100%
rename from gerrit/acls/openstack/telcowg-usecases.config
rename to gerrit/acls/x/telcowg-usecases.config
diff --git a/gerrit/acls/openstack/terracotta.config b/gerrit/acls/x/terracotta.config
similarity index 100%
rename from gerrit/acls/openstack/terracotta.config
rename to gerrit/acls/x/terracotta.config
diff --git a/gerrit/acls/openstack/third-party-ci-tools.config b/gerrit/acls/x/third-party-ci-tools.config
similarity index 100%
rename from gerrit/acls/openstack/third-party-ci-tools.config
rename to gerrit/acls/x/third-party-ci-tools.config
diff --git a/gerrit/acls/openstack/timmy.config b/gerrit/acls/x/timmy.config
similarity index 100%
rename from gerrit/acls/openstack/timmy.config
rename to gerrit/acls/x/timmy.config
diff --git a/gerrit/acls/openstack/tobiko.config b/gerrit/acls/x/tobiko.config
similarity index 100%
rename from gerrit/acls/openstack/tobiko.config
rename to gerrit/acls/x/tobiko.config
diff --git a/gerrit/acls/openstack/trio2o.config b/gerrit/acls/x/trio2o.config
similarity index 100%
rename from gerrit/acls/openstack/trio2o.config
rename to gerrit/acls/x/trio2o.config
diff --git a/gerrit/acls/openstack/turbo-hipster.config b/gerrit/acls/x/turbo-hipster.config
similarity index 100%
rename from gerrit/acls/openstack/turbo-hipster.config
rename to gerrit/acls/x/turbo-hipster.config
diff --git a/gerrit/acls/openstack/vahana.config b/gerrit/acls/x/vahana.config
similarity index 100%
rename from gerrit/acls/openstack/vahana.config
rename to gerrit/acls/x/vahana.config
diff --git a/gerrit/acls/openstack/valence.config b/gerrit/acls/x/valence.config
similarity index 100%
rename from gerrit/acls/openstack/valence.config
rename to gerrit/acls/x/valence.config
diff --git a/gerrit/acls/openstack/valet.config b/gerrit/acls/x/valet.config
similarity index 100%
rename from gerrit/acls/openstack/valet.config
rename to gerrit/acls/x/valet.config
diff --git a/gerrit/acls/openstack/virtualpdu.config b/gerrit/acls/x/virtualpdu.config
similarity index 100%
rename from gerrit/acls/openstack/virtualpdu.config
rename to gerrit/acls/x/virtualpdu.config
diff --git a/gerrit/acls/openstack/vm-bm-wg.config b/gerrit/acls/x/vm-bm-wg.config
similarity index 100%
rename from gerrit/acls/openstack/vm-bm-wg.config
rename to gerrit/acls/x/vm-bm-wg.config
diff --git a/gerrit/acls/openstack/vmtp.config b/gerrit/acls/x/vmtp.config
similarity index 100%
rename from gerrit/acls/openstack/vmtp.config
rename to gerrit/acls/x/vmtp.config
diff --git a/gerrit/acls/openstack/vmware-nsx.config b/gerrit/acls/x/vmware-nsx.config
similarity index 100%
rename from gerrit/acls/openstack/vmware-nsx.config
rename to gerrit/acls/x/vmware-nsx.config
diff --git a/gerrit/acls/openstack/vmware-vspc.config b/gerrit/acls/x/vmware-vspc.config
similarity index 100%
rename from gerrit/acls/openstack/vmware-vspc.config
rename to gerrit/acls/x/vmware-vspc.config
diff --git a/gerrit/acls/openstack/whitebox-tempest-plugin.config b/gerrit/acls/x/whitebox-tempest-plugin.config
similarity index 100%
rename from gerrit/acls/openstack/whitebox-tempest-plugin.config
rename to gerrit/acls/x/whitebox-tempest-plugin.config
diff --git a/gerrit/acls/openstack/wsme.config b/gerrit/acls/x/wsme.config
similarity index 100%
rename from gerrit/acls/openstack/wsme.config
rename to gerrit/acls/x/wsme.config
diff --git a/gerrit/acls/openstack/xenapi-os-testing.config b/gerrit/acls/x/xenapi-os-testing.config
similarity index 100%
rename from gerrit/acls/openstack/xenapi-os-testing.config
rename to gerrit/acls/x/xenapi-os-testing.config
diff --git a/gerrit/acls/openstack-infra/zmq-event-publisher.config b/gerrit/acls/x/zmq-event-publisher.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zmq-event-publisher.config
rename to gerrit/acls/x/zmq-event-publisher.config
diff --git a/gerrit/acls/openstack-infra/nodepool.config b/gerrit/acls/zuul/nodepool.config
similarity index 100%
rename from gerrit/acls/openstack-infra/nodepool.config
rename to gerrit/acls/zuul/nodepool.config
diff --git a/gerrit/acls/openstack-infra/zuul-base-jobs.config b/gerrit/acls/zuul/zuul-base-jobs.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zuul-base-jobs.config
rename to gerrit/acls/zuul/zuul-base-jobs.config
diff --git a/gerrit/acls/openstack-infra/zuul-jobs.config b/gerrit/acls/zuul/zuul-jobs.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zuul-jobs.config
rename to gerrit/acls/zuul/zuul-jobs.config
diff --git a/gerrit/acls/openstack-infra/zuul-sphinx.config b/gerrit/acls/zuul/zuul-sphinx.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zuul-sphinx.config
rename to gerrit/acls/zuul/zuul-sphinx.config
diff --git a/gerrit/acls/openstack-infra/zuul-website.config b/gerrit/acls/zuul/zuul-website.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zuul-website.config
rename to gerrit/acls/zuul/zuul-website.config
diff --git a/gerrit/acls/openstack-infra/zuul.config b/gerrit/acls/zuul/zuul.config
similarity index 100%
rename from gerrit/acls/openstack-infra/zuul.config
rename to gerrit/acls/zuul/zuul.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index b8d87459f2..164a1a1d52 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -36,62 +36,62 @@
 - project: openstack-attic/oslo.version
 - project: openstack-attic/python-melangeclient
 - project: openstack-attic/volume-api
-- project: openstack-dev/bashate
+- project: openstack/bashate
   description: Code style enforcement for bash programs.
 - project: openstack-dev/ci-sandbox
   description: Sandbox for 3rd party CI systems
   use-storyboard: true
-- project: openstack-dev/cookiecutter
+- project: openstack/cookiecutter
   description: Cookiecutter Template for new OpenStack projects
-- project: openstack-dev/devstack
+- project: openstack/devstack
   description: System for quickly installing an OpenStack cloud from upstream git
     for testing and development.
-- project: openstack-dev/devstack-plugin-cookiecutter
+- project: openstack/devstack-plugin-cookiecutter
   description: Cookiecutter Template for new DevStack plugins
-  acl-config: /home/gerrit2/acls/openstack-dev/devstack.config
-- project: openstack-dev/devstack-vagrant
+  acl-config: /home/gerrit2/acls/openstack/devstack.config
+- project: openstack/devstack-vagrant
   description: Vagrant configuration for building DevStack environments.
-- project: openstack-dev/grenade
+- project: openstack/grenade
   description: Upgrade testing of OpenStack projects built on top of DevStack.
-- project: openstack-dev/hacking
+- project: openstack/hacking
   description: OpenStack Hacking Style Checks
-- project: openstack-dev/heat-cfnclient
+- project: openstack/heat-cfnclient
   use-storyboard: true
   description: CloudFormation compatibile Heat client
   groups:
     - heat
-- project: openstack-dev/openstack-nose
+- project: openstack/openstack-nose
   description: Nose plugin for OpenStack style test output
 - project: openstack-dev/os-http
   description: Simple HTTP CLI for OpenStack services
-- project: openstack-dev/oslo-cookiecutter
+- project: openstack/oslo-cookiecutter
   description: Cookiecutter Template for new Oslo libraries
-- project: openstack-dev/pbr
+- project: openstack/pbr
   description: Python Build Reasonableness
 - project: openstack-dev/sandbox
   description: Sandbox for first time contributors
   groups:
     - openstack-dev-sandbox
-- project: openstack-dev/specs-cookiecutter
+- project: openstack/specs-cookiecutter
   description: Cookiecutter templates for new specs repos
   use-storyboard: true
   groups:
     - release
-- project: openstack-infra/activity-board
+- project: openstack/activity-board
   description: RETIRED, Tech community metrics dash of the OpenStack community based
     on the Metrics Grimoire toolset
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/afsmon
+- project: opendev/afsmon
   use-storyboard: true
   groups:
     - openstack-ci
   description: Python based monitoring for AFS
-- project: openstack-infra/ansible-role-puppet
+- project: opendev/ansible-role-puppet
   use-storyboard: true
   description: Ansible role for running puppet
   groups:
     - openstack-ci
-- project: openstack-infra/askbot-theme
+- project: opendev/askbot-theme
   use-storyboard: true
   groups:
     - openstack-ci
@@ -102,48 +102,48 @@
 - project: openstack-infra/beaker-nodepool
   description: RETIRED, Beaker hypervisor for using nodepool gear and/or rest api
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/bindep
+- project: opendev/bindep
   description: Binary dependency automation
   use-storyboard: true
   groups:
     - openstack-ci
-- project: openstack-infra/bugdaystats
+- project: openstack/bugdaystats
   use-storyboard: true
   groups:
     - openstack-ci
   description: Tool to produce static HTML that shows progress during a Bug Day
-- project: openstack-infra/ciwatch
+- project: x/ciwatch
   description: An OpenStack third-party CI monitoring tool
-- project: openstack-infra/devstack-gate
+- project: openstack/devstack-gate
   description: Run DevStack in the gate
   use-storyboard: true
   groups:
     - openstack-ci
-- project: openstack-infra/elastic-recheck
+- project: opendev/elastic-recheck
   use-storyboard: true
   groups:
     - openstack-ci
   description: Classify tempest-devstack failures using ElasticSearch
-- project: openstack-infra/err2d2
+- project: x/err2d2
   description: RETIRED, Errbot 'feature' plugins that can be combined and/or assembled
     into a useful errbot bot (using whichever errbot backend you prefer).
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/featuretracker
+- project: x/featuretracker
   description: RETIRED, Dashboard for tracking progress on cross-project development
     proposals
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/gear
+- project: opendev/gear
   use-storyboard: true
   groups:
     - openstack-ci
   description: Pure-Python asynchronous interface to Gearman
-- project: openstack-infra/gearman-plugin
+- project: x/gearman-plugin
   use-storyboard: true
   description: The jenkins gearman plugin
-- project: openstack-infra/germqtt
+- project: opendev/germqtt
   use-storyboard: true
   description: Publish a gerrit event stream on MQTT
-- project: openstack-infra/gerrit
+- project: opendev/gerrit
   use-storyboard: true
   groups:
     - openstack-ci
@@ -152,124 +152,124 @@
   upstream-prefix: upstream
   options:
     - track-upstream
-- project: openstack-infra/gerritbot
+- project: opendev/gerritbot
   use-storyboard: true
   groups:
     - openstack-ci
   description: IRC bot that reports on Gerrit events
-- project: openstack-infra/gerritlib
+- project: opendev/gerritlib
   use-storyboard: true
   groups:
     - openstack-ci
   description: Library for Gerrit
-- project: openstack-infra/git-restack
+- project: opendev/git-restack
   use-storyboard: true
   groups:
     - openstack-ci
   description: Tool for rebasing change series
-- project: openstack-infra/git-review
+- project: openstack/git-review
   use-storyboard: true
   groups:
     - openstack-ci
   description: Tool for uploading changesets to Gerrit from git
-- project: openstack-infra/gitdm
+- project: x/gitdm
   use-storyboard: true
   groups:
     - openstack-ci
   description: A fork of Jonathan Corbet's gitdm for OpenStack
-- project: openstack-infra/glean
+- project: opendev/glean
   use-storyboard: true
   description: Simple program to write static config from config-drive
   groups:
     - openstack-ci
-- project: openstack-infra/grafyaml
+- project: opendev/grafyaml
   use-storyboard: true
   groups:
     - openstack-ci
   description: Tools to make Grafana dashboards from templates
-- project: openstack-infra/groups
+- project: osf/groups
   use-storyboard: true
   groups:
     - groups-portal
   description: OpenStack Groups community portal
-- project: openstack-infra/groups-static-pages
+- project: osf/groups-static-pages
   use-storyboard: true
   groups:
     - groups-portal
   description: Community portal static pages
-- project: openstack-infra/infra-ansible
+- project: x/infra-ansible
   use-storyboard: true
   description: Collection of Ansible playbooks to bring up an OpenStack Infra
   groups:
     - openstack-ci
-- project: openstack-infra/infra-manual
+- project: openstack/infra-manual
   use-storyboard: true
   groups:
     - openstack-ci
   description: OpenStack Infrastructure User Manual
-- project: openstack-infra/infra-specs
+- project: opendev/infra-specs
   use-storyboard: true
   groups:
     - openstack-ci
   description: OpenStack Infrastructure Blueprint Repository
-- project: openstack-infra/irc-meetings
+- project: opendev/irc-meetings
   description: OpenStack IRC meetings schedule
-- project: openstack-infra/jeepyb
+- project: opendev/jeepyb
   use-storyboard: true
   groups:
     - openstack-ci
   description: Gerrit Project Builder Tools
-- project: openstack-infra/jenkins-job-builder
+- project: jjb/jenkins-job-builder
   use-storyboard: true
   groups:
     - openstack-ci
   description: Tools to make Jenkins jobs from templates
-- project: openstack-infra/js-afs-blob-store
+- project: x/js-afs-blob-store
   description: RETIRED, An implementation of fs-blob-store for OpenStack's afs-based
     mirrors.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/js-generator-openstack
+- project: x/js-generator-openstack
   description: RETIRED, Yeoman Project Management template for JavaScript Projects.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/js-openstack-registry-hooks
+- project: x/js-openstack-registry-hooks
   description: RETIRED, registry-static procedural hooks for OpenStack's NPM mirror.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/lodgeit
+- project: opendev/lodgeit
   use-storyboard: true
   groups:
     - openstack-ci
   description: LogdeIt, a Pastebin service
-- project: openstack-infra/log-classify
+- project: opendev/log-classify
   use-storyboard: true
   description: Classify job results
   groups:
     - openstack-ci
-- project: openstack-infra/logstash-filters
+- project: openstack/logstash-filters
   use-storyboard: true
   groups:
     - openstack-ci
   description: Logstash filters for OpenStack
-- project: openstack-infra/log_processor
+- project: opendev/log_processor
   use-storyboard: true
   groups:
     - openstack-ci
   description: Download Jenkins build logs and inject them into Logstash
-- project: openstack-infra/lpmqtt
+- project: opendev/lpmqtt
   use-storyboard: true
   description: Publish a launchpad event stream on MQTT
-- project: openstack-infra/meetbot
+- project: opendev/meetbot
   use-storyboard: true
   groups:
     - openstack-ci
   description: IRC bot for meetings and logging channels
-- project: openstack-infra/mqtt_statsd
+- project: opendev/mqtt_statsd
   description: A simple daemon for publishing MQTT data into statsd
   use-storyboard: true
   groups:
     - openstack-ci
 - project: openstack-infra/netlify-sandbox
   description: sandbox for testing netlify cms integration with Gerrit.
-- project: openstack-infra/nodepool
+- project: zuul/nodepool
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -277,12 +277,12 @@
   groups:
     - zuul
   description: Manage a pool of nodes for a distributed test infrastructure
-- project: openstack-infra/nose-html-output
+- project: openstack/nose-html-output
   use-storyboard: true
   groups:
     - openstack-ci
   description: Nose plugin for generating HTML output
-- project: openstack-infra/odsreg
+- project: osf/odsreg
   use-storyboard: true
   description: OpenStack Design Summit session management system
 - project: openstack-infra/opendev-website
@@ -290,106 +290,106 @@
   groups:
     - openstack-ci
   description: The contents of the OpenDev website
-- project: openstack-infra/openstack-zuul-jobs
+- project: openstack/openstack-zuul-jobs
   use-storyboard: true
   groups:
     - openstack-ci
   description: Ansible job definitions for OpenStack projects CI systems
-- project: openstack-infra/openstack-zuul-roles
+- project: openstack/openstack-zuul-roles
   use-storyboard: true
   groups:
     - openstack-ci
   description: Ansible role definitions for OpenStack projects CI systems
-- project: openstack-infra/openstackid
+- project: osf/openstackid
   use-storyboard: true
   description: Authentication system for the OpenStack Foundation site
   groups:
     - openstack-org
-- project: openstack-infra/openstackid-resources
+- project: osf/openstackid-resources
   use-storyboard: true
   description: Resource service for the OpenStack Foundation site
   groups:
     - openstack-org
-- project: openstack-infra/openstackweb
+- project: osf/openstackweb
   use-storyboard: true
   description: OpenStack Foundation web site software
   groups:
     - openstack-org
-- project: openstack-infra/os-loganalyze
+- project: openstack/os-loganalyze
   use-storyboard: true
   groups:
     - openstack-ci
   description: Log analyzer tools for logs.openstack.org
-- project: openstack-infra/project-config
+- project: openstack/project-config
   use-storyboard: true
   groups:
     - openstack-ci
   description: Configuration files for project CI systems
-- project: openstack-infra/project-config-example
+- project: opendev/project-config-example
   description: An example project-config repo that can be used as a starting point.
   use-storyboard: true
-- project: openstack-infra/publications
+- project: opendev/publications
   use-storyboard: true
   groups:
     - openstack-ci
   description: OpenStack Infra Team conference presentations and papers
-- project: openstack-infra/puppet-accessbot
+- project: opendev/puppet-accessbot
   use-storyboard: true
   description: Puppet module for the accessbot
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ansible
+- project: opendev/puppet-ansible
   use-storyboard: true
   description: Puppet module for Ansible
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-apparmor
+- project: opendev/puppet-apparmor
   use-storyboard: true
   groups:
     - openstack-ci
   description: Puppet module for AppArmor
-- project: openstack-infra/puppet-apps_site
+- project: opendev/puppet-apps_site
   description: RETIRED, Puppet module for Apps site
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-askbot
+- project: opendev/puppet-askbot
   use-storyboard: true
   groups:
     - openstack-ci
   description: Puppet module for Askbot
-- project: openstack-infra/puppet-asterisk
+- project: opendev/puppet-asterisk
   use-storyboard: true
   description: Puppet module for Asterisk
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-bandersnatch
+- project: opendev/puppet-bandersnatch
   use-storyboard: true
   description: Puppet module for Bandersnatch
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-bugdaystats
+- project: opendev/puppet-bugdaystats
   use-storyboard: true
   description: Puppet module for Bugdaystats
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-bup
+- project: opendev/puppet-bup
   use-storyboard: true
   description: Puppet module to add bup functionality
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-cgit
+- project: opendev/puppet-cgit
   use-storyboard: true
   description: Puppet module to manage cgit
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ciwatch
+- project: opendev/puppet-ciwatch
   use-storyboard: true
   description: Puppet module to manage CI Watch monitoring dashboard
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-dashboard
+- project: opendev/puppet-dashboard
   description: RETIRED, Puppet module to manage dashboard
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-diskimage_builder
+- project: opendev/puppet-diskimage_builder
   use-storyboard: true
   groups:
     - openstack-ci
@@ -397,180 +397,180 @@
 - project: openstack-infra/puppet-docker_registry
   description: RETIRED, Puppet module to setup standalone docker registry
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-drupal
+- project: opendev/puppet-drupal
   use-storyboard: true
   description: Puppet module for groups drupal portal
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-elasticsearch
+- project: opendev/puppet-elasticsearch
   use-storyboard: true
   description: Puppet module for elasticsearch
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-elastic_recheck
+- project: opendev/puppet-elastic_recheck
   use-storyboard: true
   description: Puppet module for elastic-recheck
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ethercalc
+- project: opendev/puppet-ethercalc
   use-storyboard: true
   description: Puppet module for Ethercalc
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-etherpad_lite
+- project: opendev/puppet-etherpad_lite
   use-storyboard: true
   description: Puppet module for Etherpad Lite
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-exim
+- project: opendev/puppet-exim
   use-storyboard: true
   description: Puppet module for Exim
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-featuretracker
+- project: opendev/puppet-featuretracker
   description: RETIRED, Puppet module to deploy featuretracker
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-germqtt
+- project: opendev/puppet-germqtt
   description: Puppet module for germqtt
   use-storyboard: true
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-gerrit
+- project: opendev/puppet-gerrit
   use-storyboard: true
   description: Puppet module for Gerrit
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-gerritbot
+- project: opendev/puppet-gerritbot
   use-storyboard: true
   description: Puppet module for GerritBot
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-github
+- project: opendev/puppet-github
   use-storyboard: true
   description: Puppet module to add github functionality
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-grafyaml
+- project: opendev/puppet-grafyaml
   use-storyboard: true
   description: Puppet module for Graphite
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-graphite
+- project: opendev/puppet-graphite
   use-storyboard: true
   description: Puppet module for Graphite
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-haveged
+- project: opendev/puppet-haveged
   use-storyboard: true
   description: Puppet module for Haveged
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-hound
+- project: opendev/puppet-hound
   use-storyboard: true
   description: Puppet module for Hound
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-httpd
+- project: opendev/puppet-httpd
   use-storyboard: true
   description: Puppet modules for deploying Apache in OpenStack infrastructure
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-infra-cookiecutter
+- project: opendev/puppet-infra-cookiecutter
   use-storyboard: true
   description: Cookiecutter template for compliant OpenStack-infra puppet-modules
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-infracloud
+- project: opendev/puppet-infracloud
   use-storyboard: true
   description: Puppet module for deploying the Infra Cloud
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ipsilon
+- project: opendev/puppet-ipsilon
   use-storyboard: true
   description: Puppet module for Ipsilon
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-iptables
+- project: opendev/puppet-iptables
   use-storyboard: true
   description: Puppet module for iptables
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-jeepyb
+- project: opendev/puppet-jeepyb
   use-storyboard: true
   description: Puppet module to manage jeepyb
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-jenkins
+- project: opendev/puppet-jenkins
   use-storyboard: true
   description: Puppet module to add jenkins functionality
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-kerberos
+- project: opendev/puppet-kerberos
   use-storyboard: true
   description: Puppet module for Kerberos
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-kibana
+- project: opendev/puppet-kibana
   use-storyboard: true
   description: Puppet module to add kibana functionality
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-lodgeit
+- project: opendev/puppet-lodgeit
   use-storyboard: true
   description: Puppet module to manage LodgeIt
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-logrotate
+- project: opendev/puppet-logrotate
   use-storyboard: true
   description: Puppet module to manage logrotate
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-logstash
+- project: opendev/puppet-logstash
   use-storyboard: true
   description: Puppet module for Logstash
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-log_processor
+- project: opendev/puppet-log_processor
   use-storyboard: true
   description: Puppet module to manage log processor
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-lpmqtt
+- project: opendev/puppet-lpmqtt
   use-storyboard: true
   description: Puppet module for lpmqtt
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-mailman
+- project: opendev/puppet-mailman
   use-storyboard: true
   description: Puppet module for mailman
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-mediawiki
+- project: opendev/puppet-mediawiki
   use-storyboard: true
   description: Puppet module for MediaWiki
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-meetbot
+- project: opendev/puppet-meetbot
   use-storyboard: true
   description: Puppet module for MeetBot
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-mosquitto
+- project: opendev/puppet-mosquitto
   description: Puppet module for mosquitto
   use-storyboard: true
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-mqtt_statsd
+- project: opendev/puppet-mqtt_statsd
   description: Puppet module for mqtt_statsd
   use-storyboard: true
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-mysql_backup
+- project: opendev/puppet-mysql_backup
   use-storyboard: true
   description: Puppet module for mysql backup
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-nodepool
+- project: opendev/puppet-nodepool
   use-storyboard: true
   description: Puppet module for Nodepool
   groups:
@@ -578,270 +578,270 @@
 - project: openstack-infra/puppet-odsreg
   description: RETIRED, Puppet module for odsreg
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-openafs
+- project: opendev/puppet-openafs
   use-storyboard: true
   description: Puppet module for OpenAFS
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-openstackci
+- project: opendev/puppet-openstackci
   use-storyboard: true
   description: Puppet module to deploy an OpenStack ci system
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-openstackid
+- project: opendev/puppet-openstackid
   use-storyboard: true
   description: Puppet module to deploy openstackid
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-openstack_health
+- project: opendev/puppet-openstack_health
   use-storyboard: true
   description: Puppet module to deploy OpenStack Health
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-openstack_infra_spec_helper
+- project: opendev/puppet-openstack_infra_spec_helper
   use-storyboard: true
   description: Library gem used by Infra puppet modules
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-os_client_config
+- project: opendev/puppet-os_client_config
   use-storyboard: true
   description: Puppet module for os-client-config
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-packagekit
+- project: opendev/puppet-packagekit
   use-storyboard: true
   description: Puppet module for PackageKit
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-pgsql_backup
+- project: opendev/puppet-pgsql_backup
   use-storyboard: true
   description: Puppet module for postgresql backup
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-phabricator
+- project: opendev/puppet-phabricator
   use-storyboard: true
   description: Puppet module for phabricator
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-pip
+- project: opendev/puppet-pip
   use-storyboard: true
   description: Puppet module to add pip functionality
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-planet
+- project: opendev/puppet-planet
   use-storyboard: true
   description: Puppet module for Planet
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-project_config
+- project: opendev/puppet-project_config
   use-storyboard: true
   description: Puppet module for Project_config
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ptgbot
+- project: opendev/puppet-ptgbot
   use-storyboard: true
   description: Puppet module for the PTG IRC Bot
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-puppet
+- project: opendev/puppet-puppet
   use-storyboard: true
   description: Module to install and configure puppet services.
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-redis
+- project: opendev/puppet-redis
   use-storyboard: true
   description: Puppet module to deploy redis
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-refstack
+- project: opendev/puppet-refstack
   use-storyboard: true
   description: Puppet module for refstack.
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-releasestatus
+- project: opendev/puppet-releasestatus
   description: RETIRED, Puppet module to manage releasestatus
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-reviewday
+- project: opendev/puppet-reviewday
   use-storyboard: true
   description: Puppet module to manage reviewday
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-simpleproxy
+- project: opendev/puppet-simpleproxy
   use-storyboard: true
   description: Puppet module for simpleproxy
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-snmpd
+- project: opendev/puppet-snmpd
   use-storyboard: true
   description: Puppet module to manage snmpd
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ssh
+- project: opendev/puppet-ssh
   use-storyboard: true
   description: Puppet module to manage ssh
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ssl_cert_check
+- project: opendev/puppet-ssl_cert_check
   use-storyboard: true
   description: Puppet module to manage the SSL certificate check
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-stackalytics
+- project: opendev/puppet-stackalytics
   description: RETIRED, Puppet module to deploy stackalytics
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-statusbot
+- project: opendev/puppet-statusbot
   use-storyboard: true
   description: Puppet module to deploy statusbot
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-storyboard
+- project: opendev/puppet-storyboard
   use-storyboard: true
   description: Puppet module to deploy storyboard
   groups:
     - openstack-ci
     - storyboard
-- project: openstack-infra/puppet-subunit2sql
+- project: opendev/puppet-subunit2sql
   use-storyboard: true
   description: Puppet module for Subunit2sql
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-sudoers
+- project: opendev/puppet-sudoers
   use-storyboard: true
   description: Puppet module to deploy sudoers configs
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-tmpreaper
+- project: opendev/puppet-tmpreaper
   use-storyboard: true
   description: Puppet module to deploy the tmpreaper
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-translation_checksite
+- project: opendev/puppet-translation_checksite
   use-storyboard: true
   description: Puppet module to deploy translation check website
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-ulimit
+- project: opendev/puppet-ulimit
   use-storyboard: true
   description: Puppet module to set up ulimits
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-unattended_upgrades
+- project: opendev/puppet-unattended_upgrades
   use-storyboard: true
   description: Puppet module to deploy unattended-upgrades
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-unbound
+- project: opendev/puppet-unbound
   use-storyboard: true
   description: Puppet module to manage unbound
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-user
+- project: opendev/puppet-user
   use-storyboard: true
   description: Puppet module to provide intelligent user management
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-vcsrepo
+- project: opendev/puppet-vcsrepo
   use-storyboard: true
   groups:
     - openstack-ci
   description: Puppet module to manage VCS repositories
-- project: openstack-infra/puppet-vinz
+- project: opendev/puppet-vinz
   description: RETIRED, Puppet module to deploy vinz
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/puppet-yum
+- project: opendev/puppet-yum
   use-storyboard: true
   groups:
     - openstack-ci
   description: Puppet module to manage yum
-- project: openstack-infra/puppet-zanata
+- project: opendev/puppet-zanata
   use-storyboard: true
   description: Puppet module to deploy Zanata
   groups:
     - openstack-ci
-- project: openstack-infra/puppet-zuul
+- project: opendev/puppet-zuul
   use-storyboard: true
   description: Puppet module to install and configure zuul
   groups:
     - openstack-ci
     - zuul
-- project: openstack-infra/pynotedb
+- project: opendev/pynotedb
   use-storyboard: true
   description: Python parser for notedb
-- project: openstack-infra/pypi-mirror
+- project: opendev/pypi-mirror
   description: RETIRED, PyPI mirror builder
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/python-storyboardclient
+- project: opendev/python-storyboardclient
   use-storyboard: true
   description: Python Client library for StoryBoard
   groups:
     - storyboard
-- project: openstack-infra/release-tools
+- project: openstack/release-tools
   description: RETIRED, OpenStack Release Tools
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/releasestatus
+- project: openstack/releasestatus
   description: RETIRED, OpenStack Release Status page generator
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/requestsexceptions
+- project: openstack/requestsexceptions
   use-storyboard: true
   description: Find exception classes in the requests library
   acl-config: /home/gerrit2/acls/openstack/openstacksdk.config
   groups:
     - openstacksdk
-- project: openstack-infra/reviewday
+- project: openstack/reviewday
   use-storyboard: true
   groups:
     - openstack-ci
   description: OpenStack code review report generator
-- project: openstack-infra/reviewstats
+- project: openstack/reviewstats
   use-storyboard: true
   description: Scripts for generating OpenStack development community statistics
-- project: openstack-infra/shade
+- project: openstack/shade
   description: Client library for OpenStack containing Infra business logic
   acl-config: /home/gerrit2/acls/openstack/openstacksdk.config
   use-storyboard: true
   groups:
     - openstacksdk
-- project: openstack-infra/statusbot
+- project: opendev/statusbot
   use-storyboard: true
   groups:
     - openstack-ci
   description: Infrastructure status update IRC bot
-- project: openstack-infra/storyboard
+- project: opendev/storyboard
   use-storyboard: true
   description: OpenStack Task Tracking API
   groups:
     - storyboard
   options:
     - translate
-- project: openstack-infra/storyboard-webclient
+- project: opendev/storyboard-webclient
   use-storyboard: true
   description: OpenStack Task Tracking Browser Client
   groups:
     - storyboard
-- project: openstack-infra/subunit2sql
+- project: opendev/subunit2sql
   use-storyboard: true
   description: Tooling for converting subunit streams into a SQL DB
-- project: openstack-infra/system-config
+- project: opendev/system-config
   use-storyboard: true
   groups:
     - openstack-ci
   description: System configuration for OpenStack Infrastructure
-- project: openstack-infra/tripleo-ci
+- project: openstack/tripleo-ci
   use-storyboard: true
   description: CI for the TripleO project
-- project: openstack-infra/trystack-site
+- project: x/trystack-site
   description: RETIRED, Contents of trystack website
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/vinz
+- project: x/vinz
   description: RETIRED, Standalone UI replacement for Gerrit API
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack-infra/vinz-webclient
   description: RETIRED, Standalone UI replacment for Gerrit
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/yaml2ical
+- project: opendev/yaml2ical
   use-storyboard: true
   description: Generate iCal files from a YAML description of meetings
-- project: openstack-infra/zmq-event-publisher
+- project: x/zmq-event-publisher
   use-storyboard: true
   groups:
     - openstack-ci
@@ -857,8 +857,8 @@
     - openstack-ci
     - zuul
   description: Zone file for zuul-ci.org
-  acl-config: /home/gerrit2/acls/openstack-infra/zuul.config
-- project: openstack-infra/zuul
+  acl-config: /home/gerrit2/acls/zuul/zuul.config
+- project: zuul/zuul
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -866,7 +866,7 @@
   groups:
     - zuul
   description: The Gatekeeper, or a project gating system
-- project: openstack-infra/zuul-base-jobs
+- project: zuul/zuul-base-jobs
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -874,7 +874,7 @@
   groups:
     - zuul
   description: Zuul base job definition
-- project: openstack-infra/zuul-jobs
+- project: zuul/zuul-jobs
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -883,19 +883,19 @@
     - openstack-ci
     - zuul
   description: Ansible job definitions for Zuul
-- project: openstack-infra/zuul-packaging
+- project: openstack/zuul-packaging
   description: RETIRED, Zuul packaging
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/zuul-preview
+- project: zuul/zuul-preview
   description: A container image for a web-site preview proxy for Zuul
-  acl-config: /home/gerrit2/acls/openstack-infra/zuul.config
+  acl-config: /home/gerrit2/acls/zuul/zuul.config
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
     path: zuul-preview
   groups:
     - zuul
-- project: openstack-infra/zuul-sphinx
+- project: zuul/zuul-sphinx
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -903,7 +903,7 @@
   groups:
     - zuul
   description: Sphinx extension for Zuul jobs
-- project: openstack-infra/zuul-website
+- project: zuul/zuul-website
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -911,8 +911,8 @@
   groups:
     - zuul
   description: The contents of the Zuul website
-- project: openstack-infra/zuul-website-media
-  acl-config: /home/gerrit2/acls/openstack-infra/zuul-website.config
+- project: zuul/zuul-website-media
+  acl-config: /home/gerrit2/acls/zuul/zuul-website.config
   use-storyboard: true
   cgit-alias:
     site: git.zuul-ci.org
@@ -933,11 +933,11 @@
   groups:
     - adjutant
   acl-config: /home/gerrit2/acls/openstack/adjutant.config
-- project: openstack/aeromancer
+- project: x/aeromancer
   description: OpenStack Source Explorer
-- project: openstack/ailuropoda
+- project: x/ailuropoda
   description: The sad panda API
-- project: openstack/airship-armada
+- project: airship/armada
   description: An orchestrator for managing a collection of Kubernetes Helm charts.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -946,7 +946,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-armada
-- project: openstack/airship-berth
+- project: airship/berth
   description: A minimalist VM runner for Kubernetes using Helm.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -955,7 +955,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-berth
-- project: openstack/airship-deckhand
+- project: airship/deckhand
   description: A configuration management service with support for secrets.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -964,7 +964,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-deckhand
-- project: openstack/airship-divingbell
+- project: airship/divingbell
   description: A lightweight solution for configuration of baremetal nodes.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -973,7 +973,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-divingbell
-- project: openstack/airship-drydock
+- project: airship/drydock
   description: A declarative host provisioning system.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -982,7 +982,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-drydock
-- project: openstack/airship-governance
+- project: airship/governance
   description: Airship governance documentation
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -991,7 +991,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-governance
-- project: openstack/airship-in-a-bottle
+- project: airship/in-a-bottle
   description: Integrated deployment configuration and documentation.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1000,7 +1000,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-in-a-bottle
-- project: openstack/airship-maas
+- project: airship/maas
   description: Kubernetes deployment artifacts for Canonical's MaaS.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1009,7 +1009,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-maas
-- project: openstack/airship-pegleg
+- project: airship/pegleg
   description: A configuration organization tool.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1018,7 +1018,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-pegleg
-- project: openstack/airship-promenade
+- project: airship/promenade
   description: A declarative framework for resilient Kubernetes deployment.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1027,7 +1027,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-promenade
-- project: openstack/airship-shipyard
+- project: airship/shipyard
   description: A cluster lifecycle orchestrator for Airship.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1036,7 +1036,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-shipyard
-- project: openstack/airship-specs
+- project: airship/specs
   description: Specs for the Airship projects
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1045,7 +1045,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-specs
-- project: openstack/airship-spyglass
+- project: airship/spyglass
   description: Configuration extraction tool for Airship
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1054,7 +1054,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-spyglass
-- project: openstack/airship-tempest-plugin
+- project: airship/tempest-plugin
   description: Tempest plugin for validation of Airship components.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1063,7 +1063,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-tempest-plugin
-- project: openstack/airship-treasuremap
+- project: airship/treasuremap
   description: Reference Airship manifests, CICD, and reference architecture.
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1072,7 +1072,7 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-treasuremap
-- project: openstack/airship-utils
+- project: airship/utils
   description: Collection of common tools for the Airship projects
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/airship.config
@@ -1081,9 +1081,9 @@
   cgit-alias:
     site: git.airshipit.org
     path: airship-utils
-- project: openstack/alexandria
+- project: x/alexandria
   description: Inventory as a service with CMDB support
-- project: openstack/almanach
+- project: x/almanach
   description: Record the utilization of OpenStack resources for each tenant
 - project: openstack/anchor
   description: RETIRED - An Ephemeral PKI system that can act as a trust anchor
@@ -1100,28 +1100,28 @@
     - openstack-ansible
   docimpact-group: openstack-ansible
   acl-config: /home/gerrit2/acls/openstack/openstack-ansible.config
-- project: openstack/ansible-role-ansible
+- project: windmill/ansible-role-ansible
   description: Ansible role to manage Ansible
-- project: openstack/ansible-role-ara
+- project: recordsansible/ansible-role-ara
   use-storyboard: true
   description: Ansible role to install and set up ARA
 - project: openstack/ansible-role-atos-hsm
   description: Ansible role to manage ATOS Hardware Security Module (HSM) client
     software
-- project: openstack/ansible-role-bindep
+- project: x/ansible-role-bindep
   description: Ansible role to manage bindep
-- project: openstack/ansible-role-borgbackup
+- project: windmill/ansible-role-borgbackup
   description: Ansible role to manage borgbackup
-- project: openstack/ansible-role-borgmatic
+- project: windmill/ansible-role-borgmatic
   description: Ansible role to manage borgmatic
-- project: openstack/ansible-role-carbon
+- project: windmill/ansible-role-carbon
   description: Ansible role to manage graphite-project/carbon
 - project: openstack/ansible-role-chrony
   description: Ansible role to manage chrony
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
   groups:
     - tripleo
-- project: openstack/ansible-role-cloud-launcher
+- project: x/ansible-role-cloud-launcher
   description: Ansible role to deploy multiple clouds resources
 - project: openstack/ansible-role-collect-logs
   description: An Ansible role for aggregating logs from different nodes.
@@ -1132,19 +1132,19 @@
   description: Ansible role to deploy a container registry
   groups:
     - tripleo
-- project: openstack/ansible-role-diskimage-builder
+- project: windmill/ansible-role-diskimage-builder
   description: Ansible role to manage diskimage-builder
-- project: openstack/ansible-role-fedmsg
+- project: x/ansible-role-fedmsg
   description: Ansible role to manage Fedmsg
-- project: openstack/ansible-role-gearman
+- project: windmill/ansible-role-gear
   description: Ansible role to manage Gearman
-- project: openstack/ansible-role-grafyaml
+- project: windmill/ansible-role-grafyaml
   description: Ansible role to manage Grafyaml
-- project: openstack/ansible-role-jenkins
+- project: x/ansible-role-jenkins
   description: Ansible role to manage Jenkins
-- project: openstack/ansible-role-jenkins-job-builder
+- project: x/ansible-role-jenkins-job-builder
   description: Ansible role to manage Jenkins Job Builder
-- project: openstack/ansible-role-jenkins-plugins
+- project: x/ansible-role-jenkins-plugins
   description: Ansible role to manage Jenkins plugins
 - project: openstack/ansible-role-k8s-cinder
   description: Ansible role to deploy Cinder on Kubernetes
@@ -1181,18 +1181,18 @@
   acl-config: /home/gerrit2/acls/openstack/tripleo.config
   groups:
     - tripleo
-- project: openstack/ansible-role-logrotate
+- project: windmill/ansible-role-logrotate
   description: Ansible role to manage logrotate
-- project: openstack/ansible-role-nginx
+- project: windmill/ansible-role-nginx
   description: Ansible role to manage Nginx
-- project: openstack/ansible-role-nodepool
+- project: windmill/ansible-role-nodepool
   description: Ansible role to manage Nodepool
 - project: openstack/ansible-role-openstack-operations
   description: Ansible role to perform common tasks to manage OpenStack clouds
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
   groups:
     - tripleo
-- project: openstack/ansible-role-openstacksdk
+- project: windmill/ansible-role-openstacksdk
   description: Ansible role to manage OpenStackSDK
 - project: openstack/ansible-role-python_venv_build
   description: Ansible role to manage the building of python venvs
@@ -1206,13 +1206,13 @@
   docimpact-group: openstack-ansible
 - project: openstack/ansible-role-redhat-subscription
   description: Ansible role to configure Red Hat Subscription Management
-- project: openstack/ansible-role-shade
+- project: x/ansible-role-shade
   description: Ansible role to manage Shade
-- project: openstack/ansible-role-ssh
+- project: windmill/ansible-role-ssh
   description: Ansible role to manage SSH
-- project: openstack/ansible-role-statsd
+- project: windmill/ansible-role-statsd
   description: Ansible role to manage statsd
-- project: openstack/ansible-role-sudoers
+- project: windmill/ansible-role-sudoers
   description: Ansible role to manage Sudoers
 - project: openstack/ansible-role-systemd_mount
   description: Ansible role to manage systemd mount points
@@ -1252,7 +1252,7 @@
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
   groups:
     - tripleo
-- project: openstack/ansible-role-tripleo-congress
+- project: x/ansible-role-tripleo-congress
   description: TripleO related Ansible role for Congress
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
   groups:
@@ -1407,15 +1407,15 @@
   acl-config: /home/gerrit2/acls/openstack/tripleo-ansible.config
   groups:
     - tripleo
-- project: openstack/ansible-role-virtualenv
+- project: windmill/ansible-role-virtualenv
   description: Ansible role to manage Virtualenv
-- project: openstack/ansible-role-whisper
+- project: windmill/ansible-role-whisper
   description: Ansible role to manage graphite-project/whisper
-- project: openstack/ansible-role-zookeeper
+- project: windmill/ansible-role-zookeeper
   description: Ansible role to manage Zookeeper
-- project: openstack/ansible-role-zuul
+- project: windmill/ansible-role-zuul
   description: Ansible role to manage Zuul
-- project: openstack/anvil
+- project: x/anvil
   description: RETIRED, A set of python scripts and utilities to forge raw OpenStack
     into a productive tool!
   acl-config: /home/gerrit2/acls/openstack/retired.config
@@ -1435,13 +1435,13 @@
   options:
     - translate
   description: OpenStack API site
-- project: openstack/apmec
+- project: x/apmec
   description: Edge orchestration service
-- project: openstack/apmec-horizon
+- project: x/apmec-horizon
   description: Horizon UI for Edge Orchestration (Apmec)
   groups:
     - apmec
-  acl-config: /home/gerrit2/acls/openstack/apmec.config
+  acl-config: /home/gerrit2/acls/x/apmec.config
 - project: openstack/app-catalog
   description: RETIRED, Application catalog for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
@@ -1451,34 +1451,34 @@
 - project: openstack/app-catalog-ui
   description: RETIRED, UI component for application catalog
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/ara
+- project: recordsansible/ara
   use-storyboard: true
   groups:
     - ara
   description: ARA records Ansible Playbook runs and provides intuitive interfaces
     to browse them
-- project: openstack/ara-clients
+- project: recordsansible/ara-clients
   description: RETIRED, this project was merged into a single ara repository
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/ara-infra
+- project: recordsansible/ara-infra
   use-storyboard: true
   groups:
     - ara
   description: Common integration and infrastructure code for the different ARA
     projects
-  acl-config: /home/gerrit2/acls/openstack/ara.config
-- project: openstack/ara-plugins
+  acl-config: /home/gerrit2/acls/recordsansible/ara.config
+- project: recordsansible/ara-plugins
   description: RETIRED, this project was merged into a single ara repository
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/ara-server
+- project: recordsansible/ara-server
   description: RETIRED, this project was merged into a single ara repository
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/ara-web
+- project: recordsansible/ara-web
   use-storyboard: true
   groups:
     - ara
   description: Web application to browse data provided by ARA - Ansible Run Analysis
-  acl-config: /home/gerrit2/acls/openstack/ara.config
+  acl-config: /home/gerrit2/acls/recordsansible/ara.config
 - project: openstack/arch-design
   description: OpenStack Architecture Design Guide
   acl-config: /home/gerrit2/acls/openstack/operations-guide.config
@@ -1511,9 +1511,9 @@
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, Python AST-based static analyzer from OpenStack Security
     Group
-- project: openstack/bansho
+- project: x/bansho
   description: Web interface for Surveil
-  acl-config: /home/gerrit2/acls/openstack/surveil.config
+  acl-config: /home/gerrit2/acls/x/surveil.config
 - project: openstack/barbican
   use-storyboard: true
   description: Barbican is a ReST API designed for the secure storage, provisioning
@@ -1533,23 +1533,23 @@
   acl-config: /home/gerrit2/acls/openstack/barbican.config
   groups:
     - barbican
-- project: openstack/bareon
+- project: x/bareon
   description: Flexible and easy to use operating system installation tool.
-- project: openstack/bareon-allocator
+- project: x/bareon-allocator
   description: Dynamic allocation system for Bareon.
-  acl-config: /home/gerrit2/acls/openstack/bareon.config
-- project: openstack/bareon-api
+  acl-config: /home/gerrit2/acls/x/bareon.config
+- project: x/bareon-api
   description: REST API interface for Bareon, flexible and easy to use operating
     system installation tool.
-  acl-config: /home/gerrit2/acls/openstack/bareon.config
-- project: openstack/bareon-image-elements
+  acl-config: /home/gerrit2/acls/x/bareon.config
+- project: x/bareon-image-elements
   description: Disk image elements for Bareon
-  acl-config: /home/gerrit2/acls/openstack/bareon.config
-- project: openstack/bareon-ironic
+  acl-config: /home/gerrit2/acls/x/bareon.config
+- project: x/bareon-ironic
   description: Bareon-based driver for Ironic
-- project: openstack/bareon-specs
+- project: x/bareon-specs
   description: Specs for bareon project
-  acl-config: /home/gerrit2/acls/openstack/bareon.config
+  acl-config: /home/gerrit2/acls/x/bareon.config
   groups:
     - bareon
 - project: openstack/bifrost
@@ -1557,7 +1557,7 @@
   use-storyboard: true
   groups:
     - ironic
-- project: openstack/bilean
+- project: x/bilean
   description: Billing service for OpenStack
 - project: openstack/blazar
   description: Reservation Service for OpenStack
@@ -1579,18 +1579,18 @@
   groups:
     - blazar
   acl-config: /home/gerrit2/acls/openstack/blazar.config
-- project: openstack/boartty
+- project: ttygroup/boartty
   description: Console interface to Storyboard
   use-storyboard: true
-- project: openstack/broadview-collector
+- project: x/broadview-collector
   description: broadview-collector is a plugin-based service that collects and publishes
     network underlay data to services such as Monasca.
-- project: openstack/broadview-lib
+- project: x/broadview-lib
   description: broadview-lib provides an API for interaction with Broadcom BroadView
     agents.
-- project: openstack/broadview-ui
+- project: x/broadview-ui
   description: broadview-ui is a horizon panel that is used to configure broadview-collector.
-- project: openstack/browbeat
+- project: x/browbeat
   description: Performance monitoring and testing of OpenStack
   groups:
     - openstack-browbeat
@@ -1601,7 +1601,7 @@
   description: Generic Key Manager interface UI plugin for Horizon
   groups:
     - barbican
-- project: openstack/cathead
+- project: x/cathead
   description: Certificate monitoring service
 - project: openstack/ceilometer
   description: OpenStack Telemetry (Ceilometer)
@@ -1609,20 +1609,20 @@
     - translate
 - project: openstack/ceilometer-powervm
   description: PowerVM compute agent plugins for OpenStack Ceilometer
-- project: openstack/ceilometer-zvm
+- project: x/ceilometer-zvm
   description: zVM compute agent plugins for OpenStack Ceilometer
-  acl-config: /home/gerrit2/acls/openstack/nova-zvm-virt-driver.config
+  acl-config: /home/gerrit2/acls/x/nova-zvm-virt-driver.config
 - project: openstack/ceilometermiddleware
   description: OpenStack Telemetry (Ceilometer) Middleware
-- project: openstack/cerberus
+- project: x/cerberus
   description: RETIRED, Cerberus security component
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/cerberus-dashboard
+- project: x/cerberus-dashboard
   description: RETIRED, Cerberus Horizon Plugin
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/certbot-dns-openstack
+- project: x/certbot-dns-openstack
   description: OpenStack DNS Authenticator plugin for Certbot
-- project: openstack/charm-6wind-virtual-accelerator
+- project: x/charm-6wind-virtual-accelerator
   description: Juju Charm - 6WIND Virtual Accelerator
   options:
     - delay-release
@@ -1755,7 +1755,7 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
-- project: openstack/charm-interface-barbican-hsm
+- project: x/charm-interface-barbican-hsm
   description: Charm Interface - Barbican HSM plugin
   acl-config: /home/gerrit2/acls/openstack/charm.config
 - project: openstack/charm-interface-barbican-secrets
@@ -1931,7 +1931,7 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
-- project: openstack/charm-neutron-api-plumgrid
+- project: x/charm-neutron-api-plumgrid
   description: Juju Charm - Neutron Api - PLUMgrid
   acl-config: /home/gerrit2/acls/openstack/charm-plumgrid.config
   options:
@@ -2011,17 +2011,17 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
-- project: openstack/charm-plumgrid-director
+- project: x/charm-plumgrid-director
   description: Juju Charm - PLUMgrid Director
   acl-config: /home/gerrit2/acls/openstack/charm-plumgrid.config
   options:
     - delay-release
-- project: openstack/charm-plumgrid-edge
+- project: x/charm-plumgrid-edge
   description: Juju Charm - PLUMgrid Edge
   acl-config: /home/gerrit2/acls/openstack/charm-plumgrid.config
   options:
     - delay-release
-- project: openstack/charm-plumgrid-gateway
+- project: x/charm-plumgrid-gateway
   description: Juju Charm - PLUMgrid Gateway
   acl-config: /home/gerrit2/acls/openstack/charm-plumgrid.config
   options:
@@ -2054,7 +2054,7 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
-- project: openstack/charm-vault
+- project: x/charm-vault
   description: Juju Charm - Vault secrets managment
   options:
     - delay-release
@@ -2064,13 +2064,13 @@
 - project: openstack/charms.openstack
   description: Helpers for writing layered+reactive OpenStack Charms
   acl-config: /home/gerrit2/acls/openstack/charm.config
-- project: openstack/ci-cd-pipeline-app-murano
+- project: x/ci-cd-pipeline-app-murano
   description: Collection of applications for CI-CD pipeline
 - project: openstack/cinder
   description: OpenStack Block Storage (Cinder)
   options:
     - translate
-- project: openstack/cinder-fusioncompute
+- project: x/cinder-fusioncompute
   description: Implementation of Cinder driver for Huawei Fusioncompute.
 - project: openstack/cinder-specs
   groups:
@@ -2084,23 +2084,23 @@
 - project: openstack/cinderlib
   description: Direct usage of Cinder Block Storage drivers without the services
   acl-config: /home/gerrit2/acls/openstack/cinder.config
-- project: openstack/cisco-ironic-contrib
+- project: x/cisco-ironic-contrib
   description: Package containing Cisco specific ironic work that doesn't fit into
     the core ironic tree.
-- project: openstack/cl-openstack-client
+- project: x/cl-openstack-client
   description: Common Lisp OpenStack client libraries
 - project: openstack/cliff
   description: Command Line Interface Formulation Framework
   use-storyboard: true
   groups:
     - openstackclient
-- project: openstack/cloud-init
+- project: x/cloud-init
   description: Cross-platform instance initialization
-- project: openstack/cloudbase-init
+- project: x/cloudbase-init
   description: Cross-platform instance initialization
-- project: openstack/cloudcafe
+- project: x/cloudcafe
   description: OpenStack based test automation framework. Based on OpenCAFE engine
-- project: openstack/clouddocs-maven-plugin
+- project: x/clouddocs-maven-plugin
   description: RETIRED, Maven plugin for DocBook conversion
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/cloudkitty
@@ -2128,46 +2128,46 @@
   groups:
     - cloudkitty
   use-storyboard: true
-- project: openstack/cloudpulse
+- project: x/cloudpulse
   description: A Health-Checking service for OpenStack deployments.
-- project: openstack/cloudroast
+- project: x/cloudroast
   description: Automated Test Case Repository for OpenStack. Based on CloudCAFE.
-- project: openstack/cloudv-ostf-adapter
+- project: x/cloudv-ostf-adapter
   description: RETIRED, Fuel-independent OSTF adapter for Cloud Validation
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/coats
+- project: x/coats
   description: Collection of scripts that improve OpenStack developer browsing experience
   use-storyboard: true
-- project: openstack/cognitive
+- project: x/cognitive
   description: Machine Learning as a Service
-- project: openstack/collectd-openstack-plugins
+- project: x/collectd-openstack-plugins
   description: A collection of collectd plugins to publish metrics and events to
     OpenStack services.
-- project: openstack/compass-adapters
+- project: x/compass-adapters
   groups:
     - compass
   description: Compass adapter related code and data (chef, cobbler, etc)
   acl-config: /home/gerrit2/acls/openstack/compass.config
-- project: openstack/compass-core
+- project: x/compass-core
   groups:
     - compass
   description: Automating Distributed System Deployment to Baremetal Resources
   acl-config: /home/gerrit2/acls/openstack/compass.config
-- project: openstack/compass-install
+- project: x/compass-install
   groups:
     - compass
   description: Installation of Compass in Different Formats
-- project: openstack/compass-specs
+- project: x/compass-specs
   groups:
     - compass
   description: Compass Specs and Design
   acl-config: /home/gerrit2/acls/openstack/compass.config
-- project: openstack/compass-web
+- project: x/compass-web
   groups:
     - compass
   description: A web-based UI consuming the Restful API service provided by Compass
   acl-config: /home/gerrit2/acls/openstack/compass.config
-- project: openstack/compute-hyperv
+- project: x/compute-hyperv
   description: Nova Hyper-V Compute Driver
 - project: openstack/congress
   description: Congress
@@ -2194,7 +2194,7 @@
   description: The general guide to contributing to OpenStack.
   options:
     - translate
-- project: openstack/conveyor
+- project: x/conveyor
   description: Clone and migrate OpenStack resources
 - project: openstack/cookbook-openstack-application-catalog
   groups:
@@ -2304,20 +2304,20 @@
   docimpact-group: openstack-chef
   description: Chef Cookbook - OpenStack client Resources
   acl-config: /home/gerrit2/acls/openstack/openstack-chef.config
-- project: openstack/coreos-image-builder
+- project: x/coreos-image-builder
   description: A framework for building CoreOS Ramdisk
   use-storyboard: true
   groups:
     - ironic
   acl-config: /home/gerrit2/acls/openstack/ironic.config
-- project: openstack/coupler
+- project: x/coupler
   description: Coupling Storage Service VM for OpenStack
 - project: openstack/coverage2sql
   description: Tooling for converting coverage data into a SQL DB
-- project: openstack/craton
+- project: x/craton
   description: RETIRED, Fleet management for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/craton-dashboard
+- project: x/craton-dashboard
   description: RETIRED, Craton Horizon plugin.
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/cue
@@ -2326,7 +2326,7 @@
 - project: openstack/cue-dashboard
   description: RETIRED, Horizon plugin for Cue.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/cursive
+- project: x/cursive
   description: Library for validation of digital signatures.
 - project: openstack/cyborg
   description: Acceleration Management
@@ -2339,9 +2339,9 @@
   use-storyboard: true
   groups:
     - cyborg
-- project: openstack/daisycloud-core
+- project: x/daisycloud-core
   description: The core API implementation for Daisycloud OpenStack installer.
-- project: openstack/dash-stack
+- project: x/dash-stack
   description: RETIRED, Cloud control/seller dashboard for providers, data centers
     and small IT businesses.
 - project: openstack/deb-alembic
@@ -2518,94 +2518,94 @@
 - project: openstack/deb-openstack-trove
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-apply-config
+- project: x/deb-os-apply-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-brick
+- project: x/deb-os-brick
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-client-config
+- project: x/deb-os-client-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-cloud-config
+- project: x/deb-os-cloud-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-collect-config
+- project: x/deb-os-collect-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-net-config
+- project: x/deb-os-net-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-refresh-config
+- project: x/deb-os-refresh-config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-testr
+- project: x/deb-os-testr
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-vif
+- project: x/deb-os-vif
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-os-win
+- project: x/deb-os-win
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.cache
+- project: x/deb-oslo.cache
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.concurrency
+- project: x/deb-oslo.concurrency
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.config
+- project: x/deb-oslo.config
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.context
+- project: x/deb-oslo.context
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.db
+- project: x/deb-oslo.db
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.i18n
+- project: x/deb-oslo.i18n
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.log
+- project: x/deb-oslo.log
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.messaging
+- project: x/deb-oslo.messaging
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.middleware
+- project: x/deb-oslo.middleware
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.policy
+- project: x/deb-oslo.policy
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.privsep
+- project: x/deb-oslo.privsep
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.reports
+- project: x/deb-oslo.reports
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.rootwrap
+- project: x/deb-oslo.rootwrap
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.serialization
+- project: x/deb-oslo.serialization
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.service
+- project: x/deb-oslo.service
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.utils
+- project: x/deb-oslo.utils
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.versionedobjects
+- project: x/deb-oslo.versionedobjects
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslo.vmware
+- project: x/deb-oslo.vmware
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
 - project: openstack/deb-oslosphinx
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-oslotest
+- project: x/deb-oslotest
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
 - project: openstack/deb-python-aioeventlet
@@ -3121,7 +3121,7 @@
 - project: openstack/deb-python-saharaclient
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-python-savannaclient
+- project: x/deb-python-savannaclient
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
 - project: openstack/deb-python-scciclient
@@ -3157,7 +3157,7 @@
 - project: openstack/deb-python-taskflow
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
-- project: openstack/deb-python-tempest-lib
+- project: x/deb-python-tempest-lib
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, further work has moved to Debian project infrastructure
 - project: openstack/deb-python-testtools
@@ -3382,7 +3382,7 @@
 - project: openstack/debtcollector
   description: A collection of python patterns that help you collect your technical
     debt in a non-destructive manner
-- project: openstack/delimiter
+- project: x/delimiter
   description: Quota Enforcement and Management Library
 - project: openstack/designate
   description: OpenStack DNS As A Service (Designate)
@@ -3395,7 +3395,7 @@
     - translate
   groups:
     - designate
-- project: openstack/designate-msdnsagent
+- project: x/designate-msdnsagent
   description: RETIRED, Agent for using Microsoft DNS Server with Designate
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/designate-specs
@@ -3407,50 +3407,50 @@
   docimpact-group: designate
   groups:
     - designate
-- project: openstack/development-proposals
+- project: x/development-proposals
   description: RETIRED, OpenStack Development Proposals Submitted to Product WG
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/devstack-plugin-additional-pkg-repos
+- project: x/devstack-plugin-additional-pkg-repos
   description: A DevStack plugin that allows inclusion of external package repositories
     for testing new (or indeed old) releases of system utiilities
 - project: openstack/devstack-plugin-amqp1
   description: DevStack plugin to configure AMQP1.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
-- project: openstack/devstack-plugin-bdd
+- project: x/devstack-plugin-bdd
   description: DevStack plugin to configure Cinder BlockDeviceDriver
 - project: openstack/devstack-plugin-ceph
   description: DevStack plugin to configure Ceph backend.
 - project: openstack/devstack-plugin-container
   description: DevStack plugin for installation of container engine
-- project: openstack/devstack-plugin-glusterfs
+- project: x/devstack-plugin-glusterfs
   description: DevStack plugin to configure GlusterFS backend.
-- project: openstack/devstack-plugin-hdfs
+- project: x/devstack-plugin-hdfs
   description: DevStack plugin to configure HDFS backend.
 - project: openstack/devstack-plugin-kafka
   description: DevStack plugin to configure Kafka.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
-- project: openstack/devstack-plugin-libvirt-qemu
+- project: x/devstack-plugin-libvirt-qemu
   description: Libvirt QEMU plugin
-- project: openstack/devstack-plugin-mariadb
+- project: x/devstack-plugin-mariadb
   description: A DevStack plugin that allows ubuntu users to use MariaDB flavor
     as the database backend
-- project: openstack/devstack-plugin-nfs
+- project: x/devstack-plugin-nfs
   description: DevStack plugin to configure NFS backend.
 - project: openstack/devstack-plugin-pika
   description: DevStack plugin to configure Pika RabbitMQ driver.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
-- project: openstack/devstack-plugin-sheepdog
+- project: x/devstack-plugin-sheepdog
   description: DevStack plugin to configure Sheepdog backend.
-- project: openstack/devstack-plugin-tar-installer
+- project: x/devstack-plugin-tar-installer
   description: DevStack plugin to install software from tar releases
-- project: openstack/devstack-plugin-vmax
+- project: x/devstack-plugin-vmax
   description: DevStack plugin to configure VMAX backend
 - project: openstack/devstack-plugin-zmq
   description: DevStack plugin to configure ZMQ.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
 - project: openstack/devstack-tools
   description: DevStack supporting tools in python
-  acl-config: /home/gerrit2/acls/openstack-dev/devstack.config
+  acl-config: /home/gerrit2/acls/openstack/devstack.config
   groups:
     - devstack
 - project: openstack/dib-utils
@@ -3458,11 +3458,11 @@
   acl-config: /home/gerrit2/acls/openstack/tripleo.config
 - project: openstack/diskimage-builder
   description: Image building tools for OpenStack
-- project: openstack/distil
+- project: x/distil
   description: Rating Service for OpenStack
-- project: openstack/distil-ui
+- project: x/distil-ui
   description: The UI component for Distil
-  acl-config: /home/gerrit2/acls/openstack/distil.config
+  acl-config: /home/gerrit2/acls/x/distil.config
 - project: openstack/django-openstack-auth-kerberos
   description: RETIRED, Kerberos support for django-openstack-auth
   acl-config: /home/gerrit2/acls/openstack/retired.config
@@ -3473,39 +3473,39 @@
     Identity backend.
   options:
     - translate
-- project: openstack/doc8
+- project: x/doc8
   description: Style checker for sphinx (or other) rst documentation.
-- project: openstack/docker-machine-openstack
+- project: x/docker-machine-openstack
   description: Standalone Docker Machine driver for OpenStack
 - project: openstack/docs-specs
   groups:
     - openstack-manuals
   description: OpenStack Documentation Specifications
-- project: openstack/downpour
+- project: x/downpour
   description: Tenant data transfer tool
   groups:
     - os-downpour
-- project: openstack/dox
+- project: x/dox
   description: Run tests in a docker container
 - project: openstack/dragonflow
   description: SDN based Distributed Virtual Router for OpenStack Neutron
-- project: openstack/drbd-devstack
+- project: x/drbd-devstack
   description: DevStack plugin to configure the DRBD backend.
-- project: openstack/driverlog
+- project: x/driverlog
   description: Vendor drivers for OpenStack
 - project: openstack/ec2-api
   description: AWS EC2 and VPC API support in standalone service for OpenStack.
-- project: openstack/ec2-driver
+- project: x/ec2-driver
   description: Compute driver that uses BOTO API to utilize EC2.
 - project: openstack/ec2api-tempest-plugin
   description: Tempest Plugin for ec2-api project
   groups:
     - ec2-api
   acl-config: /home/gerrit2/acls/openstack/ec2-api.config
-- project: openstack/edge-computing-group
+- project: osf/edge-computing-group
   description: General repository for the OSF Edge Computing Group
   use-storyboard: true
-- project: openstack/ekko
+- project: x/ekko
   description: Incremental block-based backup to object storage
 - project: openstack/election
   description: OpenStack Elections repository
@@ -3517,14 +3517,14 @@
   groups:
     - enterprise-wg
   use-storyboard: true
-- project: openstack/entropy
+- project: x/entropy
   description: A framework for Audit/Repair scripts for OpenStack
 - project: openstack/eslint-config-openstack
   description: JavaScript Style Guidelines for OpenStack.
-- project: openstack/evoque
+- project: x/evoque
   description: RETIRED, Ticket service for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/evoque-dashboard
+- project: x/evoque-dashboard
   description: RETIRED, The UI component for Evoque
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/faafo
@@ -3532,26 +3532,26 @@
 - project: openstack/fairy-slipper
   description: RETIRED, API documentation generator and builder for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/fenix
+- project: x/fenix
   description: OpenStack host maintenance and upgrade in interaction with application
     on top of it
   use-storyboard: true
   groups:
     - fenix
-- project: openstack/fixtures-git
+- project: x/fixtures-git
   description: A git fixture using the fixtures API for writing tests for tools
     that use git.
-  acl-config: /home/gerrit2/acls/openstack/git-upstream.config
-- project: openstack/flame
+  acl-config: /home/gerrit2/acls/x/git-upstream.config
+- project: x/flame
   description: Automatic Heat template generation
-- project: openstack/flare
+- project: x/flare
   description: Flare is a service for running and scheduling burstable task resources
   use-storyboard: true
-- project: openstack/four-opens
+- project: osf/four-opens
   description: A handbook on The Four Opens and how they are applied in the OpenStack
     community.
   use-storyboard: true
-- project: openstack/foxnut
+- project: x/foxnut
   description: A tool for infrastructure management under OpenStack
 - project: openstack/freezer
   description: OpenStack Swift incremental backup and restore automation tool for
@@ -3607,129 +3607,129 @@
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/fuel-ccp
+- project: x/fuel-ccp
   description: Fuel Containerized Control Plane (CCP) main project
-- project: openstack/fuel-ccp-ceph
+- project: x/fuel-ccp-ceph
   groups:
     - fuel-ccp
   description: Fuel CCP - Ceph deployment
-- project: openstack/fuel-ccp-ci-config
+- project: x/fuel-ccp-ci-config
   groups:
     - fuel-ccp
   description: Fuel CCP 3rd party CI config
-- project: openstack/fuel-ccp-cinder
+- project: x/fuel-ccp-cinder
   groups:
     - fuel-ccp
   description: Fuel CCP - Cinder deployment
-- project: openstack/fuel-ccp-debian-base
+- project: x/fuel-ccp-debian-base
   groups:
     - fuel-ccp
   description: Fuel CCP - base Debian image
-- project: openstack/fuel-ccp-designate
+- project: x/fuel-ccp-designate
   groups:
     - fuel-ccp
   description: Fuel CCP - Designate deployment
-- project: openstack/fuel-ccp-elasticsearch
+- project: x/fuel-ccp-elasticsearch
   groups:
     - fuel-ccp
   description: Fuel CCP - Elasticsearch deployment
-- project: openstack/fuel-ccp-entrypoint
+- project: x/fuel-ccp-entrypoint
   groups:
     - fuel-ccp
   description: Fuel CCP - container entrypoint script
-- project: openstack/fuel-ccp-etcd
+- project: x/fuel-ccp-etcd
   groups:
     - fuel-ccp
   description: Fuel CCP - Etcd deployment
-- project: openstack/fuel-ccp-galera
+- project: x/fuel-ccp-galera
   groups:
     - fuel-ccp
   description: Fuel CCP - Clustered database solution based on Galera
-- project: openstack/fuel-ccp-glance
+- project: x/fuel-ccp-glance
   groups:
     - fuel-ccp
   description: Fuel CCP - Glance deployment
-- project: openstack/fuel-ccp-grafana
+- project: x/fuel-ccp-grafana
   groups:
     - fuel-ccp
   description: Fuel CCP - Grafana deployment
-- project: openstack/fuel-ccp-heat
+- project: x/fuel-ccp-heat
   groups:
     - fuel-ccp
   description: Fuel CCP - Heat deployment
-- project: openstack/fuel-ccp-horizon
+- project: x/fuel-ccp-horizon
   groups:
     - fuel-ccp
   description: Fuel CCP - Horizon deployment
-- project: openstack/fuel-ccp-installer
+- project: x/fuel-ccp-installer
   groups:
     - fuel-ccp
   description: Fuel CCP - Installer sub-project
-- project: openstack/fuel-ccp-ironic
+- project: x/fuel-ccp-ironic
   groups:
     - fuel-ccp
   description: Fuel CCP - Ironic deployment
-- project: openstack/fuel-ccp-keystone
+- project: x/fuel-ccp-keystone
   groups:
     - fuel-ccp
   description: Fuel CCP - Keystone deployment
-- project: openstack/fuel-ccp-mariadb
+- project: x/fuel-ccp-mariadb
   groups:
     - fuel-ccp
   description: Fuel CCP - Mariadb deployment
-- project: openstack/fuel-ccp-memcached
+- project: x/fuel-ccp-memcached
   groups:
     - fuel-ccp
   description: Fuel CCP - Memcached deployment
-- project: openstack/fuel-ccp-murano
+- project: x/fuel-ccp-murano
   groups:
     - fuel-ccp
   description: Fuel CCP - Murano deployment
-- project: openstack/fuel-ccp-neutron
+- project: x/fuel-ccp-neutron
   groups:
     - fuel-ccp
   description: Fuel CCP - Neutron deployment
-- project: openstack/fuel-ccp-nginx
+- project: x/fuel-ccp-nginx
   groups:
     - fuel-ccp
   description: Fuel CCP - Nginx deployment
-- project: openstack/fuel-ccp-nova
+- project: x/fuel-ccp-nova
   groups:
     - fuel-ccp
   description: Fuel CCP - Nova deployment
-- project: openstack/fuel-ccp-openstack-base
+- project: x/fuel-ccp-openstack-base
   groups:
     - fuel-ccp
   description: Fuel CCP - base OpenStack image
-- project: openstack/fuel-ccp-rabbitmq
+- project: x/fuel-ccp-rabbitmq
   groups:
     - fuel-ccp
   description: Fuel CCP - Rabbitmq deployment
-- project: openstack/fuel-ccp-rally
+- project: x/fuel-ccp-rally
   groups:
     - fuel-ccp
   description: Fuel CCP - Rally deployment
-- project: openstack/fuel-ccp-sahara
+- project: x/fuel-ccp-sahara
   groups:
     - fuel-ccp
   description: Fuel CCP - Sahara deployment
-- project: openstack/fuel-ccp-searchlight
+- project: x/fuel-ccp-searchlight
   groups:
     - fuel-ccp
   description: Fuel CCP - Searchlight deployment
-- project: openstack/fuel-ccp-specs
+- project: x/fuel-ccp-specs
   groups:
     - fuel-ccp
   description: Fuel CCP Specs
-- project: openstack/fuel-ccp-stacklight
+- project: x/fuel-ccp-stacklight
   groups:
     - fuel-ccp
   description: Fuel CCP - Stacklight deployment
-- project: openstack/fuel-ccp-tests
+- project: x/fuel-ccp-tests
   groups:
     - fuel-ccp
   description: Fuel CCP - Tests sub-project
-- project: openstack/fuel-ccp-zmq
+- project: x/fuel-ccp-zmq
   groups:
     - fuel-ccp
   description: Fuel CCP - ZeroMQ deployment
@@ -3813,7 +3813,7 @@
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/fuel-noop-fixtures
+- project: x/fuel-noop-fixtures
   description: Fixtures for Fuel Library Noop tests framework
 - project: openstack/fuel-octane
   description: Tools to upgrade OpenStack cloud managed by the Fuel installer.
@@ -3829,54 +3829,54 @@
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/fuel-plugin-6wind-virtual-accelerator
+- project: x/fuel-plugin-6wind-virtual-accelerator
   groups:
     - fuel-plugins
   description: Fuel plugin for 6WIND Virtual Accelerator integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-astara
+- project: x/fuel-plugin-astara
   groups:
     - fuel-plugins
   description: Fuel plugin for Astara Network Service with MOS integration
   docimpact-group: fuel-plugins
-- project: openstack/fuel-plugin-availability-zones
+- project: x/fuel-plugin-availability-zones
   groups:
     - fuel-plugins
   description: Fuel plugin to manage availability zones
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-bgpvpn
+- project: x/fuel-plugin-bgpvpn
   groups:
     - fuel-plugins
   description: Fuel plugin to enable and configure networking-bgpvpn component
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-bigswitch
+- project: x/fuel-plugin-bigswitch
   groups:
     - fuel-plugins
   description: Fuel plugin for BigSwitch Neutron ML2 integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-block-device
+- project: x/fuel-plugin-block-device
   groups:
     - fuel-plugins
   description: Fuel plugin for Cinder Block Device Driver integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-calamari
+- project: x/fuel-plugin-calamari
   groups:
     - fuel-plugins
   description: Fuel plugin for Calamari integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-calico
+- project: x/fuel-plugin-calico
   groups:
     - fuel-plugins
   description: Calico provides Layer 3 Virtual Networking for Highly Scalable Data
@@ -3884,14 +3884,14 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-ceilometer-redis
+- project: x/fuel-plugin-ceilometer-redis
   groups:
     - fuel-plugins
   description: Fuel plugin to enable central agent HA and workload partitioning
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-ceph-multibackend
+- project: x/fuel-plugin-ceph-multibackend
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy configure separate Ceph pools for different
@@ -3899,258 +3899,258 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-ci
+- project: x/fuel-plugin-ci
   groups:
     - fuel-plugins
   description: Place to store data required to build up a CI for any Fuel plugin
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-cinder-gcs
+- project: x/fuel-plugin-cinder-gcs
   description: Fuel plugin which enables Google Cloud Storage Cinder backup deployment
   options:
     - delay-release
-- project: openstack/fuel-plugin-cinder-kaminario
+- project: x/fuel-plugin-cinder-kaminario
   description: Fuel plugin that enables to configure multiple Cinder backend support
     for Kaminario K2 All-Flash Array
   options:
     - delay-release
-- project: openstack/fuel-plugin-cinder-netapp
+- project: x/fuel-plugin-cinder-netapp
   description: Fuel plugin for Cinder and NetApp integration
   docimpact-group: fuel-plugin-cinder-netapp
   options:
     - delay-release
-- project: openstack/fuel-plugin-cisco-aci
+- project: x/fuel-plugin-cisco-aci
   groups:
     - fuel-plugins
   description: Fuel plugin to enable neutron to work with Cisco ACI/GBP
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-congress
+- project: x/fuel-plugin-congress
   groups:
     - fuel-plugins
   description: Fuel plugin for Congress integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-contrail
+- project: x/fuel-plugin-contrail
   groups:
     - fuel-plugins
   description: Fuel plugin to allow usage of Contrail SDN as a networking backend
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-datera-cinder
+- project: x/fuel-plugin-datera-cinder
   description: Fuel plugin which allows Cinder to use Datera EBS
   options:
     - delay-release
-- project: openstack/fuel-plugin-dbaas-trove
+- project: x/fuel-plugin-dbaas-trove
   groups:
     - fuel-plugins
   description: Fuel plugin which enables option to deploy Trove
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-debug
+- project: x/fuel-plugin-debug
   description: Fuel plugin which enables debug output for specific MOS service
   docimpact-group: fuel-plugins
   groups:
     - fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-designate
+- project: x/fuel-plugin-designate
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy OpenStack Designate on MOS controllers
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-database
+- project: x/fuel-plugin-detach-database
   description: Fuel plugin to detach database from controller role
   docimpact-group: fuel-plugins
   groups:
     - fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-haproxy
+- project: x/fuel-plugin-detach-haproxy
   groups:
     - fuel-plugins
   description: Fuel plugin to detach HAproxy from controller role
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-horizon
+- project: x/fuel-plugin-detach-horizon
   groups:
     - fuel-plugins
   description: Fuel plugin to detach Horizon from controller node
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-keystone
+- project: x/fuel-plugin-detach-keystone
   description: Fuel plugin to detach Keystone from controller role
   docimpact-group: fuel-plugins
   groups:
     - fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-netnode
+- project: x/fuel-plugin-detach-netnode
   groups:
     - fuel-plugins
   description: Fuel plugin to detach ML2 L3 functions from controller node
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-rabbitmq
+- project: x/fuel-plugin-detach-rabbitmq
   description: Fuel plugin to detach RabbitMQ from controller role
   docimpact-group: fuel-plugins
   groups:
     - fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-detach-swift
+- project: x/fuel-plugin-detach-swift
   groups:
     - fuel-plugins
   description: Fuel plugin to detach Swift from controller role
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-dns-updater
+- project: x/fuel-plugin-dns-updater
   groups:
     - fuel-plugins
   description: Fuel plugin to create auto-updated DNS configuration for Murano VMs
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-dynatrace
+- project: x/fuel-plugin-dynatrace
   description: Fuel plugin installs the Dynatrace OneAgent
   options:
     - delay-release
-- project: openstack/fuel-plugin-elasticsearch-kibana
+- project: x/fuel-plugin-elasticsearch-kibana
   groups:
     - lma-toolchain
   description: Integrate Elasticsearch and Kibana with Fuel
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-emailnotifyd
+- project: x/fuel-plugin-emailnotifyd
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy emailnotifyd on controller nodes
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-external-emc
+- project: x/fuel-plugin-external-emc
   groups:
     - fuel-plugins
   description: Fuel plugin for Cinder with EMC integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-external-glusterfs
+- project: x/fuel-plugin-external-glusterfs
   groups:
     - fuel-plugins
   description: Fuel plugin for external GlusterFS for Cinder
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-external-lb
+- project: x/fuel-plugin-external-lb
   groups:
     - fuel-plugins
   description: Fuel plugin to enable use of external LB instead of default VIPs
     and HAproxy
   docimpact-group: fuel-plugins
-- project: openstack/fuel-plugin-external-zabbix
+- project: x/fuel-plugin-external-zabbix
   groups:
     - fuel-plugins
   description: Fuel plugin for external Zabbix integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-fortinet
+- project: x/fuel-plugin-fortinet
   groups:
     - fuel-plugins
   description: Fuel plugin for fortigate ml2 plugin and fwaas plugin
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-glance-nfs
+- project: x/fuel-plugin-glance-nfs
   groups:
     - fuel-plugins
   description: Fuel plugin for nfs as storage backend for images (glance)
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-gluon
+- project: x/fuel-plugin-gluon
   groups:
     - python-gluon
     - fuel-plugins
   description: Integration project of OpenStack/gluon into Fuel
   docimpact-group: fuel-plugins
-- project: openstack/fuel-plugin-ha-fencing
+- project: x/fuel-plugin-ha-fencing
   groups:
     - fuel-plugins
   description: Fuel plugin for HA fencing for Pacemaker cluster
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-hedvig-cinder
+- project: x/fuel-plugin-hedvig-cinder
   groups:
     - fuel-plugins
   description: Fuel plugin for Hedvig Cinder storage backend integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-influxdb-grafana
+- project: x/fuel-plugin-influxdb-grafana
   groups:
     - lma-toolchain
   description: Fuel plugin to manage InfluxDB and Grafana
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-inkscope
+- project: x/fuel-plugin-inkscope
   groups:
     - fuel-plugins
   description: Fuel plugin for Inkscope integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-ironic
+- project: x/fuel-plugin-ironic
   groups:
     - fuel-plugins
   description: Fuel plugin for Ironic integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-kafka
+- project: x/fuel-plugin-kafka
   groups:
     - lma-toolchain
   description: Fuel plugin to deploy Kafka
-  acl-config: /home/gerrit2/acls/openstack/fuel-plugin-lma-collector.config
+  acl-config: /home/gerrit2/acls/x/fuel-plugin-lma-collector.config
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-ldap
+- project: x/fuel-plugin-ldap
   groups:
     - fuel-plugins
   description: Fuel plugin which allows to use LDAP as an authentication backend
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-ldap-slaves
+- project: x/fuel-plugin-ldap-slaves
   description: Fuel plugin that provides the functionality to use external LDAP
     directory as source for authentication on OpenStack nodes
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-lma-collector
+- project: x/fuel-plugin-lma-collector
   groups:
     - lma-toolchain
   description: Fuel plugin to collect Logging Monitoring and Alerting metrics
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-lma-infrastructure-alerting
+- project: x/fuel-plugin-lma-infrastructure-alerting
   groups:
     - lma-toolchain
   description: The LMA Infrastructure Alerting plugin installs necessary tools to
@@ -4158,25 +4158,25 @@
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-manila
+- project: x/fuel-plugin-manila
   description: Fuel plugin which enables OpenStack Manila with MOS controllers deployment
   options:
     - delay-release
-- project: openstack/fuel-plugin-mellanox
+- project: x/fuel-plugin-mellanox
   groups:
     - fuel-plugins
   description: Fuel plugin for Mellanox support
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-midonet
+- project: x/fuel-plugin-midonet
   groups:
     - fuel-plugins
   description: Fuel plugin for MidoNet SDN as a networking backend
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-mistral
+- project: x/fuel-plugin-mistral
   groups:
     - fuel-plugins
   description: Fuel plugin for Mistral integration
@@ -4190,7 +4190,7 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-murano-networking-sfc
+- project: x/fuel-plugin-murano-networking-sfc
   description: Fuel plugin for Murano networking SFC with MOS integration
   options:
     - delay-release
@@ -4199,43 +4199,43 @@
   options:
     - delay-release
   acl-config: /home/gerrit2/acls/openstack/fuel-plugin-murano.config
-- project: openstack/fuel-plugin-network-node
+- project: x/fuel-plugin-network-node
   groups:
     - fuel-plugins
   description: Fuel plugin for Network Node deployment integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-networking-sfc
+- project: x/fuel-plugin-networking-sfc
   description: Fuel plugin for SFC Networking
   options:
     - delay-release
-- project: openstack/fuel-plugin-neutron-fwaas
+- project: x/fuel-plugin-neutron-fwaas
   groups:
     - fuel-plugins
   description: Fuel plugin for FWaaS for Neutron
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-neutron-lbaas
+- project: x/fuel-plugin-neutron-lbaas
   groups:
     - fuel-plugins
   description: Fuel plugin for LBaaS for Neutron
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-neutron-vpnaas
+- project: x/fuel-plugin-neutron-vpnaas
   groups:
     - fuel-plugins
   description: Fuel plugin for VPNaaS for Neutron
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-nimblestorage-cinder
+- project: x/fuel-plugin-nimblestorage-cinder
   description: Fuel plugin to enable block storage support for Nimble in Fuel
   options:
     - delay-release
-- project: openstack/fuel-plugin-nitrous
+- project: x/fuel-plugin-nitrous
   groups:
     - fuel-plugins
   description: Fuel plugin for bare metal configuration and provisioning ready to
@@ -4243,88 +4243,88 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-nova-nfs
+- project: x/fuel-plugin-nova-nfs
   groups:
     - fuel-plugins
   description: Fuel plugin for nfs as storage backend for ephemeral volumes (nova)
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-nsx-t
+- project: x/fuel-plugin-nsx-t
   description: Fuel plugin for NSX-T integration
   options:
     - delay-release
-- project: openstack/fuel-plugin-nsxv
+- project: x/fuel-plugin-nsxv
   groups:
     - fuel-plugins
   description: Fuel plugin for NSX-V integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-nuage
+- project: x/fuel-plugin-nuage
   groups:
     - fuel-plugins
   description: Fuel plugin for Nuage SDN with MOS integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-onos
+- project: x/fuel-plugin-onos
   groups:
     - fuel-plugins
   description: Fuel plugin Onos for L2 traffic instead of neutron openvswitch agent
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-openbook
+- project: x/fuel-plugin-openbook
   groups:
     - fuel-plugins
   description: Fuel plugin for Openbook project integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-opendaylight
+- project: x/fuel-plugin-opendaylight
   groups:
     - fuel-plugins
   description: Fuel plugin for OpenDaylight integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-openstack-telemetry
+- project: x/fuel-plugin-openstack-telemetry
   groups:
     - lma-toolchain
   description: Fuel plugin to deploy OpenStack Telemetry services (Ceilometer, Aodh)
   docimpact-group: lma-toolchain
   options:
     - delay-release
-- project: openstack/fuel-plugin-ovs
+- project: x/fuel-plugin-ovs
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy OVS with NSH and DPDK
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-plumgrid
+- project: x/fuel-plugin-plumgrid
   groups:
     - fuel-plugins
   description: Fuel plugin for PLUMgrid SDN network backend integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-purestorage-cinder
+- project: x/fuel-plugin-purestorage-cinder
   groups:
     - fuel-plugins
   description: Fuel plugin for PureStorage Cinder integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-qemu
+- project: x/fuel-plugin-qemu
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy QEMU
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-qlogic-sriov-vxlan
+- project: x/fuel-plugin-qlogic-sriov-vxlan
   groups:
     - fuel-plugins
   description: Fuel plugin which enables SRIOV capabilities in QLogic E3/E4 Intelligent
@@ -4332,7 +4332,7 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-rally
+- project: x/fuel-plugin-rally
   description: Fuel plugin to deploy Rally
   groups:
     - fuel-plugins
@@ -4340,49 +4340,49 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-saltstack
+- project: x/fuel-plugin-saltstack
   groups:
     - fuel-plugins
   description: Fuel plugin for SaltStack integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-scaleio
+- project: x/fuel-plugin-scaleio
   groups:
     - fuel-plugins
   description: Fuel plugin for ScaleIO storage backend integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-scaleio-cinder
+- project: x/fuel-plugin-scaleio-cinder
   groups:
     - fuel-plugins
   description: Fuel plugin for ScaleIO with Cinder storage backend integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-sensu
+- project: x/fuel-plugin-sensu
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy Sensu
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-solidfire-cinder
+- project: x/fuel-plugin-solidfire-cinder
   groups:
     - fuel-plugins
   description: Fuel plugin for SolidFire with Cinder integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-swiftstack
+- project: x/fuel-plugin-swiftstack
   groups:
     - fuel-plugins
   description: Fuel plugin to allow integration of external SwiftStack Swift cluster
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-tacker
+- project: x/fuel-plugin-tacker
   groups:
     - fuel-plugins
   description: Fuel plugin to install Tacker VNF manager which support SFC through
@@ -4390,21 +4390,21 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-tempest
+- project: x/fuel-plugin-tempest
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy tempest
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-tintri-cinder
+- project: x/fuel-plugin-tintri-cinder
   groups:
     - fuel-plugins
   description: Fuel plugin to enable Tintri driver for Cinder
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-tls
+- project: x/fuel-plugin-tls
   groups:
     - fuel-plugins
   description: Fuel plugin to secure OpenStack using the Transport Layer Security
@@ -4412,67 +4412,67 @@
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-unity
+- project: x/fuel-plugin-unity
   description: Fuel plugin to install unity in cinder and configure it
   options:
     - delay-release
-- project: openstack/fuel-plugin-vmware-dvs
+- project: x/fuel-plugin-vmware-dvs
   groups:
     - fuel-plugins
   description: Fuel plugin for VMware DVS integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-vxlan
+- project: x/fuel-plugin-vxlan
   groups:
     - fuel-plugins
   description: Fuel plugin for Vxlan for Neutron
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-watcher
+- project: x/fuel-plugin-watcher
   groups:
     - fuel-plugins
   description: Fuel plugin to deploy Watcher
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-wstunnel
+- project: x/fuel-plugin-wstunnel
   groups:
     - fuel-plugins
   description: Fuel plugin for Web-sockets tunnel integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-xenserver
+- project: x/fuel-plugin-xenserver
   groups:
     - fuel-plugins
   description: Fuel plugin for XenServer integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-zabbix-agents
+- project: x/fuel-plugin-zabbix-agents
   groups:
     - fuel-plugins
   description: Fuel plugin for Zabbix agents integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-zabbix-monitoring-emc
+- project: x/fuel-plugin-zabbix-monitoring-emc
   groups:
     - fuel-plugins
   description: Fuel plugin for Zabbix monitoring EMC integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-zabbix-monitoring-extreme-networks
+- project: x/fuel-plugin-zabbix-monitoring-extreme-networks
   groups:
     - fuel-plugins
   description: Fuel plugin for Zabbix monitoring extreme networks integration
   docimpact-group: fuel-plugins
   options:
     - delay-release
-- project: openstack/fuel-plugin-zabbix-snmptrapd
+- project: x/fuel-plugin-zabbix-snmptrapd
   groups:
     - fuel-plugins
   description: Fuel plugin for Zabbix snmptrapd integration
@@ -4543,34 +4543,34 @@
 - project: openstack/fuxi-kubernetes
   description: RETIRED, Kubernetes integration with OpenStack Storage
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/gabbi-tempest
+- project: x/gabbi-tempest
   description: Tempest plugin for automating gabbi-based testing of services.
   use-storyboard: true
-- project: openstack/gantt
+- project: x/gantt
   description: RETIRED, Common scheduler for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/gce-api
+- project: x/gce-api
   description: Google Compute Engine API support for OpenStack
-- project: openstack/gerrit-dash-creator
+- project: x/gerrit-dash-creator
   description: Tool for creating custom gerrit dashboard urls to make prioritizing
     reviews easier. Includes many example dashboards for OpenStack projects.
-- project: openstack/gertty
+- project: ttygroup/gertty
   description: Console interface to Gerrit Code Review
   use-storyboard: true
-- project: openstack/giftwrap
+- project: x/giftwrap
   description: A tool for creating bespoke system-native OpenStack artifacts
   groups:
     - python-giftwrap
-- project: openstack/git-nit
+- project: x/git-nit
   description: A tool that helps grabbing existing reviews on gerrit and layering
     on a new patch to fix nits
   use-storyboard: true
-- project: openstack/git-os-job
+- project: x/git-os-job
   description: git plugin to show the OpenStack job log URL for a commit
   use-storyboard: true
-- project: openstack/git-repo-manifests
+- project: x/git-repo-manifests
   description: Clone multiple OpenStack repos as a group
-- project: openstack/git-upstream
+- project: x/git-upstream
   description: Staying close to latest from OpenStack through git-upstream
 - project: openstack/glance
   description: OpenStack Image Management (Glance)
@@ -4584,12 +4584,12 @@
     - glance-store
   options:
     - translate
-- project: openstack/glare
+- project: x/glare
   description: Artifact Repository (Glare)
-- project: openstack/glare-specs
+- project: x/glare-specs
   description: Artifact Repository (Glare) Specifications
-  acl-config: /home/gerrit2/acls/openstack/glare.config
-- project: openstack/gluon
+  acl-config: /home/gerrit2/acls/x/glare.config
+- project: x/gluon
   groups:
     - python-gluon
   description: Model-Driven, Extensible Framework for L3 Networking Service
@@ -4599,11 +4599,11 @@
 - project: openstack/goal-tools
   description: Tools for managing community goals.
   use-storyboard: true
-- project: openstack/golang-client
+- project: x/golang-client
   description: OpenStack API client for golang
-- project: openstack/golang-commons
+- project: x/golang-commons
   description: Oslo-style support for logging and configuration in Go language
-- project: openstack/gos-brick
+- project: x/gos-brick
   description: Volume discovery and local storage management lib for golang.
 - project: openstack/governance
   description: OpenStack Technical Committee Decisions
@@ -4617,33 +4617,33 @@
 - project: openstack/governance-website
   description: Base content for governance.o.o
   acl-config: /home/gerrit2/acls/openstack/governance.config
-- project: openstack/group-based-policy
+- project: x/group-based-policy
   description: Group Based Policy
-- project: openstack/group-based-policy-automation
+- project: x/group-based-policy-automation
   description: Group Based Policy Automation
-  acl-config: /home/gerrit2/acls/openstack/group-based-policy.config
-- project: openstack/group-based-policy-specs
+  acl-config: /home/gerrit2/acls/x/group-based-policy.config
+- project: x/group-based-policy-specs
   description: Group Based Policy Design Specifications
-  acl-config: /home/gerrit2/acls/openstack/group-based-policy.config
-- project: openstack/group-based-policy-ui
+  acl-config: /home/gerrit2/acls/x/group-based-policy.config
+- project: x/group-based-policy-ui
   description: Group Based Policy UI
-  acl-config: /home/gerrit2/acls/openstack/group-based-policy.config
-- project: openstack/gyan
+  acl-config: /home/gerrit2/acls/x/group-based-policy.config
+- project: x/gyan
   description: Machine Learning Infrastructure As A Service
   use-storyboard: true
   groups:
     - gyan
-- project: openstack/gyan-dashboard
+- project: x/gyan-dashboard
   use-storyboard: true
   groups:
     - gyan
-  acl-config: /home/gerrit2/acls/openstack/gyan.config
+  acl-config: /home/gerrit2/acls/x/gyan.config
   description: Horizon plugin for Gyan
-- project: openstack/gyan-specs
+- project: x/gyan-specs
   use-storyboard: true
   groups:
     - gyan
-  acl-config: /home/gerrit2/acls/openstack/gyan.config
+  acl-config: /home/gerrit2/acls/x/gyan.config
   description: Gyan project Specifications.
 - project: openstack/ha-guide
   description: OpenStack High Availability Guide
@@ -4704,9 +4704,9 @@
 - project: openstack/horizon-cisco-ui
   description: RETIRED, Cisco plugin for Horizon
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/horizon-mellanox
+- project: x/horizon-mellanox
   description: Mellanox Extension for the OpenStack Dashboard (Horizon)
-- project: openstack/hurricane
+- project: x/hurricane
   description: Integrations and useful connections and operational actions and tasks
     and tools that perform useful things with and/or to/between OpenStack via StackStorm.
 - project: openstack/i18n
@@ -4720,7 +4720,7 @@
     - openstack-i18n
   acl-config: /home/gerrit2/acls/openstack/i18n.config
   description: OpenStack I18n Specifications
-- project: openstack/inception
+- project: x/inception
   description: Inception Cloud Project
 - project: openstack/instack
   description: RETIRED. A utility to run diskimage-builder elements in place on
@@ -4735,24 +4735,24 @@
 - project: openstack/installguide-cookiecutter
   description: RETIRED, Cookiecutter Template for new Install Guide
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/intel-nfv-ci-tests
+- project: x/intel-nfv-ci-tests
   description: intel nfv ci testcase repo.
 - project: openstack/interop
   description: Data and documentation maintained by the Interop Working Group
   use-storyboard: true
   groups:
     - interop
-- project: openstack/interop-workloads
+- project: x/interop-workloads
   description: Assets relating to the Interop Challenge
-- project: openstack/iotronic
+- project: x/iotronic
   description: Internet of Things resource management service for OpenStack clouds.
-- project: openstack/iotronic-lightning-rod
+- project: x/iotronic-lightning-rod
   description: Lightning-rod is the IoT node-side agent for the IoTronic service.
-  acl-config: /home/gerrit2/acls/openstack/iotronic.config
-- project: openstack/iotronic-ui
+  acl-config: /home/gerrit2/acls/x/iotronic.config
+- project: x/iotronic-ui
   description: Iotronic plugin for the OpenStack Dashboard.
-  acl-config: /home/gerrit2/acls/openstack/iotronic.config
-- project: openstack/ipa-example-hardware-managers
+  acl-config: /home/gerrit2/acls/x/iotronic.config
+- project: x/ipa-example-hardware-managers
   description: Useful examples of HardwareManager plugins for ironic-python-agent
 - project: openstack/ironic
   description: A service for managing and provisioning Bare Metal servers.
@@ -4774,7 +4774,7 @@
   acl-config: /home/gerrit2/acls/openstack/ironic-inspector.config
   groups:
     - ironic
-- project: openstack/ironic-inspector-tempest-plugin
+- project: x/ironic-inspector-tempest-plugin
   description: RETIRED, Tempest plugin for ironic-inspector
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/ironic-lib
@@ -4799,7 +4799,7 @@
     - ironic
   description: OpenStack Baremetal (Ironic) Specifications
   use-storyboard: true
-- project: openstack/ironic-staging-drivers
+- project: x/ironic-staging-drivers
   description: A project used to hold out-of-tree ironic drivers
   use-storyboard: true
   groups:
@@ -4821,17 +4821,17 @@
 - project: openstack/ironic-webclient
   description: RETIRED, Ironic HTTP(S) Client
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/jacket
+- project: x/jacket
   description: Jacket is for managing the heterogeneous cloud via OpenStack (VMware
     private cloud, AWS public cloud and so on).
-- project: openstack/jenkins-plugins-for-murano
+- project: x/jenkins-plugins-for-murano
   description: Set of Jenkins plugins for Murano
 - project: openstack/js-openstack-lib
   description: JavaScript API library for OpenStack.
   use-storyboard: true
-- project: openstack/k8s-cloud-provider
+- project: x/k8s-cloud-provider
   description: Kubernetes cloud provider (external) for OpenStack
-- project: openstack/k8s-docker-suite-app-murano
+- project: x/k8s-docker-suite-app-murano
   description: Suite of the Docker and Kubernetes applications
 - project: openstack/karbor
   description: Application Data Protection as a Service in OpenStack
@@ -4844,24 +4844,24 @@
   acl-config: /home/gerrit2/acls/openstack/karbor.config
 - project: openstack/karma-subunit-reporter
   description: A karma plugin to report Karma test results as a subunit stream
-- project: openstack/kayobe
+- project: x/kayobe
   groups:
     - kayobe
   description: Deployment of containerised OpenStack to bare metal using kolla and
     bifrost
   use-storyboard: true
-- project: openstack/kayobe-config
+- project: x/kayobe-config
   groups:
     - kayobe
   description: Configuration files for kayobe
   use-storyboard: true
-  acl-config: /home/gerrit2/acls/openstack/kayobe.config
-- project: openstack/kayobe-config-dev
+  acl-config: /home/gerrit2/acls/x/kayobe.config
+- project: x/kayobe-config-dev
   groups:
     - kayobe
   description: Development configuration files for kayobe
   use-storyboard: true
-  acl-config: /home/gerrit2/acls/openstack/kayobe.config
+  acl-config: /home/gerrit2/acls/x/kayobe.config
 - project: openstack/keystone
   description: OpenStack Identity (Keystone)
   options:
@@ -4882,20 +4882,20 @@
   description: OpenStack Identity (Keystone) Middleware
   options:
     - translate
-- project: openstack/kiloeyes
+- project: x/kiloeyes
   description: A monitoring project for OpenStack Cloud
-- project: openstack/kingbird
+- project: x/kingbird
   description: Centralized service for multi-region deployments.
-- project: openstack/kingbird-dashboard
+- project: x/kingbird-dashboard
   description: Kingbird Horizon plugin.
   groups:
     - kingbird
-  acl-config: /home/gerrit2/acls/openstack/kingbird.config
-- project: openstack/kite
+  acl-config: /home/gerrit2/acls/x/kingbird.config
+- project: x/kite
   description: RETIRED, A service for managing and distributing message encryption
     keys.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/kloudbuster
+- project: x/kloudbuster
   description: A tool to load OpenStack clouds end to end in both control plane
     and data plane.
 - project: openstack/kolla
@@ -4910,15 +4910,15 @@
 - project: openstack/kolla-kubernetes
   description: RETIRED, Kubernetes deployment of the Kolla containers
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/kolla-mesos
+- project: x/kolla-mesos
   description: RETIRED, Kolla-Mesos provides mesos deployment for Kolla containers
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/kosmos
+- project: x/kosmos
   description: Global Server Load-Balancing
-- project: openstack/kosmos-specs
+- project: x/kosmos-specs
   description: Global Load Balancing Service (Kosmos) Specifications
-  acl-config: /home/gerrit2/acls/openstack/kosmos.config
-- project: openstack/ku.stella
+  acl-config: /home/gerrit2/acls/x/kosmos.config
+- project: x/ku.stella
   description: Guarantee of performance and security SLA for OpenStack clouds
 - project: openstack/kuryr
   description: Bridge between container framework networking and storage models
@@ -4929,57 +4929,57 @@
   description: Docker remote driver for OpenStack Neutron
 - project: openstack/kuryr-tempest-plugin
   description: Tempest plugin for kuryr/kuryr-kubernetes
-- project: openstack/kwapi
+- project: x/kwapi
   description: Energy Efficiency Monitoring
 - project: openstack/ldappool
   description: A simple connector pool for python-ldap and related LDAP libraries.
-- project: openstack/liberasurecode
+- project: x/liberasurecode
   description: Erasure Code API library written in C with pluggable Erasure Code
     backends.
-- project: openstack/limestone-ci-cloud
+- project: limestone/ci-cloud-config
   description: CI/CD Deployment of Limestone Networks nodepool cloud
 - project: openstack/loci
   use-storyboard: true
   description: Lightweight OCI compatible images for OpenStack Projects
   groups:
     - loci
-- project: openstack/loci-cinder
+- project: x/loci-cinder
   description: RETIRED, Lightweight OCI compatible image for Cinder
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-designate
+- project: x/loci-designate
   description: RETIRED, Lightweight OCI compatible image for Designate
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-glance
+- project: x/loci-glance
   description: RETIRED, Lightweight OCI compatible image for Glance
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-heat
+- project: x/loci-heat
   description: RETIRED, Lightweight OCI compatible image for Heat
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-horizon
+- project: x/loci-horizon
   description: RETIRED, Lightweight OCI compatible image for Horizon
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-ironic
+- project: x/loci-ironic
   description: RETIRED, Lightweight OCI compatible image for Ironic
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-keystone
+- project: x/loci-keystone
   description: RETIRED, Lightweight OCI compatible image for Keystone
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-murano
+- project: x/loci-murano
   description: RETIRED, Lightweight OCI compatible image for Murano
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-neutron
+- project: x/loci-neutron
   description: RETIRED, Lightweight OCI compatible image for Neutron
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-nova
+- project: x/loci-nova
   description: RETIRED, Lightweight OCI compatible image for Nova
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-requirements
+- project: x/loci-requirements
   description: RETIRED, Lightweight OCI compatible image for OpenStack Requirements
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-swift
+- project: x/loci-swift
   description: RETIRED, Lightweight OCI compatible image for Swift
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/loci-trove
+- project: x/loci-trove
   description: RETIRED, Lightweight OCI compatible image for Trove
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/magnetodb
@@ -5038,7 +5038,7 @@
   description: The UI component for Manila
   options:
     - translate
-- project: openstack/marshal
+- project: x/marshal
   description: Key retrieval agent for OpenStack instances.
 - project: openstack/masakari
   description: Virtual Machine High Availability (VMHA) service for OpenStack.
@@ -5055,17 +5055,17 @@
     - masakari
   description: Design Specifications for Masakari
   acl-config: /home/gerrit2/acls/openstack/masakari.config
-- project: openstack/meghdwar
+- project: x/meghdwar
   description: Edge cloud application management gateway services
-- project: openstack/merlin
+- project: x/merlin
   description: Framework for building UIs for OpenStack projects dealing with complex
     input data
 - project: openstack/metalsmith
   description: Simple deployment and scheduling tool for bare metal
   use-storyboard: true
-- project: openstack/meteos
+- project: x/meteos
   description: Machine Learning as a Service in Apache Spark.
-- project: openstack/meteos-ui
+- project: x/meteos-ui
   description: The UI component for Meteos.
 - project: openstack/microversion-parse
   description: Simple library for parsing OpenStack microversion headers.
@@ -5094,18 +5094,18 @@
   groups:
     - mistral
   acl-config: /home/gerrit2/acls/openstack/mistral.config
-- project: openstack/mitmstack
+- project: x/mitmstack
   description: Man-In-The-Middle OpenStack service faker for clients testing
-- project: openstack/mixmatch
+- project: x/mixmatch
   description: Combine resources across federated OpenStack deployments
-- project: openstack/mogan
+- project: x/mogan
   description: OpenStack Baremetal Compute Service
-- project: openstack/mogan-specs
+- project: x/mogan-specs
   description: Baremetal Compute (Mogan) Specifications
-  acl-config: /home/gerrit2/acls/openstack/mogan.config
-- project: openstack/mogan-ui
+  acl-config: /home/gerrit2/acls/x/mogan.config
+- project: x/mogan-ui
   description: Mogan UI plugin
-  acl-config: /home/gerrit2/acls/openstack/mogan.config
+  acl-config: /home/gerrit2/acls/x/mogan.config
 - project: openstack/molteniron
   description: Python client/server for managing a pool of Bare Metal machines.
   use-storyboard: true
@@ -5215,22 +5215,22 @@
     - translate
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/monasca.config
-- project: openstack/monasca-vagrant
+- project: x/monasca-vagrant
   description: Vagrant test environment for Monasca
   groups:
     - monasca
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/monasca.config
-- project: openstack/monitoring-for-openstack
+- project: x/monitoring-for-openstack
   description: RETIRED, OpenStack monitoring tools
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/monitorstack
+- project: x/monitorstack
   description: Monitoring plugin framework for OpenStack clouds
   groups:
     - openstack-ansible
   docimpact-group: openstack-ansible
   acl-config: /home/gerrit2/acls/openstack/openstack-ansible.config
-- project: openstack/mors
+- project: x/mors
   description: Lease manager for various Objects
 - project: openstack/mox3
   description: Port of mox library to python 3
@@ -5262,38 +5262,38 @@
   options:
     - translate
   acl-config: /home/gerrit2/acls/openstack/murano.config
-- project: openstack/murano-plugin-networking-sfc
+- project: x/murano-plugin-networking-sfc
   description: Murano plugin for networking sfc support.
 - project: openstack/murano-specs
   description: Murano Design Specifications
 - project: openstack/murano-tempest-plugin
   description: Tempest plugin for the murano project.
   acl-config: /home/gerrit2/acls/openstack/murano.config
-- project: openstack/namos
+- project: x/namos
   description: Device and Service manager
-- project: openstack/nemesis
+- project: x/nemesis
   description: A malware scanning and file intelligence API for the OpenStack ecosystem.
-- project: openstack/nerd-reviewer
+- project: x/nerd-reviewer
   description: Nerd Reviewer bot reviews patches and checks that they pass common
     project rules e.g. unit test coverage, max amount of loc, well written commit
     message... So core reviews can concentrate on other more important stuff.
-- project: openstack/network-checker
+- project: x/network-checker
   groups:
     - fuel
   description: Network connectivity health check tool.
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/networking-6wind
+- project: x/networking-6wind
   description: Neutron support for fast path stack
-- project: openstack/networking-ale-omniswitch
+- project: x/networking-ale-omniswitch
   description: ALE OmniSwtich drivers for ML2
-- project: openstack/networking-ansible
+- project: x/networking-ansible
   description: Ansible Networking drivers for ML2
   use-storyboard: true
-- project: openstack/networking-arista
+- project: x/networking-arista
   description: Arista drivers for ML2 and L3 Service Plugin
-- project: openstack/networking-avaya
+- project: x/networking-avaya
   description: Avaya OpenStack Neutron plugins
 - project: openstack/networking-bagpipe
   description: Neutron agent and drivers for BaGPipe-based BGP VPNs
@@ -5309,26 +5309,26 @@
     - bgpvpn
   options:
     - translate
-- project: openstack/networking-bigswitch
+- project: x/networking-bigswitch
   description: Big Switch Networks plugins and drivers for the networking project
-- project: openstack/networking-brocade
+- project: x/networking-brocade
   description: Brocade plugins/drivers for ML2 and Service Plugins
 - project: openstack/networking-calico
   description: OpenStack/Neutron integration for Calico networking
-- project: openstack/networking-cisco
+- project: x/networking-cisco
   description: Cisco Vendor Code for Neutron
-- project: openstack/networking-cumulus
+- project: x/networking-cumulus
   description: Cumulus plugins/drivers for Neutron
-- project: openstack/networking-dpm
+- project: x/networking-dpm
   description: IBM z Systems DPM Neutron driver and agent
-- project: openstack/networking-edge-vpn
+- project: x/networking-edge-vpn
   description: A framework to create an edge VPN service and bridge Neutron networks
     to it.
-- project: openstack/networking-extreme
+- project: x/networking-extreme
   description: Extreme Networks Service Plugins and ML2 Mechanism Drivers for Neutron.
-- project: openstack/networking-fortinet
+- project: x/networking-fortinet
   description: FortiOS Integration with Neutron
-- project: openstack/networking-fujitsu
+- project: x/networking-fujitsu
   description: Fujitsu Neutron Plugin
 - project: openstack/networking-generic-switch
   description: Multi-vendor Modular Layer 2 (ML2) driver.
@@ -5341,19 +5341,19 @@
   acl-config: /home/gerrit2/acls/openstack/networking-generic-switch.config
   groups:
     - ironic
-- project: openstack/networking-gluon
+- project: x/networking-gluon
   description: A framework to auto generate APIs for new services in Neutron.
-- project: openstack/networking-h3c
+- project: x/networking-h3c
   description: H3C Vendor Code for OpenStack Neutron to integrate with H3C SDN controller
-- project: openstack/networking-hpe
+- project: x/networking-hpe
   description: Hewlett Packard Enterprise drivers for ML2
-- project: openstack/networking-huawei
+- project: x/networking-huawei
   description: Neutron integration for Huawei Technologies
 - project: openstack/networking-hyperv
   description: Hyper-V L2 Agent and drivers for ML2.
-- project: openstack/networking-icc
+- project: x/networking-icc
   description: SDN controller based Inter-Cloud Connection for L2/L3
-- project: openstack/networking-infoblox
+- project: x/networking-infoblox
   description: Infoblox Neutron DDI
 - project: openstack/networking-l2gw
   description: API's and implementations to support L2 Gateways in Neutron.
@@ -5362,17 +5362,17 @@
 - project: openstack/networking-l2gw-tempest-plugin
   description: Tempest plugin for the Neutron L2GW.
   acl-config: /home/gerrit2/acls/openstack/networking-l2gw.config
-- project: openstack/networking-lagopus
+- project: x/networking-lagopus
   description: Neutron drivers for Lagopus Switch
-- project: openstack/networking-lenovo
+- project: x/networking-lenovo
   description: Lenovo Neutron Plugin
 - project: openstack/networking-midonet
   description: Midonet Neutron Plugin
   options:
     - translate
-- project: openstack/networking-mlnx
+- project: x/networking-mlnx
   description: Mellanox driver and agent for ML2.
-- project: openstack/networking-nec
+- project: x/networking-nec
   description: Neutron NEC plugins/drivers
 - project: openstack/networking-odl
   description: Neutron drivers for OpenDaylight.
@@ -5381,44 +5381,44 @@
 - project: openstack/networking-ofagent
   description: RETIRED, Neutron ofagent driver and its agent.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/networking-omnipath
+- project: x/networking-omnipath
   description: ML2 driver for OmniPath Switch.
 - project: openstack/networking-onos
   description: Neutron drivers for Open Network Operating System.
-- project: openstack/networking-opencontrail
+- project: x/networking-opencontrail
   description: Neutron drivers for OpenContrail.
 - project: openstack/networking-ovn
   description: Neutron integration with OVN
   options:
     - translate
-- project: openstack/networking-ovs-dpdk
+- project: x/networking-ovs-dpdk
   description: A Collection of Agents and Drivers to support managing DPDK accelerated
     Open vSwitch with neutron.
-- project: openstack/networking-peregrine
+- project: x/networking-peregrine
   description: ITRI Peregrine Neutron Plugin
-- project: openstack/networking-plumgrid
+- project: x/networking-plumgrid
   description: PLUMgrid driver for OpenStack Neutron
 - project: openstack/networking-powervm
   description: Neutron drivers for PowerVM network management.
 - project: openstack/networking-sfc
   description: API's and implementations to support Service Function Chaining in
     Neutron.
-- project: openstack/networking-spp
+- project: x/networking-spp
   description: Neutron drivers for Soft Patch Panel.
-- project: openstack/networking-vpp
+- project: x/networking-vpp
   description: Neutron plugins/drivers for VPP management.
-- project: openstack/networking-vsphere
+- project: x/networking-vsphere
   description: A set of Neutron drivers and agents to manage vSphere clusters.
-- project: openstack/networking-zte
+- project: x/networking-zte
   description: Neutron integration with ZTE networking.
-- project: openstack/networking-zvm
+- project: x/networking-zvm
   description: Implements zVM ML2 mechanism driver and zVM neutron agent for OpenStack
     Neutron.
 - project: openstack/neutron
   description: OpenStack Networking (Neutron)
   options:
     - translate
-- project: openstack/neutron-classifier
+- project: x/neutron-classifier
   description: Common library for services that classify packets
 - project: openstack/neutron-dynamic-routing
   description: Dynamic routing services for OpenStack Neutron.
@@ -5483,47 +5483,47 @@
   description: Horizon UI support for Neutron VPNaaS
   options:
     - translate
-- project: openstack/nfv-filters
+- project: x/nfv-filters
   description: Nova scheduler filters useful in NFV deployments
 - project: openstack/nova
   description: OpenStack Compute (Nova)
   options:
     - translate
-- project: openstack/nova-docker
+- project: x/nova-docker
   description: RETIRED, Docker driver for OpenStack Nova
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/nova-dpm
+- project: x/nova-dpm
   description: IBM System z DPM virtualization driver for OpenStack Nova
-- project: openstack/nova-fusioncompute
+- project: x/nova-fusioncompute
   description: Implementation of Nova virtulization driver for Huawei Fusioncompute.
-- project: openstack/nova-lxd
+- project: x/nova-lxd
   description: An OpenStack Compute driver for LXD
   options:
     - delay-release
-- project: openstack/nova-mksproxy
+- project: x/nova-mksproxy
   description: Nova console proxy for VMware instances
 - project: openstack/nova-powervm
   description: PowerVM virtualization driver for OpenStack Nova
-- project: openstack/nova-solver-scheduler
+- project: x/nova-solver-scheduler
   description: Nova scheduler driver for constraints-based scheduling
 - project: openstack/nova-specs
   groups:
     - nova
   description: OpenStack Compute (Nova) Specifications
-- project: openstack/nova-zvm-virt-driver
+- project: x/nova-zvm-virt-driver
   description: Implementation of Nova virtulization driver for zVM.
-- project: openstack/novajoin
+- project: x/novajoin
   description: Nova metadata dynamic vendordata server for enrolling IPA instances
-- project: openstack/novajoin-tempest-plugin
+- project: x/novajoin-tempest-plugin
   description: Tempest plugin for the novajoin project.
-  acl-config: /home/gerrit2/acls/openstack/novajoin.config
-- project: openstack/oaktree
+  acl-config: /home/gerrit2/acls/x/novajoin.config
+- project: x/oaktree
   description: gRPC API Porcelain Layer for OpenStack
   use-storyboard: true
-- project: openstack/oaktreemodel
+- project: x/oaktreemodel
   description: Protobuf model and library code for oaktree
   use-storyboard: true
-  acl-config: /home/gerrit2/acls/openstack/oaktree.config
+  acl-config: /home/gerrit2/acls/x/oaktree.config
 - project: openstack/octavia
   description: Load Balancing as a Service (LBaaS) for OpenStack
   options:
@@ -5549,12 +5549,12 @@
   groups:
     - octavia
   use-storyboard: true
-- project: openstack/omni
+- project: x/omni
   description: Multi and hybrid cloud management with OpenStack API.
-- project: openstack/ooi
+- project: x/ooi
   description: OOI is an implementation the Open Cloud Computing Interface (OCCI)
     for OpenStack.
-- project: openstack/opencafe
+- project: x/opencafe
   description: Common Automation Framework Engine. Core driver for CloudCAFE
 - project: openstack/openstack
   description: Repository containing OpenStack repositories
@@ -5818,7 +5818,7 @@
   groups:
     - openstack-ansible
   docimpact-group: openstack-ansible
-- project: openstack/openstack-ansible-os_swift_sync
+- project: x/openstack-ansible-os_swift_sync
   description: RETIRED, Role os_swift_sync for OpenStack-Ansible
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/openstack-ansible-os_tacker
@@ -5867,7 +5867,7 @@
     - openstack-ansible
   docimpact-group: openstack-ansible
   acl-config: /home/gerrit2/acls/openstack/openstack-ansible.config
-- project: openstack/openstack-ansible-py_from_git
+- project: x/openstack-ansible-py_from_git
   description: RETIRED, Role py_from_git for OpenStack-Ansible
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/openstack-ansible-rabbitmq_server
@@ -5966,30 +5966,30 @@
   options:
     - translate
   description: OpenStack Manuals
-- project: openstack/openstack-map
+- project: osf/openstack-map
   description: Base data to generate the OpenStack map and the Software section
     of the www.openstack.org website.
-- project: openstack/openstack-mentoring-scripts
+- project: x/openstack-mentoring-scripts
   description: Various scripts to make matching and following up with mentees easier
 - project: openstack/openstack-planet
   description: Planet RSS Feed for OpenStack
-- project: openstack/openstack-resource-agents
+- project: x/openstack-resource-agents
   description: Pacemaker High Availability resource agents for OpenStack
-- project: openstack/openstack-resource-agents-specs
+- project: x/openstack-resource-agents-specs
   description: Design Specifications for Pacemaker High Availability resource agents
     for OpenStack
-  acl-config: /home/gerrit2/acls/openstack/openstack-resource-agents.config
+  acl-config: /home/gerrit2/acls/x/openstack-resource-agents.config
 - project: openstack/openstack-salt
   description: RETIRED, Salt formulas for deploying OpenStack.
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/openstack-salt-specs
   description: RETIRED, Design Specifications for OpenStack-Salt
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/openstack-service-broker
+- project: x/openstack-service-broker
   description: Builds Ansible Playbook Bundles for use in Automation Broker to expose
     OpenStack resources in the Kubernetes Service Catalog.
   use-storyboard: true
-- project: openstack/openstack-spaceport
+- project: x/openstack-spaceport
   description: Environment, dependency and bootstrapping utilities for OpenStack
     and other services
 - project: openstack/openstack-specs
@@ -6020,7 +6020,7 @@
     - operations-docs
 - project: openstack/ops-tags-team
   description: Work of the User Committee's Ops Tags Team.
-- project: openstack/ops-telecom-nfv
+- project: x/ops-telecom-nfv
   description: Operators Telecom NFV Team
   homepage: https://wiki.openstack.org/wiki/Ops-telecom-nfv
 - project: openstack/os-acc
@@ -6045,9 +6045,9 @@
 - project: openstack/os-collect-config
   description: Collect and cache metadata, run hooks on changes.
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
-- project: openstack/os-dpm
+- project: x/os-dpm
   description: Shared library for networking-dpm and nova-dpm
-- project: openstack/os-faults
+- project: performa/os-faults
   description: An OpenStack fault injection library
 - project: openstack/os-ken
   description: A component-based software defined networking framework for OpenStack.
@@ -6055,12 +6055,12 @@
     - neutron
   acl-config: /home/gerrit2/acls/openstack/neutron.config
   use-storyboard: true
-- project: openstack/os-log-merger
+- project: x/os-log-merger
   use-storyboard: true
   description: Merge OpenStack related logs meaningfully.
-- project: openstack/os-namos
+- project: x/os-namos
   description: Namos discovery agent.
-  acl-config: /home/gerrit2/acls/openstack/namos.config
+  acl-config: /home/gerrit2/acls/x/namos.config
 - project: openstack/os-net-config
   description: Host network configuration tool
   acl-config: /home/gerrit2/acls/openstack/os-apply-config.config
@@ -6096,7 +6096,7 @@
     providers
 - project: openstack/os-win
   description: Windows / Hyper-V library for OpenStack projects.
-- project: openstack/os-xenapi
+- project: x/os-xenapi
   description: XenAPI library for OpenStack projects.
 - project: openstack/osc-lib
   description: OpenStackClient plugin library support
@@ -6110,10 +6110,10 @@
   acl-config: /home/gerrit2/acls/openstack/placement.config
   groups:
     - placement
-- project: openstack/osc-summit-counter
+- project: x/osc-summit-counter
   description: osc plugin to count summits someone has attended
   use-storyboard: true
-- project: openstack/osel
+- project: x/osel
   description: Listen for events and forward to external security scanning services.
 - project: openstack/oslo-incubator
   description: RETIRED, Part of OpenStack's Oslo project. New Oslo APIs go through
@@ -6200,40 +6200,40 @@
   description: Theme and utilities for Sphinx documentation tool
 - project: openstack/oslotest
   description: OpenStack test classes
-- project: openstack/osops-coda
+- project: x/osops-coda
   description: Coda is a Horizon dashboard and panel (both share the name) that
     facilitates resource clean up of a project once that project is no longer needed
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
-- project: openstack/osops-example-configs
+- project: x/osops-example-configs
   description: Example Configurations for OpenStack Operators
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
-- project: openstack/osops-tools-contrib
+- project: x/osops-tools-contrib
   description: Contributed Tools for OpenStack Operators
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
-- project: openstack/osops-tools-generic
+- project: x/osops-tools-generic
   description: Curated Tools and Scripts for OpenStack Operators
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
-- project: openstack/osops-tools-logging
+- project: x/osops-tools-logging
   description: Logging Tools for OpenStack Operators
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
-- project: openstack/osops-tools-monitoring
+- project: x/osops-tools-monitoring
   description: Monitoring for OpenStack Operators
   acl-config: /home/gerrit2/acls/openstack/osops.config
   groups:
     - osops
 - project: openstack/osprofiler
   description: OpenStack cross service/project profiler
-- project: openstack/ospurge
+- project: x/ospurge
   description: Cleanup OpenStack project resources.
 - project: openstack/ossa
   description: OpenStack Security Advisories
@@ -6241,16 +6241,16 @@
   description: Tempest plugin for os-win project.
 - project: openstack/ovsdbapp
   description: OVSDB application library
-- project: openstack/packetary
+- project: x/packetary
   description: Library and eponymous utility to manage the entire lifecycle of repositories
-- project: openstack/packetary-specs
+- project: x/packetary-specs
   description: Specs for packetary project
-  acl-config: /home/gerrit2/acls/openstack/packetary.config
+  acl-config: /home/gerrit2/acls/x/packetary.config
   groups:
     - packetary
-- project: openstack/packstack
+- project: x/packstack
   description: Install utility to deploy OpenStack on multiple hosts.
-- project: openstack/pandaman
+- project: x/pandaman
   description: ITDB Service for OpenStack
 - project: openstack/panko
   description: Event storage and REST API for Ceilometer
@@ -6265,39 +6265,39 @@
   acl-config: /home/gerrit2/acls/openstack/tripleo.config
   groups:
     - tripleo
-- project: openstack/pbrx
+- project: x/pbrx
   description: Utilities for projects using pbr
   use-storyboard: true
-- project: openstack/performa
+- project: x/performa
   description: Distributed scenario runner, results processor and report generator
 - project: openstack/performance-docs
   description: OpenStack performance testing plans, results, investigations and
     accompanying pieces of testing scripts and Rally scenarios.
-- project: openstack/picasso
+- project: x/picasso
   description: Functions as a Service
 - project: openstack/placement
   use-storyboard: true
   description: OpenStack resource provider inventory allocation service
   groups:
     - placement
-- project: openstack/poppy
+- project: x/poppy
   description: A modular, vendor-neutral API, that wraps provisioning instructions
     for all CDN vendors that support it.
-- project: openstack/poppy-ui
+- project: x/poppy-ui
   description: Horizon Web interface for Poppy
-  acl-config: /home/gerrit2/acls/openstack/poppy.config
+  acl-config: /home/gerrit2/acls/x/poppy.config
   groups:
     - poppy
-- project: openstack/powervc-driver
+- project: x/powervc-driver
   description: A set of drivers and utilities to integrate PowerVC into OpenStack.
 - project: openstack/project-navigator-data
   description: Data for the OpenStack project navigator
 - project: openstack/project-team-guide
   description: OpenStack Project Team Guide
-- project: openstack/proliantutils
+- project: x/proliantutils
   description: Utility library for managing HP Proliant servers (used in Ironic
     iLO drivers).
-- project: openstack/promstat
+- project: x/promstat
   description: Report stats to both statsd and prometheus
   use-storyboard: true
 - project: openstack/ptgbot
@@ -6311,7 +6311,7 @@
     - openstack-publiccloud-wg
 - project: openstack/puppet-aodh
   description: OpenStack Aodh Puppet Module
-- project: openstack/puppet-autossh
+- project: x/puppet-autossh
   description: Autossh Puppet Module
   acl-config: /home/gerrit2/acls/openstack/gozer.config
 - project: openstack/puppet-barbican
@@ -6341,13 +6341,13 @@
 - project: openstack/puppet-ec2api
   description: OpenStack EC2 API Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-fenix
+- project: x/puppet-fenix
   description: OpenStack Fenix Puppet Module
-  acl-config: /home/gerrit2/acls/openstack/fenix.config
+  acl-config: /home/gerrit2/acls/x/fenix.config
 - project: openstack/puppet-freezer
   description: OpenStack Freezer Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-ganesha
+- project: x/puppet-ganesha
   description: RETIRED, Ganesha Puppet Module
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/puppet-glance
@@ -6374,12 +6374,12 @@
 - project: openstack/puppet-manila
   description: OpenStack Manila Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-midonet
+- project: x/puppet-midonet
   description: Puppet Module for MidoNet project
 - project: openstack/puppet-mistral
   description: OpenStack Mistral Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-modulesync-configs
+- project: x/puppet-modulesync-configs
   description: Modulesync configuration for OpenStack puppet modules
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
 - project: openstack/puppet-monasca
@@ -6387,7 +6387,7 @@
 - project: openstack/puppet-murano
   description: OpenStack Murano Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-n1k-vsm
+- project: x/puppet-n1k-vsm
   description: Foreman Puppet installer for Cisco N1KV Virtual Supervisor Module
 - project: openstack/puppet-neutron
   description: OpenStack Neutron Puppet Module
@@ -6407,7 +6407,7 @@
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
 - project: openstack/puppet-openstack-integration
   description: Collection of scripts and manifests for module testing
-- project: openstack/puppet-openstack-release-tools
+- project: x/puppet-openstack-release-tools
   description: RETIRED, Release tools for Puppet OpenStack modules
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/puppet-openstack-specs
@@ -6451,12 +6451,12 @@
 - project: openstack/puppet-senlin
   description: OpenStack Senlin Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-setproxy
+- project: x/puppet-setproxy
   description: Generic Set proxy Module
   acl-config: /home/gerrit2/acls/openstack/gozer.config
-- project: openstack/puppet-surveil
+- project: x/puppet-surveil
   description: Puppet Surveil Module
-  acl-config: /home/gerrit2/acls/openstack/surveil.config
+  acl-config: /home/gerrit2/acls/x/surveil.config
 - project: openstack/puppet-swift
   description: OpenStack Swift Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
@@ -6473,7 +6473,7 @@
 - project: openstack/puppet-trove
   description: OpenStack Trove Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
-- project: openstack/puppet-tuskar
+- project: x/puppet-tuskar
   description: OpenStack Tuskar Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
 - project: openstack/puppet-vitrage
@@ -6490,10 +6490,10 @@
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
 - project: openstack/pycadf
   description: CADF Python module
-- project: openstack/pyeclib
+- project: x/pyeclib
   description: A simple Python interface for implementing erasure codes
-  acl-config: /home/gerrit2/acls/openstack/liberasurecode.config
-- project: openstack/pyghmi
+  acl-config: /home/gerrit2/acls/x/liberasurecode.config
+- project: x/pyghmi
   description: A Pure python IPMI library
 - project: openstack/pylockfile
   description: RETIRED, Platform-independent file locking module
@@ -6509,18 +6509,18 @@
   groups:
     - adjutant
   acl-config: /home/gerrit2/acls/openstack/adjutant.config
-- project: openstack/python-almanachclient
+- project: x/python-almanachclient
   description: Client library for Almanach API
-  acl-config: /home/gerrit2/acls/openstack/almanach.config
+  acl-config: /home/gerrit2/acls/x/almanach.config
   groups:
     - almanach
 - project: openstack/python-aodhclient
   description: Client library for Aodh API
-- project: openstack/python-apmecclient
+- project: x/python-apmecclient
   description: Edge Orchestration (Apmec) Client
   groups:
     - apmec
-  acl-config: /home/gerrit2/acls/openstack/apmec.config
+  acl-config: /home/gerrit2/acls/x/apmec.config
 - project: openstack/python-appcatalogclient
   description: RETIRED, Client library for App Catalog API
   acl-config: /home/gerrit2/acls/openstack/retired.config
@@ -6529,9 +6529,9 @@
   description: Client library for Barbican API.
   groups:
     - barbican
-- project: openstack/python-bileanclient
+- project: x/python-bileanclient
   description: Python client library for Bilean API
-  acl-config: /home/gerrit2/acls/openstack/bilean.config
+  acl-config: /home/gerrit2/acls/x/bilean.config
 - project: openstack/python-blazarclient
   description: Client for OpenStack Blazar
   acl-config: /home/gerrit2/acls/openstack/blazar.config
@@ -6541,7 +6541,7 @@
 - project: openstack/python-ceilometerclient
   description: RETIRED, OpenStack Telemetry (Ceilometer) Client
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-cerberusclient
+- project: x/python-cerberusclient
   description: RETIRED, Python client library for Cerberus API
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/python-cinderclient
@@ -6553,16 +6553,16 @@
   groups:
     - cloudkitty
   use-storyboard: true
-- project: openstack/python-cloudpulseclient
+- project: x/python-cloudpulseclient
   description: Python client library for CloudPulse
-  acl-config: /home/gerrit2/acls/openstack/cloudpulse.config
-- project: openstack/python-cognitiveclient
+  acl-config: /home/gerrit2/acls/x/cloudpulse.config
+- project: x/python-cognitiveclient
   description: Python client library for Cognitive
-  acl-config: /home/gerrit2/acls/openstack/cognitive.config
+  acl-config: /home/gerrit2/acls/x/cognitive.config
 - project: openstack/python-congressclient
   description: Client for OpenStack Congress
   acl-config: /home/gerrit2/acls/openstack/congress.config
-- project: openstack/python-cratonclient
+- project: x/python-cratonclient
   description: RETIRED, Fleet management for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/python-cueclient
@@ -6576,19 +6576,19 @@
     - cyborg
 - project: openstack/python-designateclient
   description: OpenStack DNS As A Service (Designate) Client
-- project: openstack/python-distilclient
+- project: x/python-distilclient
   description: Python client library for Distil API
-  acl-config: /home/gerrit2/acls/openstack/distil.config
-- project: openstack/python-don
+  acl-config: /home/gerrit2/acls/x/distil.config
+- project: x/python-don
   description: Horizon dashboard to diagnose OpenStack networking issues.
 - project: openstack/python-dracclient
   description: Library for managing machines with Dell iDRAC cards
-- project: openstack/python-evoqueclient
+- project: x/python-evoqueclient
   description: RETIRED, Client library for Evoque API
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-fenixclient
+- project: x/python-fenixclient
   description: Fenix API Client library
-  acl-config: /home/gerrit2/acls/openstack/fenix.config
+  acl-config: /home/gerrit2/acls/x/fenix.config
   use-storyboard: true
   groups:
     - fenix
@@ -6605,25 +6605,25 @@
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/python-ganttclient
+- project: x/python-ganttclient
   description: RETIRED, Client code for the common scheduler for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/python-glanceclient
   description: OpenStack Image Management (Glance) Client
-- project: openstack/python-glareclient
+- project: x/python-glareclient
   description: Glare Artifact Repository Client
-  acl-config: /home/gerrit2/acls/openstack/glare.config
+  acl-config: /home/gerrit2/acls/x/glare.config
 - project: openstack/python-gnocchiclient
   description: RETIRED, Gnocchi Client
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-group-based-policy-client
+- project: x/python-group-based-policy-client
   description: Client for OpenStack Group Based Policy
-  acl-config: /home/gerrit2/acls/openstack/group-based-policy.config
-- project: openstack/python-gyanclient
+  acl-config: /home/gerrit2/acls/x/group-based-policy.config
+- project: x/python-gyanclient
   use-storyboard: true
   groups:
     - gyan
-  acl-config: /home/gerrit2/acls/openstack/gyan.config
+  acl-config: /home/gerrit2/acls/x/gyan.config
   description: Gyan Python Client
 - project: openstack/python-heatclient
   use-storyboard: true
@@ -6632,11 +6632,11 @@
     - translate
   groups:
     - heat
-- project: openstack/python-hnvclient
+- project: x/python-hnvclient
   description: Python client for the HNV (Hyper-V Network Virtualization) REST API
-- project: openstack/python-iotronicclient
+- project: x/python-iotronicclient
   description: Client for the IoTronic service.
-  acl-config: /home/gerrit2/acls/openstack/iotronic.config
+  acl-config: /home/gerrit2/acls/x/iotronic.config
 - project: openstack/python-ironic-inspector-client
   description: A python client and OpenStackClient plugin for Ironic Inspector
   use-storyboard: true
@@ -6648,9 +6648,9 @@
   use-storyboard: true
   groups:
     - ironic
-- project: openstack/python-jenkins
+- project: jjb/python-jenkins
   description: Python API for managing jobs and nodes in a Jenkins CI instance
-- project: openstack/python-k8sclient
+- project: x/python-k8sclient
   description: Python API for Kubernetes
 - project: openstack/python-karborclient
   description: Python client library for karbor API
@@ -6664,12 +6664,12 @@
 - project: openstack/python-keystoneclient-kerberos
   description: RETIRED, Kerberos authentication plugins for OpenStack clients.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-kingbirdclient
+- project: x/python-kingbirdclient
   description: Python client for Kingbird
   groups:
     - kingbird
-  acl-config: /home/gerrit2/acls/openstack/kingbird.config
-- project: openstack/python-kiteclient
+  acl-config: /home/gerrit2/acls/x/kingbird.config
+- project: x/python-kiteclient
   description: RETIRED, Python bindings to Kite.
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/python-magnetodbclient
@@ -6689,19 +6689,19 @@
 - project: openstack/python-masakariclient
   description: Python client for Masakari REST API.
   acl-config: /home/gerrit2/acls/openstack/masakari.config
-- project: openstack/python-meteosclient
+- project: x/python-meteosclient
   description: Python client for Meteos REST API.
   groups:
     - meteos
-  acl-config: /home/gerrit2/acls/openstack/meteos.config
+  acl-config: /home/gerrit2/acls/x/meteos.config
 - project: openstack/python-mistralclient
   description: Python client for Mistral REST API.
   groups:
     - mistral
   acl-config: /home/gerrit2/acls/openstack/mistral.config
-- project: openstack/python-moganclient
+- project: x/python-moganclient
   description: Python client library for Mogan REST API.
-  acl-config: /home/gerrit2/acls/openstack/mogan.config
+  acl-config: /home/gerrit2/acls/x/mogan.config
 - project: openstack/python-monascaclient
   description: Python client for Monasca REST API.
   groups:
@@ -6713,9 +6713,9 @@
   acl-config: /home/gerrit2/acls/openstack/murano.config
   options:
     - translate
-- project: openstack/python-namosclient
+- project: x/python-namosclient
   description: Client library for Namos API.
-  acl-config: /home/gerrit2/acls/openstack/namos.config
+  acl-config: /home/gerrit2/acls/x/namos.config
   groups:
     - namos
 - project: openstack/python-neutron-pd-driver
@@ -6736,7 +6736,7 @@
   groups:
     - octavia
   use-storyboard: true
-- project: openstack/python-oneviewclient
+- project: x/python-oneviewclient
   description: Python client for HP OneView.
 - project: openstack/python-openstackclient
   description: Client for OpenStack services
@@ -6745,26 +6745,26 @@
   use-storyboard: true
   groups:
     - openstackclient
-- project: openstack/python-opentsdbclient
+- project: x/python-opentsdbclient
   description: A simple REST client to communicate with OpenTSDB (needed for Gnocchi
     to use OpenTSDB as a backend)
 - project: openstack/python-pankoclient
   description: Client library for Panko API
   acl-config: /home/gerrit2/acls/openstack/panko.config
-- project: openstack/python-picassoclient
+- project: x/python-picassoclient
   description: Python client for Picasso API
   groups: picasso
-  acl-config: /home/gerrit2/acls/openstack/picasso.config
+  acl-config: /home/gerrit2/acls/x/picasso.config
 - project: openstack/python-qinlingclient
   use-storyboard: true
   description: Python client for Qinling REST API.
   acl-config: /home/gerrit2/acls/openstack/qinling.config
-- project: openstack/python-rackclient
+- project: x/python-rackclient
   description: RETIRED, Client library for RACK API
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-redfish
+- project: x/python-redfish
   description: Python library and client for Redfish support
-- project: openstack/python-rsdclient
+- project: x/python-rsdclient
   description: Python client for Rack Scale Design
   acl-config: /home/gerrit2/acls/openstack/rsd.config
 - project: openstack/python-saharaclient
@@ -6772,7 +6772,7 @@
   groups:
     - sahara
   description: Python bindings and CLI for Sahara.
-- project: openstack/python-scciclient
+- project: x/python-scciclient
   description: Python ServerView Common Command Interface (SCCI) Client Library
 - project: openstack/python-searchlightclient
   description: OpenStack Search (Searchlight) Client
@@ -6790,20 +6790,20 @@
   acl-config: /home/gerrit2/acls/openstack/solum.config
   options:
     - translate
-- project: openstack/python-sticksclient
+- project: x/python-sticksclient
   description: RETIRED, Python client library for sticks API
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-surveilclient
+- project: x/python-surveilclient
   description: Client library for surveil API.
-  acl-config: /home/gerrit2/acls/openstack/surveil.config
+  acl-config: /home/gerrit2/acls/x/surveil.config
 - project: openstack/python-swiftclient
   description: OpenStack Storage (Swift) Client
 - project: openstack/python-tackerclient
   description: NFV Orchestration (Tacker) Client
   acl-config: /home/gerrit2/acls/openstack/tacker.config
-- project: openstack/python-tatuclient
+- project: x/python-tatuclient
   description: SSH as a Service (Tatu) Client
-  acl-config: /home/gerrit2/acls/openstack/tatu.config
+  acl-config: /home/gerrit2/acls/x/tatu.config
 - project: openstack/python-tempestconf
   description: Automatic Tempest Configuration Generator
   groups:
@@ -6821,12 +6821,12 @@
   description: OpenStack Database as a Service (Trove) Client
   groups:
     - trove
-- project: openstack/python-tuskarclient
+- project: x/python-tuskarclient
   description: RETIRED, Python bindings and CLI to Tuskar.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/python-valenceclient
+- project: x/python-valenceclient
   description: Client library for Valence API.
-  acl-config: /home/gerrit2/acls/openstack/valence.config
+  acl-config: /home/gerrit2/acls/x/valence.config
 - project: openstack/python-vitrageclient
   description: Vitrage API Client library.
   use-storyboard: true
@@ -6858,16 +6858,16 @@
     - qinling
   options:
     - translate
-- project: openstack/quark
+- project: x/quark
   description: Highly performant and scalable Neutron plugin.
   groups:
     - neutron-quark
-- project: openstack/rack
+- project: x/rack
   description: RETIRED, Provides the ability that can control OpenStack as program
     resource with an application. It enables you to implement a large scale distributed
     system in a variety of programming languages on OpenStack.
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/radar
+- project: x/radar
   description: dashboard for ci reporting
 - project: openstack/rally
   description: Rally provides a framework for performance analysis and benchmarking
@@ -6878,19 +6878,19 @@
     platform.
   groups:
     - rally
-- project: openstack/ramdisk-func-test
+- project: x/ramdisk-func-test
   description: Functional testing framework for deployment ramdisks (e.g. Bareon)
-  acl-config: /home/gerrit2/acls/openstack/bareon.config
+  acl-config: /home/gerrit2/acls/x/bareon.config
   groups:
     - bareon
-- project: openstack/ranger
+- project: x/ranger
   description: Resource Management API Framework
   groups:
     - ranger
   use-storyboard: true
-- project: openstack/ranger-agent
+- project: x/ranger-agent
   description: A Resource Distributor API Framework
-  acl-config: /home/gerrit2/acls/openstack/ranger.config
+  acl-config: /home/gerrit2/acls/x/ranger.config
   groups:
     - ranger-agent
   use-storyboard: true
@@ -6933,7 +6933,7 @@
   use-storyboard: true
   groups:
     - release
-- project: openstack/requests-mock
+- project: x/requests-mock
   acl-config: /home/gerrit2/acls/openstack/retired.config
   description: RETIRED, continues at github.com:jamielennox/requests-mock
 - project: openstack/requirements
@@ -6946,10 +6946,10 @@
   acl-config: /home/gerrit2/acls/openstack/rpm-packaging.config
   groups:
     - rpm-packaging
-- project: openstack/rsd-lib
+- project: x/rsd-lib
   description: Python library for Rack Scale Design
   acl-config: /home/gerrit2/acls/openstack/rsd.config
-- project: openstack/rsd-virt-for-nova
+- project: x/rsd-virt-for-nova
   description: Nova virt driver for Rack Scale Design
 - project: openstack/rst2bash
   description: RETIRED, Parser to automatically parse install guides RST to Bash.
@@ -6963,7 +6963,7 @@
     nodes hardware details and a few more.
   options:
     - translate
-- project: openstack/sahara-ci-config
+- project: x/sahara-ci-config
   description: Sahara-ci 3rd party testing configs (jjb, zuul, etc.)
 - project: openstack/sahara-dashboard
   use-storyboard: true
@@ -7078,10 +7078,10 @@
 - project: openstack/salt-formula-swift
   description: RETIRED, Swift salt formula
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/sardonic
+- project: sardonic/sardonic
   description: A hardware inventory system
   use-storyboard: true
-- project: openstack/scalpels
+- project: x/scalpels
   description: Digging and Tracing system for OpenStack
 - project: openstack/scientific-wg
   description: Scientific Working Group documents
@@ -7132,59 +7132,59 @@
   acl-config: /home/gerrit2/acls/openstack/senlin.config
 - project: openstack/service-types-authority
   description: OpenStack Service Types Authority
-- project: openstack/shaker
+- project: performa/shaker
   description: Distributed data-plane performance testing tool
 - project: openstack/shotgun
   description: Tool for collecting diagnostic snapshot from nodes (logs, databases,
     etc).
-- project: openstack/shovel
+- project: x/shovel
   description: RackHD and OpenStack Coordinator
-- project: openstack/shovel-horizon
+- project: x/shovel-horizon
   description: Shovel plugin for OpenStack Horizon dashboard
-- project: openstack/slogging
+- project: x/slogging
   description: A stats system for OpenStack Swift
   use-storyboard: true
-- project: openstack/snap-ceilometer
+- project: x/snap-ceilometer
   description: Snap package for Ceilometer
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-cinder
+- project: x/snap-cinder
   description: Snap package for Cinder
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-glance
+- project: x/snap-glance
   description: Snap package for Glance
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-gnocchi
+- project: x/snap-gnocchi
   description: Snap package for Gnocchi
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-keystone
+- project: x/snap-keystone
   description: Snap package for Keystone
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-neutron
+- project: x/snap-neutron
   description: Snap package for Neutron
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-nova
+- project: x/snap-nova
   description: Snap package for Nova
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-nova-hypervisor
+- project: x/snap-nova-hypervisor
   description: Snap package for Nova (Hypervisor)
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-openstackclients
+- project: x/snap-openstackclients
   description: Snap package for all OpenStack client tools
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-rally
+- project: x/snap-rally
   description: Snap package for Rally
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap-tempest
+- project: x/snap-tempest
   description: Snap package for Tempest
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/snap.openstack
+- project: x/snap.openstack
   description: Tools for writing OpenStack Snap packages
   acl-config: /home/gerrit2/acls/openstack/snaps.config
-- project: openstack/solar
+- project: x/solar
   description: Resource management and orchestration engine for distributed systems
-- project: openstack/solar-resources
+- project: x/solar-resources
   description: Resource definitions and example deployments for Solar
-  acl-config: /home/gerrit2/acls/openstack/solar.config
+  acl-config: /home/gerrit2/acls/x/solar.config
   groups:
     - solar
 - project: openstack/solum
@@ -7206,76 +7206,76 @@
 - project: openstack/solum-tempest-plugin
   description: Tempest plugin for the solum project.
   acl-config: /home/gerrit2/acls/openstack/solum.config
-- project: openstack/spanner
+- project: x/spanner
   description: Operation dashboard for OpenStack
 - project: openstack/sphinx-feature-classification
   use-storyboard: true
   description: Common feature classification documentation frameworks
-- project: openstack/sqlalchemy-migrate
+- project: x/sqlalchemy-migrate
   description: Database schema migration for SQLAlchemy
-- project: openstack/stackalytics
+- project: x/stackalytics
   description: OpenStack analytics dashboard
-- project: openstack/stacklight-integration-tests
+- project: x/stacklight-integration-tests
   groups:
     - lma-toolchain
   description: Integration tests for StackLight plugins
   docimpact-group: lma-toolchain
-- project: openstack/stacktach
+- project: x/stacktach
   description: Event-based Debugging, Monitoring and Billing solution for OpenStack.
-- project: openstack/stacktach-klugman
+- project: x/stacktach-klugman
   description: Cmdline tool and client library for StackTach.v3
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-notification-utils
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-notification-utils
   description: Utility library for working with OpenStack notifications.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-notigen
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-notigen
   description: OpenStack-like notification generator/simulator.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-quince
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-quince
   description: Quincy-compliant API implemenation for StackTach.v3. Works with Winchester.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-quincy
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-quincy
   description: REST interface to StackTach.v3
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-sandbox
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-sandbox
   description: DevStack-like environment for StackTach.v3
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-shoebox
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-shoebox
   description: Binary data archiving library - supports uploading to object storage.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-simport
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-simport
   description: Simple import library for Python (not entry-point based)
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-stackdistiller
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-stackdistiller
   description: A data extraction and transformation library for OpenStack notifications.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-timex
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-timex
   description: A time expressions library implementing a mini-language for manipulating
     datetimes.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stacktach-winchester
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stacktach-winchester
   description: An notification event processing library based on persistent streams.
-  acl-config: /home/gerrit2/acls/openstack/stacktach.config
-- project: openstack/stackube
+  acl-config: /home/gerrit2/acls/x/stacktach.config
+- project: x/stackube
   description: Integrate OpenStack projects with Kubernetes for multi-tenancy.
 - project: openstack/stackviz
   description: Performance and debugging visualization for DevStack and Tempest
-- project: openstack/steth
+- project: x/steth
   description: Networking Debug Tool for OpenStack
 - project: openstack/stevedore
   groups:
     - python-stevedore
   description: Manage dynamic plugins for Python applications
-- project: openstack/sticks
+- project: x/sticks
   description: RETIRED, Cerberus ticket manager plugin
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/sticks-dashboard
+- project: x/sticks-dashboard
   description: RETIRED, Sticks Horizon Plugin
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/storlets
   description: Middleware and Compute Engine for an OpenStack Swift compute framework
     that runs compute within a Swift cluster
-- project: openstack/stx-clients
+- project: starlingx/clients
   description: StarlingX client libraries
   use-storyboard: true
   groups:
@@ -7283,7 +7283,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-clients
-- project: openstack/stx-config
+- project: starlingx/config
   description: StarlingX System Configuration Management
   use-storyboard: true
   groups:
@@ -7291,7 +7291,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-config
-- project: openstack/stx-distcloud
+- project: starlingx/distcloud
   description: StarlingX Distributed Cloud
   use-storyboard: true
   groups:
@@ -7299,7 +7299,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-distcloud
-- project: openstack/stx-distcloud-client
+- project: starlingx/distcloud-client
   description: StarlingX Distributed Cloud Client
   use-storyboard: true
   groups:
@@ -7307,7 +7307,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-distcloud-client
-- project: openstack/stx-docs
+- project: starlingx/docs
   description: StarlingX Documentation
   use-storyboard: true
   groups:
@@ -7315,7 +7315,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-docs
-- project: openstack/stx-fault
+- project: starlingx/fault
   description: StarlingX Fault Management
   use-storyboard: true
   groups:
@@ -7323,7 +7323,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-fault
-- project: openstack/stx-governance
+- project: starlingx/governance
   description: StarlingX Governance Documentation
   use-storyboard: true
   groups:
@@ -7331,7 +7331,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-governance
-- project: openstack/stx-gplv2
+- project: starlingx/gplv2
   description: StarlingX GPLv2 licensed upstream packaging
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/starlingx.config
@@ -7340,7 +7340,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-gplv2
-- project: openstack/stx-gplv3
+- project: starlingx/gplv3
   description: StarlingX GPLv3 licensed upstream packaging
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/starlingx.config
@@ -7349,7 +7349,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-gplv3
-- project: openstack/stx-gui
+- project: starlingx/gui
   description: StarlingX Horizon plugins for new StarlingX services
   use-storyboard: true
   groups:
@@ -7357,7 +7357,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-gui
-- project: openstack/stx-ha
+- project: starlingx/ha
   description: StarlingX High Availability/Process Monitoring/Service Management
   use-storyboard: true
   groups:
@@ -7365,7 +7365,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-ha
-- project: openstack/stx-integ
+- project: starlingx/integ
   description: StarlingX Integration and packaging
   use-storyboard: true
   groups:
@@ -7373,7 +7373,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-integ
-- project: openstack/stx-manifest
+- project: starlingx/manifest
   description: StarlingX source manifest to manage the repositories
   use-storyboard: true
   groups:
@@ -7381,7 +7381,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-manifest
-- project: openstack/stx-metal
+- project: starlingx/metal
   description: StarlingX Bare Metal and Node Management, Hardware Maintenance
   use-storyboard: true
   groups:
@@ -7389,7 +7389,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-metal
-- project: openstack/stx-nfv
+- project: starlingx/nfv
   description: StarlingX NFVI Orchestration
   use-storyboard: true
   groups:
@@ -7397,7 +7397,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-nfv
-- project: openstack/stx-root
+- project: starlingx/root
   description: StarlingX build source tree root
   use-storyboard: true
   groups:
@@ -7405,14 +7405,14 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-root
-- project: openstack/stx-specs
+- project: starlingx/specs
   description: StarlingX Specifications
   groups:
     - starlingx
   cgit-alias:
     site: git.starlingx.io
     path: stx-specs
-- project: openstack/stx-test
+- project: starlingx/test
   description: StarlingX Test tools
   use-storyboard: true
   groups:
@@ -7420,7 +7420,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-test
-- project: openstack/stx-tis-repo
+- project: starlingx/tis-repo
   description: StarlingX build support
   use-storyboard: true
   groups:
@@ -7428,7 +7428,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-tis-repo
-- project: openstack/stx-tools
+- project: starlingx/tools
   description: StarlingX build tools
   use-storyboard: true
   groups:
@@ -7436,7 +7436,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-tools
-- project: openstack/stx-update
+- project: starlingx/update
   description: StarlingX Installation/Update/Patching/Backup/Restore
   use-storyboard: true
   groups:
@@ -7444,7 +7444,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-update
-- project: openstack/stx-upstream
+- project: starlingx/upstream
   description: StarlingX Upstream packaging
   use-storyboard: true
   groups:
@@ -7452,7 +7452,7 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-upstream
-- project: openstack/stx-utils
+- project: starlingx/utils
   description: StarlingX Logging and other utilities
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack/starlingx.config
@@ -7461,11 +7461,11 @@
   cgit-alias:
     site: git.starlingx.io
     path: stx-utils
-- project: openstack/surveil
+- project: x/surveil
   description: Monitoring as a Service for OpenStack
-- project: openstack/surveil-specs
+- project: x/surveil-specs
   description: Blueprints for Surveil
-  acl-config: /home/gerrit2/acls/openstack/surveil.config
+  acl-config: /home/gerrit2/acls/x/surveil.config
 - project: openstack/sushy
   description: Sushy is a small Python library to communicate with Redfish based
     systems
@@ -7477,7 +7477,7 @@
   use-storyboard: true
   groups:
     - ironic
-- project: openstack/swauth
+- project: x/swauth
   description: An alternative authentication system for Swift
 - project: openstack/swift
   description: OpenStack Storage (Swift)
@@ -7485,27 +7485,27 @@
     - translate
 - project: openstack/swift-bench
   description: Benchmarking tool for OpenStack Swift
-- project: openstack/swift-ceph-backend
+- project: x/swift-ceph-backend
   description: Ceph backend for Swift
 - project: openstack/swift-specs
   groups:
     - swift
   description: OpenStack Storage (Swift) Specifications
-- project: openstack/swift3
+- project: x/swift3
   description: Swift3 Middleware for OpenStack Swift, allowing access to OpenStack
     swift via the Amazon S3 API.
-- project: openstack/swiftonfile
+- project: x/swiftonfile
   description: Swift Object Server implementation that enables objects created using
     the Swift API to be accessed as files on a POSIX filesystem.
-- project: openstack/swiftonhpss
+- project: x/swiftonhpss
   description: Swift Object Server implementation that enables objects created using
     the Swift API to be accessed as files on a High Performance Storage System (HPSS)
     mount point.
-- project: openstack/synergy-scheduler-manager
+- project: x/synergy-scheduler-manager
   description: Provide advanced scheduling capability for OpenStack using a fairshare
     algorithm. This is a manager for synergy-service.
   acl-config: /home/gerrit2/acls/openstack/synergy.config
-- project: openstack/synergy-service
+- project: x/synergy-service
   description: Synergy is an extensible general purpose management service for OpenStack.
     Its capabilities are implemented by a collection of managers. It can be used
     to implement advanced scheduling mechanisms to maximize the overall resource
@@ -7531,25 +7531,25 @@
   description: NFV Orchestration (Tacker) Specifications
   groups:
     - tacker
-- project: openstack/tap-as-a-service
+- project: x/tap-as-a-service
   description: Tap-as-a-Service is a project to introduce the functionality of port
     mirroring in OpenStack Neutron provisioned networks.
-- project: openstack/tap-as-a-service-dashboard
+- project: x/tap-as-a-service-dashboard
   description: Tap-as-a-Service Horizon plugin.
-  acl-config: /home/gerrit2/acls/openstack/tap-as-a-service.config
-- project: openstack/tap-as-a-service-tempest-plugin
+  acl-config: /home/gerrit2/acls/x/tap-as-a-service.config
+- project: x/tap-as-a-service-tempest-plugin
   description: Tempest Plugin for tap-as-a-service project
-  acl-config: /home/gerrit2/acls/openstack/tap-as-a-service.config
+  acl-config: /home/gerrit2/acls/x/tap-as-a-service.config
 - project: openstack/taskflow
   description: A library to complete workflows/tasks in HA manner
-- project: openstack/tatu
+- project: x/tatu
   description: SSH (Certificate Management and Bastions) as a Service
-- project: openstack/tatu-dashboard
+- project: x/tatu-dashboard
   description: SSH as a Service (Tatu) Horizon Plugin
-  acl-config: /home/gerrit2/acls/openstack/tatu.config
-- project: openstack/tc-as-a-service
+  acl-config: /home/gerrit2/acls/x/tatu.config
+- project: x/tc-as-a-service
   description: TC-as-a-Service provides traffic control in OpenStack Neutron
-- project: openstack/telcowg-usecases
+- project: x/telcowg-usecases
   description: Use case repo for Telco Working Group
   groups:
     - openstack-telcowg
@@ -7589,15 +7589,15 @@
   use-storyboard: true
   groups:
     - ironic
-- project: openstack/terracotta
+- project: x/terracotta
   description: Dynamic resource scheduling service for OpenStack cloud.
-- project: openstack/third-party-ci-tools
+- project: x/third-party-ci-tools
   description: Repository for third party continuous integration teams to share
     tools, configurations, plug-ins and documents.
-- project: openstack/timmy
+- project: x/timmy
   description: 'OpenStack Ansible-like tool for parallel node operations: two-way
     data transfer, log collection, remote command execution'
-- project: openstack/tobiko
+- project: x/tobiko
   description: Testing OpenStack upgrades
   use-storyboard: true
 - project: openstack/tooz
@@ -7623,7 +7623,7 @@
   description: OpenStack Foundation Transparency Policy.
 - project: openstack/tricircle
   description: Tricircle is to provide networking automation across Neutron.
-- project: openstack/trio2o
+- project: x/trio2o
   description: Trio2o is to provide APIs gateway for multiple OpenStack clouds to
     act as a single OpenStack cloud.
 - project: openstack/tripleo-ansible
@@ -7724,7 +7724,7 @@
     - translate
   groups:
     - trove
-- project: openstack/trove-image-builder
+- project: x/trove-image-builder
   description: RETIRED, Tools to build guest images for Trove.
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/trove-integration
@@ -7747,12 +7747,12 @@
   docimpact-group: fuel
   options:
     - delay-release
-- project: openstack/turbo-hipster
+- project: x/turbo-hipster
   description: A generic zuul worker using the gearman protocol.
-- project: openstack/tuskar
+- project: x/tuskar
   description: RETIRED, A service for managing OpenStack deployments
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack/tuskar-ui
+- project: x/tuskar-ui
   description: RETIRED, The UI component for Tuskar
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack/uc-recognition
@@ -7764,16 +7764,16 @@
     upstream contribution
   groups:
     - openstack-upstream-institute-virtual-environment
-- project: openstack/vahana
+- project: x/vahana
   description: OpenStack Client libraries for iOS
-- project: openstack/valence
+- project: x/valence
   description: Lifecycle management service for pooled bare-metal infrastructure.
   groups:
     - openstack-valence
-- project: openstack/valence-specs
+- project: x/valence-specs
   description: Valence Design Specifications
-  acl-config: /home/gerrit2/acls/openstack/valence.config
-- project: openstack/valet
+  acl-config: /home/gerrit2/acls/x/valence.config
+- project: x/valet
   description: A holistic Resource Placement Optimization Service
   groups:
     - valet
@@ -7783,7 +7783,7 @@
   use-storyboard: true
   groups:
     - ironic
-- project: openstack/virtualpdu
+- project: x/virtualpdu
   description: VirtualPDU is a service for simulating power distribution units (PDUs).
   use-storyboard: true
   groups:
@@ -7809,19 +7809,19 @@
   groups:
     - vitrage
   acl-config: /home/gerrit2/acls/openstack/vitrage.config
-- project: openstack/vm-bm-wg
+- project: x/vm-bm-wg
   description: VM and Baremetal Working Group
-- project: openstack/vmtp
+- project: x/vmtp
   description: A data path performance tool for OpenStack clouds.
-- project: openstack/vmware-nsx
+- project: x/vmware-nsx
   description: A set of Neutron drivers for the VMware NSX.
-- project: openstack/vmware-nsx-tempest-plugin
+- project: x/vmware-nsx-tempest-plugin
   description: A Tempest plugin to test Neutron VMware NSX plugin.
-  acl-config: /home/gerrit2/acls/openstack/vmware-nsx.config
-- project: openstack/vmware-nsxlib
+  acl-config: /home/gerrit2/acls/x/vmware-nsx.config
+- project: x/vmware-nsxlib
   description: A common library that interfaces with VMware NSX.
-  acl-config: /home/gerrit2/acls/openstack/vmware-nsx.config
-- project: openstack/vmware-vspc
+  acl-config: /home/gerrit2/acls/x/vmware-nsx.config
+- project: x/vmware-vspc
   description: Virtual Serial Port Concentrator for VMware instances
 - project: openstack/watcher
   description: Resource optimization service for OpenStack.
@@ -7843,27 +7843,27 @@
   groups:
     - documentation
   use-storyboard: true
-- project: openstack/whitebox-tempest-plugin
+- project: x/whitebox-tempest-plugin
   description: Tempest plugin for whitebox testing. For testing things not exposed
     through the REST APIs.
-- project: openstack/windmill
+- project: windmill/windmill
   description: An Ansible deployment to validate ansible roles for Continuous Integration.
-- project: openstack/windmill-backup
+- project: windmill/windmill-backup
   description: An Ansible deployment to manage backups for Windmill.
-- project: openstack/windmill-config
+- project: windmill/windmill-config
   description: Ansible inventory and configuration content for Windmill.
-- project: openstack/windmill-ops
+- project: windmill/windmill-ops
   description: Operations-related content for Windmill.
 - project: openstack/workload-ref-archs
   description: OpenStack tenant-level workload reference architectures.
   groups:
     - enterprise-wg
   use-storyboard: true
-- project: openstack/wsme
+- project: x/wsme
   description: Web Service Made Easy (WSME) simplify the writing of REST web services
     by providing simple yet powerful typing which removes the need to directly manipulate
     the request and the response objects.
-- project: openstack/xenapi-os-testing
+- project: x/xenapi-os-testing
   description: Scripts to enable running of tempest tests in a nested Xen instance
 - project: openstack/xstatic-angular
   description: Angular JavaScript library packaged as XStatic.
@@ -7871,10 +7871,10 @@
 - project: openstack/xstatic-angular-bootstrap
   description: Angular Bootstrap JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-angular-cookies
+- project: x/xstatic-angular-cookies
   description: Angular-Cookies JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-angular-fileupload
+- project: x/xstatic-angular-fileupload
   description: Angular-FileUpload JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
 - project: openstack/xstatic-angular-gettext
@@ -7886,13 +7886,13 @@
 - project: openstack/xstatic-angular-material
   description: Angular Material JavaScript library packed as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-angular-mock
+- project: x/xstatic-angular-mock
   description: Angular-Mock JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
 - project: openstack/xstatic-angular-notify
   description: Angular Notify JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-angular-sanitize
+- project: x/xstatic-angular-sanitize
   description: Angular Sanitize JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
 - project: openstack/xstatic-angular-smart-table
@@ -7934,7 +7934,7 @@
 - project: openstack/xstatic-jquery-migrate
   description: Migrate jQuery plugin packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-jquery.bootstrap.wizard
+- project: x/xstatic-jquery.bootstrap.wizard
   description: Bootstrap.Wizard jQuery plugin packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
 - project: openstack/xstatic-jquery.quicksearch
@@ -7958,7 +7958,7 @@
 - project: openstack/xstatic-mdi
   description: Google Material Design Icons packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
-- project: openstack/xstatic-qunit
+- project: x/xstatic-qunit
   description: QUnit JavaScript library packaged as XStatic.
   acl-config: /home/gerrit2/acls/openstack/xstatic.config
 - project: openstack/xstatic-rickshaw
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 7b1ba070c7..45a0ca5576 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -13,10 +13,10 @@ ara:
     - patchset-created
     - change-merged
   projects:
-    - openstack/ansible-role-ara
-    - openstack/ara
-    - openstack/ara-infra
-    - openstack/ara-web
+    - recordsansible/ansible-role-ara
+    - recordsansible/ara
+    - recordsansible/ara-infra
+    - recordsansible/ara-web
   branches:
     - master
     - feature/1.0
@@ -53,7 +53,7 @@ fuel-tracker:
     - change-merged
   projects:
     - ^openstack/fuel.*
-    - openstack/network-checker
+    - x/network-checker
     - openstack/python-fuelclient
     - openstack/shotgun
     - openstack/tuning-box
@@ -65,8 +65,8 @@ git-upstream:
     - patchset-created
     - change-merged
   projects:
-    - openstack/fixtures-git
-    - openstack/git-upstream
+    - x/fixtures-git
+    - x/git-upstream
   branches:
     - master
 
@@ -75,7 +75,7 @@ heat:
     - patchset-created
     - change-merged
   projects:
-    - openstack-dev/heat-cfnclient
+    - openstack/heat-cfnclient
     - openstack/heat
     - openstack/heat-agents
     - openstack/heat-cfntools
@@ -92,9 +92,9 @@ midonet:
     - patchset-created
     - change-merged
   projects:
-    - openstack/fuel-plugin-midonet
+    - x/fuel-plugin-midonet
     - openstack/networking-midonet
-    - openstack/puppet-midonet
+    - x/puppet-midonet
   branches:
     - master
 
@@ -108,7 +108,7 @@ murano:
     - openstack/murano-apps
     - openstack/murano-dashboard
     - openstack/murano-pkg-check
-    - openstack/murano-plugin-networking-sfc
+    - x/murano-plugin-networking-sfc
     - openstack/murano-specs
     - openstack/python-muranoclient
   branches:
@@ -129,163 +129,163 @@ opendev:
     - change-merged
   projects:
     - opendev/base-jobs
-    - openstack-dev/cookiecutter
-    - openstack-dev/hacking
-    - openstack-dev/openstack-nose
-    - openstack-dev/pbr
-    - openstack-dev/specs-cookiecutter
-    - openstack-infra/afsmon
+    - openstack/cookiecutter
+    - openstack/hacking
+    - openstack/openstack-nose
+    - openstack/pbr
+    - openstack/specs-cookiecutter
+    - opendev/afsmon
     - openstack-infra/ansible-build-image
-    - openstack-infra/ansible-role-puppet
-    - openstack-infra/askbot-theme
-    - openstack-infra/bindep
-    - openstack-infra/bugdaystats
-    - openstack-infra/ciwatch
-    - openstack-infra/devstack-gate
-    - openstack-infra/elastic-recheck
-    - openstack-infra/gear
-    - openstack-infra/gearman-plugin
-    - openstack-infra/germqtt
-    - openstack-infra/gerrit
-    - openstack-infra/gerritbot
-    - openstack-infra/gerritlib
-    - openstack-infra/git-restack
-    - openstack-infra/git-review
-    - openstack-infra/gitdm
-    - openstack-infra/glean
-    - openstack-infra/grafyaml
-    - openstack-infra/groups
-    - openstack-infra/groups-static-pages
-    - openstack-infra/infra-ansible
-    - openstack-infra/infra-manual
-    - openstack-infra/infra-specs
-    - openstack-infra/irc-meetings
-    - openstack-infra/jeepyb
-    - openstack-infra/lodgeit
-    - openstack-infra/log-classify
-    - openstack-infra/log_processor
-    - openstack-infra/logstash-filters
-    - openstack-infra/lpmqtt
-    - openstack-infra/meetbot
-    - openstack-infra/mqtt_statsd
-    - openstack-infra/nodepool
-    - openstack-infra/nose-html-output
-    - openstack-infra/odsreg
+    - opendev/ansible-role-puppet
+    - opendev/askbot-theme
+    - 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
+    - openstack/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-infra/openstack-zuul-jobs
-    - openstack-infra/openstack-zuul-roles
-    - openstack-infra/openstackid
-    - openstack-infra/openstackid-resources
-    - openstack-infra/openstackweb
-    - openstack-infra/os-loganalyze
-    - openstack-infra/project-config
-    - openstack-infra/project-config-example
-    - openstack-infra/publications
-    - openstack-infra/puppet-accessbot
-    - openstack-infra/puppet-ansible
-    - openstack-infra/puppet-apparmor
-    - 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-ciwatch
-    - openstack-infra/puppet-dashboard
-    - 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-infra-cookiecutter
-    - openstack-infra/puppet-infracloud
-    - openstack-infra/puppet-ipsilon
-    - 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-openafs
-    - openstack-infra/puppet-openstack_health
-    - openstack-infra/puppet-openstack_infra_spec_helper
-    - openstack-infra/puppet-openstackci
-    - 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-puppet
-    - 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-statusbot
-    - openstack-infra/puppet-storyboard
-    - openstack-infra/puppet-subunit2sql
-    - openstack-infra/puppet-sudoers
-    - openstack-infra/puppet-tmpreaper
-    - openstack-infra/puppet-translation_checksite
-    - openstack-infra/puppet-ulimit
-    - openstack-infra/puppet-unattended_upgrades
-    - openstack-infra/puppet-unbound
-    - openstack-infra/puppet-user
-    - openstack-infra/puppet-vcsrepo
-    - openstack-infra/puppet-yum
-    - openstack-infra/puppet-zanata
-    - openstack-infra/puppet-zuul
-    - openstack-infra/python-storyboardclient
-    - openstack-infra/reviewday
-    - openstack-infra/reviewstats
-    - openstack-infra/statusbot
-    - openstack-infra/storyboard
-    - openstack-infra/storyboard-webclient
-    - openstack-infra/subunit2sql
-    - openstack-infra/system-config
-    - openstack-infra/yaml2ical
-    - openstack-infra/zmq-event-publisher
+    - 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
+    - opendev/puppet-ansible
+    - opendev/puppet-apparmor
+    - opendev/puppet-askbot
+    - opendev/puppet-asterisk
+    - opendev/puppet-bandersnatch
+    - opendev/puppet-bugdaystats
+    - opendev/puppet-bup
+    - opendev/puppet-cgit
+    - opendev/puppet-ciwatch
+    - opendev/puppet-dashboard
+    - opendev/puppet-diskimage_builder
+    - opendev/puppet-drupal
+    - opendev/puppet-elastic_recheck
+    - opendev/puppet-elasticsearch
+    - opendev/puppet-ethercalc
+    - opendev/puppet-etherpad_lite
+    - opendev/puppet-exim
+    - opendev/puppet-germqtt
+    - opendev/puppet-gerrit
+    - opendev/puppet-gerritbot
+    - opendev/puppet-github
+    - opendev/puppet-grafyaml
+    - opendev/puppet-graphite
+    - opendev/puppet-haveged
+    - opendev/puppet-hound
+    - opendev/puppet-httpd
+    - opendev/puppet-infra-cookiecutter
+    - opendev/puppet-infracloud
+    - opendev/puppet-ipsilon
+    - opendev/puppet-iptables
+    - opendev/puppet-jeepyb
+    - opendev/puppet-jenkins
+    - opendev/puppet-kerberos
+    - opendev/puppet-kibana
+    - opendev/puppet-lodgeit
+    - opendev/puppet-log_processor
+    - opendev/puppet-logrotate
+    - opendev/puppet-logstash
+    - opendev/puppet-lpmqtt
+    - opendev/puppet-mailman
+    - opendev/puppet-mediawiki
+    - opendev/puppet-meetbot
+    - opendev/puppet-mosquitto
+    - opendev/puppet-mqtt_statsd
+    - opendev/puppet-mysql_backup
+    - opendev/puppet-nodepool
+    - opendev/puppet-openafs
+    - opendev/puppet-openstack_health
+    - opendev/puppet-openstack_infra_spec_helper
+    - opendev/puppet-openstackci
+    - opendev/puppet-openstackid
+    - opendev/puppet-os_client_config
+    - opendev/puppet-packagekit
+    - opendev/puppet-pgsql_backup
+    - opendev/puppet-phabricator
+    - opendev/puppet-pip
+    - opendev/puppet-planet
+    - opendev/puppet-project_config
+    - opendev/puppet-ptgbot
+    - opendev/puppet-puppet
+    - opendev/puppet-redis
+    - opendev/puppet-refstack
+    - opendev/puppet-reviewday
+    - opendev/puppet-simpleproxy
+    - opendev/puppet-snmpd
+    - opendev/puppet-ssh
+    - opendev/puppet-ssl_cert_check
+    - opendev/puppet-statusbot
+    - opendev/puppet-storyboard
+    - opendev/puppet-subunit2sql
+    - opendev/puppet-sudoers
+    - opendev/puppet-tmpreaper
+    - opendev/puppet-translation_checksite
+    - opendev/puppet-ulimit
+    - opendev/puppet-unattended_upgrades
+    - opendev/puppet-unbound
+    - opendev/puppet-user
+    - opendev/puppet-vcsrepo
+    - opendev/puppet-yum
+    - 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/zone-opendev.org
     - openstack-infra/zone-zuul-ci.org
-    - openstack-infra/zuul
-    - openstack-infra/zuul-base-jobs
-    - openstack-infra/zuul-jobs
-    - openstack-infra/zuul-preview
-    - openstack-infra/zuul-sphinx
-    - openstack-infra/zuul-website
-    - openstack-infra/zuul-website-media
-    - openstack/ansible-role-cloud-launcher
-    - openstack/boartty
+    - zuul/zuul
+    - zuul/zuul-base-jobs
+    - zuul/zuul-jobs
+    - zuul/zuul-preview
+    - zuul/zuul-sphinx
+    - zuul/zuul-website
+    - zuul/zuul-website-media
+    - x/ansible-role-cloud-launcher
+    - ttygroup/boartty
     - openstack/diskimage-builder
-    - openstack/gertty
+    - ttygroup/gertty
     - openstack/os-performance-tools
     - openstack/os-testr
     - openstack/ptgbot
@@ -314,7 +314,7 @@ openstack-ailuropoda:
     - patchset-created
     - change-merged
   projects:
-    - openstack/ailuropoda
+    - x/ailuropoda
   branches:
     - master
 
@@ -323,9 +323,9 @@ openstack-almanach:
     - patchset-created
     - change-merged
   projects:
-    - openstack/almanach
+    - x/almanach
     - openstack/openstack-ansible-os_almanach
-    - openstack/python-almanachclient
+    - x/python-almanachclient
   branches:
     - master
 
@@ -344,7 +344,7 @@ openstack-ansible:
     - openstack/ansible-role-systemd_networkd
     - openstack/ansible-role-systemd_service
     - openstack/ansible-role-thales-hsm
-    - openstack/monitorstack
+    - x/monitorstack
   branches:
     - ^stable/.*
     - master
@@ -388,13 +388,13 @@ openstack-bareon:
     - patchset-created
     - change-merged
   projects:
-    - openstack/bareon
-    - openstack/bareon-allocator
-    - openstack/bareon-api
-    - openstack/bareon-image-elements
-    - openstack/bareon-ironic
-    - openstack/bareon-specs
-    - openstack/ramdisk-func-test
+    - x/bareon
+    - x/bareon-allocator
+    - x/bareon-api
+    - x/bareon-image-elements
+    - x/bareon-ironic
+    - x/bareon-specs
+    - x/ramdisk-func-test
   branches:
     - master
 
@@ -403,8 +403,8 @@ openstack-bilean:
     - patchset-created
     - change-merged
   projects:
-    - openstack/bilean
-    - openstack/python-bileanclient
+    - x/bilean
+    - x/python-bileanclient
   branches:
     - master
 
@@ -427,7 +427,7 @@ openstack-browbeat:
     - patchset-created
     - change-merged
   projects:
-    - openstack/browbeat
+    - x/browbeat
   branches:
     - master
 
@@ -477,8 +477,8 @@ openstack-cloudpulse:
     - patchset-created
     - change-merged
   projects:
-    - openstack/cloudpulse
-    - openstack/python-cloudpulseclient
+    - x/cloudpulse
+    - x/python-cloudpulseclient
   branches:
     - master
 
@@ -487,7 +487,7 @@ openstack-coats:
     - patchset-created
     - change-merged
   projects:
-    - openstack/coats
+    - x/coats
   branches:
     - master
     - ^stable/.*
@@ -497,8 +497,8 @@ openstack-cognitive:
     - patchset-created
     - change-merged
   projects:
-    - openstack/cognitive
-    - openstack/python-cognitiveclient
+    - x/cognitive
+    - x/python-cognitiveclient
   branches:
     - master
 
@@ -591,9 +591,9 @@ openstack-dpm:
     - patchset-created
     - change-merged
   projects:
-    - openstack/networking-dpm
-    - openstack/nova-dpm
-    - openstack/os-dpm
+    - x/networking-dpm
+    - x/nova-dpm
+    - x/os-dpm
   branches:
     - master
 
@@ -611,7 +611,7 @@ openstack-ekko:
     - patchset-created
     - change-merged
   projects:
-    - openstack/ekko
+    - x/ekko
   branches:
     - master
 
@@ -620,7 +620,7 @@ openstack-entropy:
     - patchset-created
     - change-merged
   projects:
-    - openstack/entropy
+    - x/entropy
   branches:
     - master
 
@@ -629,9 +629,9 @@ openstack-fenix:
     - patchset-created
     - change-merged
   projects:
-    - openstack/fenix
-    - openstack/puppet-fenix
-    - openstack/python-fenixclient
+    - x/fenix
+    - x/puppet-fenix
+    - x/python-fenixclient
   branches:
     - master
 
@@ -640,7 +640,7 @@ openstack-foxnut:
     - patchset-created
     - change-merged
   projects:
-    - openstack/foxnut
+    - x/foxnut
   branches:
     - master
 
@@ -665,8 +665,8 @@ openstack-functions:
     - patchset-created
     - change-merged
   projects:
-    - openstack/picasso
-    - openstack/python-picassoclient
+    - x/picasso
+    - x/python-picassoclient
   branches:
     - master
 
@@ -685,11 +685,11 @@ openstack-gbp:
     - patchset-created
     - change-merged
   projects:
-    - openstack/group-based-policy
-    - openstack/group-based-policy-automation
-    - openstack/group-based-policy-specs
-    - openstack/group-based-policy-ui
-    - openstack/python-group-based-policy-client
+    - x/group-based-policy
+    - x/group-based-policy-automation
+    - x/group-based-policy-specs
+    - x/group-based-policy-ui
+    - x/python-group-based-policy-client
   branches:
     - master
 
@@ -710,10 +710,10 @@ openstack-golang:
     - patchset-created
     - change-merged
   projects:
-    - openstack/docker-machine-openstack
-    - openstack/golang-client
-    - openstack/golang-commons
-    - openstack/k8s-cloud-provider
+    - x/docker-machine-openstack
+    - x/golang-client
+    - x/golang-commons
+    - x/k8s-cloud-provider
   branches:
     - master
 
@@ -723,8 +723,8 @@ openstack-ha:
     - change-merged
   projects:
     - openstack/ha-guide
-    - openstack/openstack-resource-agents
-    - openstack/openstack-resource-agents-specs
+    - x/openstack-resource-agents
+    - x/openstack-resource-agents-specs
   branches:
     - master
 
@@ -757,13 +757,13 @@ openstack-horizon:
     - openstack/ui-cookiecutter
     - openstack/xstatic-angular
     - openstack/xstatic-angular-bootstrap
-    - openstack/xstatic-angular-cookies
-    - openstack/xstatic-angular-fileupload
+    - x/xstatic-angular-cookies
+    - x/xstatic-angular-fileupload
     - openstack/xstatic-angular-lrdragndrop
     - openstack/xstatic-angular-material
-    - openstack/xstatic-angular-mock
+    - x/xstatic-angular-mock
     - openstack/xstatic-angular-notify
-    - openstack/xstatic-angular-sanitize
+    - x/xstatic-angular-sanitize
     - openstack/xstatic-angular-smart-table
     - openstack/xstatic-angular-ui-router
     - openstack/xstatic-angular-uuid
@@ -777,7 +777,7 @@ openstack-horizon:
     - openstack/xstatic-hogan
     - openstack/xstatic-jasmine
     - openstack/xstatic-jquery-migrate
-    - openstack/xstatic-jquery.bootstrap.wizard
+    - x/xstatic-jquery.bootstrap.wizard
     - openstack/xstatic-jquery.quicksearch
     - openstack/xstatic-jquery.tablesorter
     - openstack/xstatic-js-yaml
@@ -785,7 +785,7 @@ openstack-horizon:
     - openstack/xstatic-json2yaml
     - openstack/xstatic-magic-search
     - openstack/xstatic-mdi
-    - openstack/xstatic-qunit
+    - x/xstatic-qunit
     - openstack/xstatic-rickshaw
     - openstack/xstatic-spin
     - openstack/xstatic-vis
@@ -797,11 +797,11 @@ openstack-hyper-v:
     - patchset-created
     - change-merged
   projects:
-    - openstack/compute-hyperv
+    - x/compute-hyperv
     - openstack/networking-hyperv
     - openstack/os-win
     - openstack/oswin-tempest-plugin
-    - openstack/python-hnvclient
+    - x/python-hnvclient
   branches:
     - master
 
@@ -821,163 +821,163 @@ openstack-infra:
     - change-merged
   projects:
     - opendev/base-jobs
-    - openstack-dev/cookiecutter
-    - openstack-dev/hacking
-    - openstack-dev/openstack-nose
-    - openstack-dev/pbr
-    - openstack-dev/specs-cookiecutter
-    - openstack-infra/afsmon
+    - openstack/cookiecutter
+    - openstack/hacking
+    - openstack/openstack-nose
+    - openstack/pbr
+    - openstack/specs-cookiecutter
+    - opendev/afsmon
     - openstack-infra/ansible-build-image
-    - openstack-infra/ansible-role-puppet
-    - openstack-infra/askbot-theme
-    - openstack-infra/bindep
-    - openstack-infra/bugdaystats
-    - openstack-infra/ciwatch
-    - openstack-infra/devstack-gate
-    - openstack-infra/elastic-recheck
-    - openstack-infra/gear
-    - openstack-infra/gearman-plugin
-    - openstack-infra/germqtt
-    - openstack-infra/gerrit
-    - openstack-infra/gerritbot
-    - openstack-infra/gerritlib
-    - openstack-infra/git-restack
-    - openstack-infra/git-review
-    - openstack-infra/gitdm
-    - openstack-infra/glean
-    - openstack-infra/grafyaml
-    - openstack-infra/groups
-    - openstack-infra/groups-static-pages
-    - openstack-infra/infra-ansible
-    - openstack-infra/infra-manual
-    - openstack-infra/infra-specs
-    - openstack-infra/irc-meetings
-    - openstack-infra/jeepyb
-    - openstack-infra/lodgeit
-    - openstack-infra/log-classify
-    - openstack-infra/log_processor
-    - openstack-infra/logstash-filters
-    - openstack-infra/lpmqtt
-    - openstack-infra/meetbot
-    - openstack-infra/mqtt_statsd
-    - openstack-infra/nodepool
-    - openstack-infra/nose-html-output
-    - openstack-infra/odsreg
+    - opendev/ansible-role-puppet
+    - opendev/askbot-theme
+    - 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
+    - openstack/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-infra/openstack-zuul-jobs
-    - openstack-infra/openstack-zuul-roles
-    - openstack-infra/openstackid
-    - openstack-infra/openstackid-resources
-    - openstack-infra/openstackweb
-    - openstack-infra/os-loganalyze
-    - openstack-infra/project-config
-    - openstack-infra/project-config-example
-    - openstack-infra/publications
-    - openstack-infra/puppet-accessbot
-    - openstack-infra/puppet-ansible
-    - openstack-infra/puppet-apparmor
-    - 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-ciwatch
-    - openstack-infra/puppet-dashboard
-    - 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-infra-cookiecutter
-    - openstack-infra/puppet-infracloud
-    - openstack-infra/puppet-ipsilon
-    - 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-openafs
-    - openstack-infra/puppet-openstack_health
-    - openstack-infra/puppet-openstack_infra_spec_helper
-    - openstack-infra/puppet-openstackci
-    - 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-puppet
-    - 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-statusbot
-    - openstack-infra/puppet-storyboard
-    - openstack-infra/puppet-subunit2sql
-    - openstack-infra/puppet-sudoers
-    - openstack-infra/puppet-tmpreaper
-    - openstack-infra/puppet-translation_checksite
-    - openstack-infra/puppet-ulimit
-    - openstack-infra/puppet-unattended_upgrades
-    - openstack-infra/puppet-unbound
-    - openstack-infra/puppet-user
-    - openstack-infra/puppet-vcsrepo
-    - openstack-infra/puppet-yum
-    - openstack-infra/puppet-zanata
-    - openstack-infra/puppet-zuul
-    - openstack-infra/python-storyboardclient
-    - openstack-infra/reviewday
-    - openstack-infra/reviewstats
-    - openstack-infra/statusbot
-    - openstack-infra/storyboard
-    - openstack-infra/storyboard-webclient
-    - openstack-infra/subunit2sql
-    - openstack-infra/system-config
-    - openstack-infra/yaml2ical
-    - openstack-infra/zmq-event-publisher
+    - 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
+    - opendev/puppet-ansible
+    - opendev/puppet-apparmor
+    - opendev/puppet-askbot
+    - opendev/puppet-asterisk
+    - opendev/puppet-bandersnatch
+    - opendev/puppet-bugdaystats
+    - opendev/puppet-bup
+    - opendev/puppet-cgit
+    - opendev/puppet-ciwatch
+    - opendev/puppet-dashboard
+    - opendev/puppet-diskimage_builder
+    - opendev/puppet-drupal
+    - opendev/puppet-elastic_recheck
+    - opendev/puppet-elasticsearch
+    - opendev/puppet-ethercalc
+    - opendev/puppet-etherpad_lite
+    - opendev/puppet-exim
+    - opendev/puppet-germqtt
+    - opendev/puppet-gerrit
+    - opendev/puppet-gerritbot
+    - opendev/puppet-github
+    - opendev/puppet-grafyaml
+    - opendev/puppet-graphite
+    - opendev/puppet-haveged
+    - opendev/puppet-hound
+    - opendev/puppet-httpd
+    - opendev/puppet-infra-cookiecutter
+    - opendev/puppet-infracloud
+    - opendev/puppet-ipsilon
+    - opendev/puppet-iptables
+    - opendev/puppet-jeepyb
+    - opendev/puppet-jenkins
+    - opendev/puppet-kerberos
+    - opendev/puppet-kibana
+    - opendev/puppet-lodgeit
+    - opendev/puppet-log_processor
+    - opendev/puppet-logrotate
+    - opendev/puppet-logstash
+    - opendev/puppet-lpmqtt
+    - opendev/puppet-mailman
+    - opendev/puppet-mediawiki
+    - opendev/puppet-meetbot
+    - opendev/puppet-mosquitto
+    - opendev/puppet-mqtt_statsd
+    - opendev/puppet-mysql_backup
+    - opendev/puppet-nodepool
+    - opendev/puppet-openafs
+    - opendev/puppet-openstack_health
+    - opendev/puppet-openstack_infra_spec_helper
+    - opendev/puppet-openstackci
+    - opendev/puppet-openstackid
+    - opendev/puppet-os_client_config
+    - opendev/puppet-packagekit
+    - opendev/puppet-pgsql_backup
+    - opendev/puppet-phabricator
+    - opendev/puppet-pip
+    - opendev/puppet-planet
+    - opendev/puppet-project_config
+    - opendev/puppet-ptgbot
+    - opendev/puppet-puppet
+    - opendev/puppet-redis
+    - opendev/puppet-refstack
+    - opendev/puppet-reviewday
+    - opendev/puppet-simpleproxy
+    - opendev/puppet-snmpd
+    - opendev/puppet-ssh
+    - opendev/puppet-ssl_cert_check
+    - opendev/puppet-statusbot
+    - opendev/puppet-storyboard
+    - opendev/puppet-subunit2sql
+    - opendev/puppet-sudoers
+    - opendev/puppet-tmpreaper
+    - opendev/puppet-translation_checksite
+    - opendev/puppet-ulimit
+    - opendev/puppet-unattended_upgrades
+    - opendev/puppet-unbound
+    - opendev/puppet-user
+    - opendev/puppet-vcsrepo
+    - opendev/puppet-yum
+    - 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/zone-opendev.org
     - openstack-infra/zone-zuul-ci.org
-    - openstack-infra/zuul
-    - openstack-infra/zuul-base-jobs
-    - openstack-infra/zuul-jobs
-    - openstack-infra/zuul-preview
-    - openstack-infra/zuul-sphinx
-    - openstack-infra/zuul-website
-    - openstack-infra/zuul-website-media
-    - openstack/ansible-role-cloud-launcher
-    - openstack/boartty
+    - zuul/zuul
+    - zuul/zuul-base-jobs
+    - zuul/zuul-jobs
+    - zuul/zuul-preview
+    - zuul/zuul-sphinx
+    - zuul/zuul-website
+    - zuul/zuul-website-media
+    - x/ansible-role-cloud-launcher
+    - ttygroup/boartty
     - openstack/diskimage-builder
-    - openstack/gertty
+    - ttygroup/gertty
     - openstack/os-performance-tools
     - openstack/os-testr
     - openstack/ptgbot
@@ -1015,10 +1015,10 @@ openstack-iotronic:
     - patchset-created
     - change-merged
   projects:
-    - openstack/iotronic
-    - openstack/iotronic-lightning-rod
-    - openstack/iotronic-ui
-    - openstack/python-iotronicclient
+    - x/iotronic
+    - x/iotronic-lightning-rod
+    - x/iotronic-ui
+    - x/python-iotronicclient
   branches:
     - master
 
@@ -1056,9 +1056,9 @@ openstack-javascript:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/js-afs-blob-store
-    - openstack-infra/js-generator-openstack
-    - openstack-infra/js-openstack-registry-hooks
+    - x/js-afs-blob-store
+    - x/js-generator-openstack
+    - x/js-openstack-registry-hooks
     - openstack/eslint-config-openstack
     - openstack/js-openstack-lib
   branches:
@@ -1069,8 +1069,8 @@ openstack-jjb:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/jenkins-job-builder
-    - openstack/python-jenkins
+    - jjb/jenkins-job-builder
+    - jjb/python-jenkins
   branches:
     - master
     - stable/1.6
@@ -1091,7 +1091,7 @@ openstack-kayobe:
     - patchset-created
     - change-merged
   projects:
-    - ^openstack/kayobe.*
+    - ^x/kayobe.*
   branches:
     - master
     - ^stable/.*
@@ -1199,7 +1199,7 @@ openstack-meghdwar:
     - patchset-created
     - change-merged
   projects:
-    - openstack/meghdwar
+    - x/meghdwar
   branches:
     - master
 
@@ -1211,142 +1211,142 @@ openstack-merges:
   projects:
     # grep openstack governance/reference/programs.yaml | grep -v url
     - ^openstack/sahara.*
-    - openstack-dev/cookiecutter
-    - openstack-dev/devstack
-    - openstack-dev/devstack-plugin-cookiecutter
-    - openstack-dev/grenade
-    - openstack-dev/hacking
-    - openstack-dev/heat-cfnclient
-    - openstack-dev/openstack-nose
-    - openstack-dev/pbr
-    - openstack-dev/specs-cookiecutter
-    - openstack-infra/activity-board
-    - openstack-infra/askbot-theme
-    - openstack-infra/devstack-gate
-    - openstack-infra/elastic-recheck
-    - openstack-infra/err2d2
-    - openstack-infra/gear
-    - openstack-infra/gearman-plugin
-    - openstack-infra/germqtt
-    - openstack-infra/gerrit
-    - openstack-infra/gerritbot
-    - openstack-infra/gerritlib
-    - openstack-infra/git-restack
-    - openstack-infra/git-review
-    - openstack-infra/gitdm
-    - openstack-infra/grafyaml
-    - openstack-infra/groups
-    - openstack-infra/jeepyb
-    - openstack-infra/jenkins-job-builder
-    - openstack-infra/js-afs-blob-store
-    - openstack-infra/js-generator-openstack
-    - openstack-infra/js-openstack-registry-hooks
-    - openstack-infra/lodgeit
-    - openstack-infra/lpmqtt
-    - openstack-infra/meetbot
-    - openstack-infra/nodepool
-    - openstack-infra/nose-html-output
-    - openstack-infra/odsreg
-    - openstack-infra/openstackid
-    - openstack-infra/openstackid-resources
-    - openstack-infra/openstackweb
-    - openstack-infra/os-loganalyze
-    - openstack-infra/project-config
-    - openstack-infra/project-config-example
-    - openstack-infra/publications
-    - openstack-infra/puppet-accessbot
-    - openstack-infra/puppet-ansible
-    - openstack-infra/puppet-apparmor
-    - 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-ciwatch
-    - openstack-infra/puppet-dashboard
-    - openstack-infra/puppet-diskimage_builder
+    - 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
+    - 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
+    - openstack/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
+    - opendev/puppet-ansible
+    - opendev/puppet-apparmor
+    - opendev/puppet-askbot
+    - opendev/puppet-asterisk
+    - opendev/puppet-bandersnatch
+    - opendev/puppet-bugdaystats
+    - opendev/puppet-bup
+    - opendev/puppet-cgit
+    - opendev/puppet-ciwatch
+    - opendev/puppet-dashboard
+    - opendev/puppet-diskimage_builder
     - openstack-infra/puppet-docker_registry
-    - 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-ipsilon
-    - 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-mysql_backup
-    - openstack-infra/puppet-nodepool
-    - openstack-infra/puppet-openafs
-    - openstack-infra/puppet-openstack_health
-    - openstack-infra/puppet-openstack_infra_spec_helper
-    - openstack-infra/puppet-openstackci
-    - 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-releasestatus
-    - 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-statusbot
-    - openstack-infra/puppet-storyboard
-    - openstack-infra/puppet-subunit2sql
-    - openstack-infra/puppet-sudoers
-    - openstack-infra/puppet-tmpreaper
-    - openstack-infra/puppet-translation_checksite
-    - openstack-infra/puppet-ulimit
-    - openstack-infra/puppet-unattended_upgrades
-    - openstack-infra/puppet-unbound
-    - openstack-infra/puppet-user
-    - openstack-infra/puppet-vcsrepo
-    - openstack-infra/puppet-yum
-    - openstack-infra/puppet-zanata
-    - openstack-infra/puppet-zuul
-    - openstack-infra/pypi-mirror
-    - openstack-infra/python-storyboardclient
-    - openstack-infra/releasestatus
-    - openstack-infra/reviewday
-    - openstack-infra/reviewstats
-    - openstack-infra/statusbot
-    - openstack-infra/storyboard
-    - openstack-infra/system-config
-    - openstack-infra/tripleo-ci
-    - openstack-infra/zmq-event-publisher
-    - openstack-infra/zuul
-    - openstack-infra/zuul-packaging
+    - opendev/puppet-drupal
+    - opendev/puppet-elastic_recheck
+    - opendev/puppet-elasticsearch
+    - opendev/puppet-ethercalc
+    - opendev/puppet-etherpad_lite
+    - opendev/puppet-exim
+    - opendev/puppet-germqtt
+    - opendev/puppet-gerrit
+    - opendev/puppet-gerritbot
+    - opendev/puppet-github
+    - opendev/puppet-grafyaml
+    - opendev/puppet-graphite
+    - opendev/puppet-haveged
+    - opendev/puppet-hound
+    - opendev/puppet-httpd
+    - opendev/puppet-infracloud
+    - opendev/puppet-ipsilon
+    - opendev/puppet-iptables
+    - opendev/puppet-jeepyb
+    - opendev/puppet-jenkins
+    - opendev/puppet-kerberos
+    - opendev/puppet-kibana
+    - opendev/puppet-lodgeit
+    - opendev/puppet-log_processor
+    - opendev/puppet-logrotate
+    - opendev/puppet-logstash
+    - opendev/puppet-lpmqtt
+    - opendev/puppet-mailman
+    - opendev/puppet-mediawiki
+    - opendev/puppet-meetbot
+    - opendev/puppet-mosquitto
+    - opendev/puppet-mysql_backup
+    - opendev/puppet-nodepool
+    - opendev/puppet-openafs
+    - opendev/puppet-openstack_health
+    - opendev/puppet-openstack_infra_spec_helper
+    - opendev/puppet-openstackci
+    - opendev/puppet-openstackid
+    - opendev/puppet-os_client_config
+    - opendev/puppet-packagekit
+    - opendev/puppet-pgsql_backup
+    - opendev/puppet-phabricator
+    - opendev/puppet-pip
+    - opendev/puppet-planet
+    - opendev/puppet-project_config
+    - opendev/puppet-ptgbot
+    - opendev/puppet-redis
+    - opendev/puppet-refstack
+    - opendev/puppet-releasestatus
+    - opendev/puppet-reviewday
+    - opendev/puppet-simpleproxy
+    - opendev/puppet-snmpd
+    - opendev/puppet-ssh
+    - opendev/puppet-ssl_cert_check
+    - opendev/puppet-statusbot
+    - opendev/puppet-storyboard
+    - opendev/puppet-subunit2sql
+    - opendev/puppet-sudoers
+    - opendev/puppet-tmpreaper
+    - opendev/puppet-translation_checksite
+    - opendev/puppet-ulimit
+    - opendev/puppet-unattended_upgrades
+    - opendev/puppet-unbound
+    - opendev/puppet-user
+    - opendev/puppet-vcsrepo
+    - opendev/puppet-yum
+    - opendev/puppet-zanata
+    - 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/api-site
     - openstack/arch-wg
     - openstack/ceilometer
@@ -1430,7 +1430,7 @@ openstack-merlin:
     - patchset-created
     - change-merged
   projects:
-    - openstack/merlin
+    - x/merlin
   branches:
     - master
 
@@ -1455,10 +1455,10 @@ openstack-mogan:
     - patchset-created
     - change-merged
   projects:
-    - openstack/mogan
-    - openstack/mogan-specs
-    - openstack/mogan-ui
-    - openstack/python-moganclient
+    - x/mogan
+    - x/mogan-specs
+    - x/mogan-ui
+    - x/python-moganclient
   branches:
     - master
 
@@ -1477,7 +1477,7 @@ openstack-nemesis:
     - patchset-created
     - change-merged
   projects:
-    - openstack/nemesis
+    - x/nemesis
   branches:
     - master
 
@@ -1497,7 +1497,7 @@ openstack-networking-cisco:
     - patchset-created
     - change-merged
   projects:
-    - openstack/networking-cisco
+    - x/networking-cisco
   branches:
     - master
     - ^stable/.*
@@ -1533,7 +1533,7 @@ openstack-nfv:
     - patchset-created
     - change-merged
   projects:
-    - openstack/telcowg-usecases
+    - x/telcowg-usecases
   branches:
     - master
 
@@ -1569,12 +1569,12 @@ openstack-operators:
     - openstack/arch-design
     - openstack/ha-guide
     - openstack/operations-guide
-    - openstack/osops-coda
-    - openstack/osops-example-configs
-    - openstack/osops-tools-contrib
-    - openstack/osops-tools-generic
-    - openstack/osops-tools-logging
-    - openstack/osops-tools-monitoring
+    - x/osops-coda
+    - x/osops-example-configs
+    - x/osops-tools-contrib
+    - x/osops-tools-generic
+    - x/osops-tools-logging
+    - x/osops-tools-monitoring
   branches:
     - master
 
@@ -1583,9 +1583,9 @@ openstack-oslo:
     - patchset-created
     - change-merged
   projects:
-    - openstack-dev/cookiecutter
-    - openstack-dev/oslo-cookiecutter
-    - openstack-dev/pbr
+    - openstack/cookiecutter
+    - openstack/oslo-cookiecutter
+    - openstack/pbr
     - openstack/automaton
     - openstack/debtcollector
     - openstack/devstack-plugin-amqp1
@@ -1634,7 +1634,7 @@ openstack-pandaman:
     - patchset-created
     - change-merged
   projects:
-    - openstack/pandaman
+    - x/pandaman
   branches:
     - master
 
@@ -1666,8 +1666,8 @@ openstack-poppy:
     - patchset-created
     - change-merged
   projects:
-    - openstack/poppy
-    - openstack/poppy-ui
+    - x/poppy
+    - x/poppy-ui
   branches:
     - master
 
@@ -1697,14 +1697,14 @@ openstack-qa:
     - patchset-created
     - change-merged
   projects:
-    - openstack-dev/bashate
-    - openstack-dev/devstack
-    - openstack-dev/devstack-plugin-cookiecutter
-    - openstack-dev/grenade
-    - openstack-dev/hacking
-    - openstack-infra/devstack-gate
-    - openstack-infra/elastic-recheck
-    - openstack-infra/subunit2sql
+    - openstack/bashate
+    - openstack/devstack
+    - openstack/devstack-plugin-cookiecutter
+    - openstack/grenade
+    - openstack/hacking
+    - openstack/devstack-gate
+    - opendev/elastic-recheck
+    - opendev/subunit2sql
     - openstack/coverage2sql
     - openstack/devstack-plugin-ceph
     - openstack/devstack-tools
@@ -1740,7 +1740,7 @@ openstack-quota:
     - patchset-created
     - change-merged
   projects:
-    - openstack/delimiter
+    - x/delimiter
   branches:
     - master
 
@@ -1759,7 +1759,7 @@ openstack-release:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/releasestatus
+    - openstack/releasestatus
     - openstack/release-test
     - openstack/releases
     - openstack/reno
@@ -1807,7 +1807,7 @@ openstack-scalpels:
     - patchset-created
     - change-merged
   projects:
-    - openstack/scalpels
+    - x/scalpels
   branches:
     - master
 
@@ -1817,23 +1817,23 @@ openstack-sdks:
     - change-merged
   projects:
     - openstack-dev/os-http
-    - openstack-infra/requestsexceptions
-    - openstack-infra/shade
+    - openstack/requestsexceptions
+    - openstack/shade
     - openstack/api-sig
     - openstack/cliff
-    - openstack/golang-client
+    - x/golang-client
     - openstack/js-openstack-lib
     - openstack/keystoneauth
     - openstack/microversion-parse
-    - openstack/oaktree
-    - openstack/oaktreemodel
+    - x/oaktree
+    - x/oaktreemodel
     - openstack/openstackclient
     - openstack/openstacksdk
     - openstack/os-api-ref
     - openstack/os-client-config
     - openstack/os-service-types
     - openstack/osc-lib
-    - openstack/promstat
+    - x/promstat
     - openstack/python-openstackclient
     - openstack/service-types-authority
   branches:
@@ -1872,8 +1872,8 @@ openstack-self-healing:
     - change-merged
   projects:
     - openstack/ha-guide
-    - openstack/openstack-resource-agents
-    - openstack/openstack-resource-agents-specs
+    - x/openstack-resource-agents
+    - x/openstack-resource-agents-specs
     - openstack/self-healing-sig
   branches:
     - master
@@ -1883,7 +1883,7 @@ openstack-service-broker:
     - patchset-created
     - change-merged
   projects:
-    - openstack/openstack-service-broker
+    - x/openstack-service-broker
   branches:
     - master
 
@@ -1892,8 +1892,8 @@ openstack-solar:
     - patchset-created
     - change-merged
   projects:
-    - openstack/solar
-    - openstack/solar-resources
+    - x/solar
+    - x/solar-resources
   branches:
     - master
 
@@ -1902,7 +1902,7 @@ openstack-spaceport:
     - patchset-created
     - change-merged
   projects:
-    - openstack/openstack-spaceport
+    - x/openstack-spaceport
   branches:
     - master
 
@@ -1922,7 +1922,7 @@ openstack-steth:
     - patchset-created
     - change-merged
   projects:
-    - openstack/steth
+    - x/steth
   branches:
     - master
 
@@ -1940,7 +1940,7 @@ openstack-swauth:
     - patchset-created
     - change-merged
   projects:
-    - openstack/swauth
+    - x/swauth
   branches:
     - master
 
@@ -1949,10 +1949,10 @@ openstack-swift:
     - patchset-created
     - change-merged
   projects:
-    - openstack/liberasurecode
-    - openstack/pyeclib
+    - x/liberasurecode
+    - x/pyeclib
     - openstack/python-swiftclient
-    - openstack/slogging
+    - x/slogging
     - openstack/swift
     - openstack/swift-bench
     - openstack/swift-specs
@@ -1994,10 +1994,10 @@ openstack-third-party-ci:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/ciwatch
-    - openstack-infra/project-config-example
-    - openstack-infra/puppet-ciwatch
-    - openstack/third-party-ci-tools
+    - x/ciwatch
+    - opendev/project-config-example
+    - opendev/puppet-ciwatch
+    - x/third-party-ci-tools
   branches:
     - master
 
@@ -2049,7 +2049,7 @@ openstack-vahana:
     - patchset-created
     - change-merged
   projects:
-    - openstack/vahana
+    - x/vahana
   branches:
     - master
 
@@ -2058,9 +2058,9 @@ openstack-valence:
     - patchset-created
     - change-merged
   projects:
-    - openstack/python-valenceclient
-    - openstack/valence
-    - openstack/valence-specs
+    - x/python-valenceclient
+    - x/valence
+    - x/valence-specs
   branches:
     - master
 
@@ -2069,7 +2069,7 @@ openstack-valet:
     - patchset-created
     - change-merged
   projects:
-    - openstack/valet
+    - x/valet
   branches:
     - master
 
@@ -2115,34 +2115,34 @@ openstack-windmill:
     - patchset-created
     - change-merged
   projects:
-    - openstack/ansible-role-ansible
-    - openstack/ansible-role-bindep
-    - openstack/ansible-role-borgbackup
-    - openstack/ansible-role-borgmatic
-    - openstack/ansible-role-carbon
-    - openstack/ansible-role-diskimage-builder
-    - openstack/ansible-role-fedmsg
-    - openstack/ansible-role-gearman
-    - openstack/ansible-role-grafyaml
-    - openstack/ansible-role-jenkins
-    - openstack/ansible-role-jenkins-job-builder
-    - openstack/ansible-role-jenkins-plugins
-    - openstack/ansible-role-logrotate
-    - openstack/ansible-role-nginx
-    - openstack/ansible-role-nodepool
-    - openstack/ansible-role-openstacksdk
-    - openstack/ansible-role-shade
-    - openstack/ansible-role-ssh
-    - openstack/ansible-role-statsd
-    - openstack/ansible-role-sudoers
-    - openstack/ansible-role-virtualenv
-    - openstack/ansible-role-whisper
-    - openstack/ansible-role-zookeeper
-    - openstack/ansible-role-zuul
-    - openstack/windmill
-    - openstack/windmill-backup
-    - openstack/windmill-config
-    - openstack/windmill-ops
+    - 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
+    - windmill/ansible-role-virtualenv
+    - windmill/ansible-role-whisper
+    - windmill/ansible-role-zookeeper
+    - windmill/ansible-role-zuul
+    - windmill/windmill
+    - windmill/windmill-backup
+    - windmill/windmill-config
+    - windmill/windmill-ops
   branches:
     - master
 
@@ -2196,7 +2196,7 @@ puppet-openstack:
     - openstack/puppet-congress
     - openstack/puppet-designate
     - openstack/puppet-ec2api
-    - openstack/puppet-fenix
+    - x/puppet-fenix
     - openstack/puppet-freezer
     - openstack/puppet-glance
     - openstack/puppet-glare
@@ -2208,7 +2208,7 @@ puppet-openstack:
     - openstack/puppet-magnum
     - openstack/puppet-manila
     - openstack/puppet-mistral
-    - openstack/puppet-modulesync-configs
+    - x/puppet-modulesync-configs
     - openstack/puppet-monasca
     - openstack/puppet-murano
     - openstack/puppet-neutron
@@ -2233,7 +2233,7 @@ puppet-openstack:
     - openstack/puppet-tacker
     - openstack/puppet-tempest
     - openstack/puppet-trove
-    - openstack/puppet-tuskar
+    - x/puppet-tuskar
     - openstack/puppet-vitrage
     - openstack/puppet-vswitch
     - openstack/puppet-watcher
@@ -2247,7 +2247,7 @@ rdo:
     - patchset-created
     - change-merged
   projects:
-    - openstack/packstack
+    - x/packstack
   branches:
     - master
     - ^stable/.*
@@ -2257,7 +2257,7 @@ refstack:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/puppet-refstack
+    - opendev/puppet-refstack
     - openstack/python-tempestconf
     - openstack/refstack
     - openstack/refstack-client
@@ -2305,10 +2305,10 @@ storyboard:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/python-storyboardclient
-    - openstack-infra/storyboard
-    - openstack-infra/storyboard-webclient
-    - openstack/boartty
+    - opendev/python-storyboardclient
+    - opendev/storyboard
+    - opendev/storyboard-webclient
+    - ttygroup/boartty
   branches:
     - master
 
@@ -2317,11 +2317,11 @@ surveil:
     - patchset-created
     - change-merged
   projects:
-    - openstack/bansho
-    - openstack/puppet-surveil
-    - openstack/python-surveilclient
-    - openstack/surveil
-    - openstack/surveil-specs
+    - x/bansho
+    - x/puppet-surveil
+    - x/python-surveilclient
+    - x/surveil
+    - x/surveil-specs
   branches:
     - master
 
@@ -2330,7 +2330,7 @@ swift3:
     - patchset-created
     - change-merged
   projects:
-    - openstack/swift3
+    - x/swift3
   branches:
     - master
 
@@ -2339,7 +2339,7 @@ swiftonfile:
     - patchset-created
     - change-merged
   projects:
-    - openstack/swiftonfile
+    - x/swiftonfile
   branches:
     - master
 
@@ -2348,7 +2348,7 @@ swiftonhpss:
     - patchset-created
     - change-merged
   projects:
-    - openstack/swiftonhpss
+    - x/swiftonhpss
   branches:
     - master
 
@@ -2357,10 +2357,10 @@ syscompass:
     - patchset-created
     - change-merged
   projects:
-    - openstack/compass-adapters
-    - openstack/compass-core
-    - openstack/compass-specs
-    - openstack/compass-web
+    - x/compass-adapters
+    - x/compass-core
+    - x/compass-specs
+    - x/compass-web
     - stackforge/compass-install
   branches:
     - master
@@ -2395,7 +2395,7 @@ tripleo:
   projects:
     - ^openstack/ansible-role-tripleo-.*
     - ^openstack/tripleo.*
-    - openstack-infra/tripleo-ci
+    - openstack/tripleo-ci
     - openstack/ansible-role-chrony
     - openstack/ansible-role-collect-logs
     - openstack/ansible-role-container-registry
@@ -2423,7 +2423,7 @@ wsme:
     - patchset-created
     - change-merged
   projects:
-    - openstack/wsme
+    - x/wsme
   branches:
     - master
 
@@ -2432,16 +2432,16 @@ zuul:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/nodepool
+    - zuul/nodepool
     - openstack-infra/zone-zuul-ci.org
-    - openstack-infra/zuul
-    - openstack-infra/zuul-base-jobs
-    - openstack-infra/zuul-jobs
-    - openstack-infra/zuul-preview
-    - openstack-infra/zuul-sphinx
-    - openstack-infra/zuul-website
-    - openstack-infra/zuul-website-media
-    - openstack/pbrx
+    - zuul/zuul
+    - zuul/zuul-base-jobs
+    - zuul/zuul-jobs
+    - zuul/zuul-preview
+    - zuul/zuul-sphinx
+    - zuul/zuul-website
+    - zuul/zuul-website-media
+    - x/pbrx
     - zuul/project-config
   branches:
     - master
diff --git a/playbooks/base-minimal/pre.yaml b/playbooks/base-minimal/pre.yaml
index a8c02442cd..77488459c3 100644
--- a/playbooks/base-minimal/pre.yaml
+++ b/playbooks/base-minimal/pre.yaml
@@ -5,5 +5,5 @@
     - log-inventory
     - role: validate-host
       # TODO(mordred) When we have site-local variables, these should go there
-      zuul_traceroute_host: git.openstack.org
+      zuul_traceroute_host: opendev.org
       zuul_image_manifest: /etc/dib-builddate.txt
diff --git a/playbooks/base-ozj/pre.yaml b/playbooks/base-ozj/pre.yaml
index a8c02442cd..77488459c3 100644
--- a/playbooks/base-ozj/pre.yaml
+++ b/playbooks/base-ozj/pre.yaml
@@ -5,5 +5,5 @@
     - log-inventory
     - role: validate-host
       # TODO(mordred) When we have site-local variables, these should go there
-      zuul_traceroute_host: git.openstack.org
+      zuul_traceroute_host: opendev.org
       zuul_image_manifest: /etc/dib-builddate.txt
diff --git a/roles/legacy-zuul-git-prep-upper-constraints/tasks/main.yaml b/roles/legacy-zuul-git-prep-upper-constraints/tasks/main.yaml
index 49c8f9ab6a..db4cc0362f 100644
--- a/roles/legacy-zuul-git-prep-upper-constraints/tasks/main.yaml
+++ b/roles/legacy-zuul-git-prep-upper-constraints/tasks/main.yaml
@@ -2,5 +2,5 @@
   copy:
     # copy happens entirely on the remote node
     remote_src: yes
-    src: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
+    src: "{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
     dest: "{{ zuul.project.src_dir }}/upper-constraints.txt"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 96f5f126f2..be9887e645 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,7 +1,7 @@
 # Shared zuul config specific to the OpenStack Project
 # Contains definitions of trusted jobs
 # Overrides jobs from:
-#    https://git.openstack.org/cgit/openstack-infra/zuul-jobs
+#    https://opendev.org/cgit/zuul/zuul-jobs
 
 - job:
     name: base-minimal
@@ -22,7 +22,7 @@
       - playbooks/base-minimal/post.yaml
       - playbooks/base-minimal/post-logs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     vars:
       ara_report_type: database
       ara_report_path: ara-report
@@ -56,7 +56,7 @@
       - playbooks/base-ozj/post.yaml
       - playbooks/base-ozj/post-logs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     vars:
       ara_report_type: database
       ara_report_path: ara-report
@@ -186,13 +186,13 @@
     required-projects:
       - name: openstack/requirements
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     secrets:
       - secret: afsdocs_secret
         name: afs
     vars:
-      constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
 
 - job:
     name: publish-openstack-sphinx-docs
@@ -249,8 +249,8 @@
     required-projects:
       - name: openstack/requirements
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       tox_envlist: docs
       bindep_profile: compile doc
@@ -286,8 +286,8 @@
     required-projects:
       - name: openstack/requirements
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       tox_envlist: docs
       bindep_profile: compile doc
@@ -313,7 +313,7 @@
     required-projects:
       - name: openstack/requirements
     vars:
-      tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
 
 - job:
     name: publish-openstack-tox-docs-direct
@@ -364,11 +364,11 @@
     required-projects:
       - name: openstack/requirements
     roles:
-      - zuul: openstack-infra/openstack-zuul-jobs
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
     vars:
       afs_subpath: "/releasenotes/{{ zuul.project.short_name }}"
-      constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
       sphinx_build_dir: releasenotes/build
     secrets:
       - secret: afsdocs_secret
@@ -412,10 +412,10 @@
     required-projects:
       - name: openstack/requirements
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
-      tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
     secrets:
       - site_specs
 
@@ -428,10 +428,10 @@
     run: playbooks/project-config/run-tox.yaml
     post-run: playbooks/publish/openstack-specs-site.yaml
     allowed-projects:
-      - openstack-infra/project-config
+      - openstack/project-config
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       tox_envlist: specs
     secrets:
@@ -476,7 +476,7 @@
     post-run:
       - playbooks/sphinx/post-infra.yaml
     allowed-projects:
-      - openstack-infra/infra-manual
+      - openstack/infra-manual
     vars:
       afs_subpath: "/infra/manual"
 
@@ -492,8 +492,8 @@
     allowed-projects:
       - openstack/service-types-authority
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       tox_envlist: publish
     secrets:
@@ -510,10 +510,10 @@
       - playbooks/publish/infra-index.yaml
       - playbooks/publish/openstack-afs.yaml
     allowed-projects:
-      - openstack-infra/project-config
+      - openstack/project-config
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       tox_envlist: infra-docs
       afs_path: "/infra"
@@ -533,10 +533,10 @@
     # Index is always published from master
     override-branch: master
     allowed-projects:
-      - openstack-infra/publications
+      - opendev/publications
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       afs_subpath: "/infra/publications/"
       tox_envlist: infra-docs
@@ -547,17 +547,17 @@
 - job:
     name: publish-infra-publications
     description: |
-      Publish one publication from openstack-infra/publications
+      Publish one publication from opendev/publications
     final: true
     run: playbooks/publications/run.yaml
     post-run:
       - playbooks/publish/publications.yaml
       - playbooks/publish/openstack-afs.yaml
     allowed-projects:
-      - openstack-infra/publications
+      - opendev/publications
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     vars:
       afs_subpath: "/infra/publications/"
       tox_envlist: infra-docs
@@ -583,7 +583,7 @@
     run: playbooks/project-config/run-tox.yaml
     post-run: playbooks/yaml2ical/post.yaml
     allowed-projects:
-      - openstack-infra/irc-meetings
+      - opendev/irc-meetings
     vars:
       tox_envlist: ical
     secrets:
@@ -601,7 +601,7 @@
       publish to.
       This job uses ``tox -e docs`` for building documents.
     roles:
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     pre-run: playbooks/project-config/pre-tox.yaml
     run: playbooks/project-config/run-tox.yaml
     post-run:
@@ -693,8 +693,8 @@
     pre-run: playbooks/project-config/pre-tox.yaml
     run: playbooks/project-config/run-tox.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     # Syncing to AFS can take longer than default 30 mins
     post-timeout: 3600
     vars:
@@ -781,8 +781,8 @@
     run: playbooks/sphinx/run.yaml
     post-run: playbooks/publish/api-guide.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     # We only publish the master branch, so no need to run
     # for changes on other branches.
     branches: master
@@ -802,8 +802,8 @@
     run: playbooks/sphinx/run.yaml
     post-run: playbooks/publish/api-ref.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     # We only publish the master branch, so no need to run
     # for changes on other branches.
     branches: master
@@ -823,8 +823,8 @@
     run: playbooks/sphinx/run.yaml
     post-run: playbooks/publish/install-guide.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     # This job runs only pre-pike, with pike the documents have been
     # integrated into normal builds.
     branches:
@@ -930,7 +930,7 @@
     # master.
     branches: master
     roles:
-      - zuul: openstack-infra/system-config
+      - zuul: opendev/system-config
     allowed-projects:
       - openstack/requirements
 
@@ -1131,7 +1131,7 @@
     run: playbooks/project-config/run-tox.yaml
     post-run: playbooks/check-main-yaml/post.yaml
     allowed-projects:
-      - openstack-infra/project-config
+      - openstack/project-config
     final: true
     vars:
       tox_envlist: add-projects-to-main
@@ -1151,7 +1151,7 @@
     description: |
       Push strings for translation to translation server.
     roles:
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     pre-run: playbooks/translation/pre.yaml
     run: playbooks/translation/upstream-translation-update.yaml
     post-run:
@@ -1160,7 +1160,7 @@
     semaphore: translations
     vars:
       fileserver_leading_path: translation-source
-      constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
     required-projects:
       - openstack/requirements
     # Zanata-cli needs Java 8 and will fail with newer Java, Bionic uses Java 11
@@ -1178,12 +1178,12 @@
       Import translations from translation server to projects as
       proposed change.
     roles:
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     pre-run: playbooks/translation/pre.yaml
     run: playbooks/translation/propose-translation-update.yaml
     post-run: playbooks/translation/post.yaml
     vars:
-      constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
     semaphore: translations
     required-projects:
       - openstack/requirements
diff --git a/zuul.d/opendev-jobs.yaml b/zuul.d/opendev-jobs.yaml
index eb471f25e6..f210faf034 100644
--- a/zuul.d/opendev-jobs.yaml
+++ b/zuul.d/opendev-jobs.yaml
@@ -7,7 +7,7 @@
     post-run:
       - playbooks/publish/opendev-afs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     secrets:
       - secret: afsdocs_secret
         name: afs
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f55a967d95..a3b0f211ee 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -46,7 +46,7 @@
               - ^lib/ansible/utils/module_docs_fragments/openstack.py
 
 - project:
-    name: openstack-dev/bashate
+    name: openstack/bashate
     templates:
       - publish-to-pypi
 
@@ -56,12 +56,12 @@
       - noop-jobs
 
 - project:
-    name: openstack-dev/cookiecutter
+    name: openstack/cookiecutter
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-dev/devstack
+    name: openstack/devstack
     check:
       queue: integrated
       jobs:
@@ -80,29 +80,29 @@
               update_target: devstack-plugins-list
 
 - project:
-    name: openstack-dev/devstack-plugin-cookiecutter
+    name: openstack/devstack-plugin-cookiecutter
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-dev/devstack-vagrant
+    name: openstack/devstack-vagrant
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-dev/grenade
+    name: openstack/grenade
     check:
       queue: integrated
     gate:
       queue: integrated
 
 - project:
-    name: openstack-dev/hacking
+    name: openstack/hacking
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack-dev/openstack-nose
+    name: openstack/openstack-nose
     templates:
       - noop-jobs
 
@@ -114,7 +114,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack-dev/pbr
+    name: openstack/pbr
     templates:
       - publish-to-pypi
     periodic:
@@ -137,28 +137,28 @@
         - legacy-sandbox-tag
 
 - project:
-    name: openstack-dev/specs-cookiecutter
+    name: openstack/specs-cookiecutter
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/afsmon
+    name: opendev/afsmon
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/ansible-role-puppet
+    name: opendev/ansible-role-puppet
     templates:
       - ansible-lint-jobs
       - infra-puppet-apply-jobs
 
 - project:
-    name: openstack-infra/askbot-theme
+    name: opendev/askbot-theme
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/bindep
+    name: opendev/bindep
     templates:
       - openstack-pypy-jobs-nonvoting
       - openstack-python-jobs-no-constraints
@@ -170,7 +170,7 @@
         - tox-cover
 
 - project:
-    name: openstack-infra/bugdaystats
+    name: openstack/bugdaystats
     templates:
       - publish-to-pypi
     check:
@@ -184,12 +184,12 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack-infra/ciwatch
+    name: x/ciwatch
     templates:
       - openstack-python-jobs-no-constraints
 
 - project:
-    name: openstack-infra/devstack-gate
+    name: openstack/devstack-gate
     templates:
       - integrated-gate
       - integrated-gate-py3
@@ -223,7 +223,7 @@
         - neutron-tempest-dvr-ha-multinode-full
 
 - project:
-    name: openstack-infra/gear
+    name: opendev/gear
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -232,7 +232,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/gearman-plugin
+    name: x/gearman-plugin
     check:
       jobs:
         - legacy-gearman-plugin-maven-build-ubuntu-trusty
@@ -250,14 +250,14 @@
         - legacy-gearman-plugin-hpi-artifact
 
 - project:
-    name: openstack-infra/germqtt
+    name: opendev/germqtt
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/gerritbot
+    name: opendev/gerritbot
     templates:
       - publish-to-pypi
     post:
@@ -265,14 +265,14 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack-infra/gerritlib
+    name: opendev/gerritlib
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/git-restack
+    name: opendev/git-restack
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -280,7 +280,7 @@
       - release-tox-docs-infra
 
 - project:
-    name: openstack-infra/git-review
+    name: openstack/git-review
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -288,7 +288,7 @@
       - release-tox-docs-infra
 
 - project:
-    name: openstack-infra/glean
+    name: opendev/glean
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -313,7 +313,7 @@
         - nodepool-functional-py35-debian-src
 
 - project:
-    name: openstack-infra/grafyaml
+    name: opendev/grafyaml
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -324,7 +324,7 @@
         - tox-cover
 
 - project:
-    name: openstack-infra/groups
+    name: osf/groups
     check:
       jobs:
         - legacy-groups-unittests
@@ -339,12 +339,12 @@
         - legacy-groups-release-master
 
 - project:
-    name: openstack-infra/groups-static-pages
+    name: osf/groups-static-pages
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/infra-manual
+    name: openstack/infra-manual
     templates:
       - build-tox-docs
     post:
@@ -352,12 +352,12 @@
         - publish-infra-manual
 
 - project:
-    name: openstack-infra/infra-specs
+    name: opendev/infra-specs
     templates:
       - openstack-specs-jobs
 
 - project:
-    name: openstack-infra/irc-meetings
+    name: opendev/irc-meetings
     check:
       jobs:
         - openstack-tox-pep8
@@ -369,7 +369,7 @@
         - publish-irc-meetings
 
 - project:
-    name: openstack-infra/jeepyb
+    name: opendev/jeepyb
     templates:
       - publish-to-pypi
     check:
@@ -380,7 +380,7 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack-infra/jenkins-job-builder
+    name: jjb/jenkins-job-builder
     templates:
       - docs-on-readthedocs
       - openstack-python-jobs-no-constraints
@@ -394,7 +394,7 @@
         - tox-cover
 
 - project:
-    name: openstack-infra/lodgeit
+    name: opendev/lodgeit
     check:
       jobs:
         - openstack-tox-pep8
@@ -405,7 +405,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack-infra/log-classify
+    name: opendev/log-classify
     templates:
       - build-tox-docs
     check:
@@ -418,37 +418,37 @@
         - openstack-tox-py35
 
 - project:
-    name: openstack-infra/log_processor
+    name: opendev/log_processor
     templates:
       - openstack-python-jobs-no-constraints
       - publish-tox-docs-infra
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/logstash-filters
+    name: openstack/logstash-filters
     templates:
       - infra-logstash-filter-jobs
 
 - project:
-    name: openstack-infra/lpmqtt
+    name: opendev/lpmqtt
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/meetbot
+    name: opendev/meetbot
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/mqtt_statsd
+    name: opendev/mqtt_statsd
     templates:
       - openstack-python-jobs-no-constraints
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/nodepool
+    name: zuul/nodepool
     experimental:
       jobs:
         - nodepool-functional-py35-redhat-src
@@ -458,7 +458,7 @@
         - nodepool-functional-py35-gentoo-src
 
 - project:
-    name: openstack-infra/nose-html-output
+    name: openstack/nose-html-output
     templates:
       - noop-jobs
       - publish-to-pypi
@@ -467,17 +467,17 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack-infra/odsreg
+    name: osf/odsreg
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/openstack-zuul-roles
+    name: openstack/openstack-zuul-roles
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/openstackid
+    name: osf/openstackid
     check:
       jobs:
         - legacy-laravel-openstackid-unittests
@@ -498,17 +498,17 @@
         - publish-tox-docs-infra-bionic
 
 - project:
-    name: openstack-infra/openstackid-resources
+    name: osf/openstackid-resources
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/openstackweb
+    name: osf/openstackweb
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-infra/project-config
+    name: openstack/project-config
     check:
       queue: project-config
       jobs:
@@ -549,7 +549,7 @@
         - project-config-build-openafs-centos
 
 - project:
-    name: openstack-infra/project-config-example
+    name: opendev/project-config-example
     check:
       jobs:
         - openstack-tox-linters
@@ -558,7 +558,7 @@
         - openstack-tox-linters
 
 - project:
-    name: openstack-infra/publications
+    name: opendev/publications
     templates:
       - noop-jobs
     post:
@@ -574,7 +574,7 @@
             branches: ^(?!master).*$
 
 - project:
-    name: openstack-infra/puppet-accessbot
+    name: opendev/puppet-accessbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -586,7 +586,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ansible
+    name: opendev/puppet-ansible
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -598,7 +598,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-apparmor
+    name: opendev/puppet-apparmor
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -610,7 +610,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-askbot
+    name: opendev/puppet-askbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -622,7 +622,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-asterisk
+    name: opendev/puppet-asterisk
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -634,7 +634,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-bandersnatch
+    name: opendev/puppet-bandersnatch
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -646,7 +646,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-bugdaystats
+    name: opendev/puppet-bugdaystats
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -658,7 +658,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-bup
+    name: opendev/puppet-bup
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -670,7 +670,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-cgit
+    name: opendev/puppet-cgit
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -682,7 +682,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ciwatch
+    name: opendev/puppet-ciwatch
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -694,7 +694,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-diskimage_builder
+    name: opendev/puppet-diskimage_builder
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -706,7 +706,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-drupal
+    name: opendev/puppet-drupal
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -718,7 +718,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-elastic_recheck
+    name: opendev/puppet-elastic_recheck
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -730,7 +730,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-elasticsearch
+    name: opendev/puppet-elasticsearch
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -742,7 +742,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ethercalc
+    name: opendev/puppet-ethercalc
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -754,7 +754,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-etherpad_lite
+    name: opendev/puppet-etherpad_lite
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -766,7 +766,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-exim
+    name: opendev/puppet-exim
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -778,7 +778,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-germqtt
+    name: opendev/puppet-germqtt
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -788,7 +788,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-gerrit
+    name: opendev/puppet-gerrit
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -800,7 +800,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-gerritbot
+    name: opendev/puppet-gerritbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -812,7 +812,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-github
+    name: opendev/puppet-github
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -824,7 +824,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-grafyaml
+    name: opendev/puppet-grafyaml
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -836,7 +836,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-graphite
+    name: opendev/puppet-graphite
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -848,7 +848,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-haveged
+    name: opendev/puppet-haveged
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -860,7 +860,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-hound
+    name: opendev/puppet-hound
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -872,7 +872,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-httpd
+    name: opendev/puppet-httpd
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -887,7 +887,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-infra-cookiecutter
+    name: opendev/puppet-infra-cookiecutter
     templates:
       - noop-jobs
     check:
@@ -896,7 +896,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-infracloud
+    name: opendev/puppet-infracloud
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -908,7 +908,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ipsilon
+    name: opendev/puppet-ipsilon
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -920,7 +920,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-iptables
+    name: opendev/puppet-iptables
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -932,7 +932,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-jeepyb
+    name: opendev/puppet-jeepyb
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -944,7 +944,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-jenkins
+    name: opendev/puppet-jenkins
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -956,7 +956,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-kerberos
+    name: opendev/puppet-kerberos
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -968,7 +968,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-kibana
+    name: opendev/puppet-kibana
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -980,7 +980,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-lodgeit
+    name: opendev/puppet-lodgeit
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -992,7 +992,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-log_processor
+    name: opendev/puppet-log_processor
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1004,7 +1004,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-logrotate
+    name: opendev/puppet-logrotate
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1015,7 +1015,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-logstash
+    name: opendev/puppet-logstash
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1027,7 +1027,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-lpmqtt
+    name: opendev/puppet-lpmqtt
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1037,7 +1037,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-mailman
+    name: opendev/puppet-mailman
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1049,7 +1049,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-mediawiki
+    name: opendev/puppet-mediawiki
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1061,7 +1061,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-meetbot
+    name: opendev/puppet-meetbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1073,7 +1073,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-mosquitto
+    name: opendev/puppet-mosquitto
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1083,7 +1083,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-mqtt_statsd
+    name: opendev/puppet-mqtt_statsd
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1093,7 +1093,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-mysql_backup
+    name: opendev/puppet-mysql_backup
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1105,7 +1105,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-nodepool
+    name: opendev/puppet-nodepool
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1117,7 +1117,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-openafs
+    name: opendev/puppet-openafs
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1129,7 +1129,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-openstack_health
+    name: opendev/puppet-openstack_health
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1141,7 +1141,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-openstack_infra_spec_helper
+    name: opendev/puppet-openstack_infra_spec_helper
     check:
       queue: system-config
       jobs:
@@ -1156,7 +1156,7 @@
         - legacy-puppet-openstack-infra-spec-helper-unit-ubuntu-trusty
 
 - project:
-    name: openstack-infra/puppet-openstackci
+    name: opendev/puppet-openstackci
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1171,7 +1171,7 @@
         - openstackci-beaker-ubuntu-trusty
 
 - project:
-    name: openstack-infra/puppet-openstackid
+    name: opendev/puppet-openstackid
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1183,7 +1183,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-os_client_config
+    name: opendev/puppet-os_client_config
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1195,7 +1195,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-packagekit
+    name: opendev/puppet-packagekit
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1207,7 +1207,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-pgsql_backup
+    name: opendev/puppet-pgsql_backup
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1219,7 +1219,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-phabricator
+    name: opendev/puppet-phabricator
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1231,7 +1231,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-pip
+    name: opendev/puppet-pip
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1243,7 +1243,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-planet
+    name: opendev/puppet-planet
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1255,7 +1255,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-project_config
+    name: opendev/puppet-project_config
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1267,7 +1267,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ptgbot
+    name: opendev/puppet-ptgbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1279,7 +1279,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-puppet
+    name: opendev/puppet-puppet
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1291,7 +1291,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-redis
+    name: opendev/puppet-redis
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1303,7 +1303,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-refstack
+    name: opendev/puppet-refstack
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1313,7 +1313,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-reviewday
+    name: opendev/puppet-reviewday
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1325,7 +1325,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-simpleproxy
+    name: opendev/puppet-simpleproxy
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1337,7 +1337,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-snmpd
+    name: opendev/puppet-snmpd
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1349,7 +1349,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ssh
+    name: opendev/puppet-ssh
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1361,7 +1361,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ssl_cert_check
+    name: opendev/puppet-ssl_cert_check
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1373,7 +1373,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-statusbot
+    name: opendev/puppet-statusbot
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1385,7 +1385,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-storyboard
+    name: opendev/puppet-storyboard
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1400,7 +1400,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-subunit2sql
+    name: opendev/puppet-subunit2sql
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1412,7 +1412,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-sudoers
+    name: opendev/puppet-sudoers
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1424,7 +1424,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-tmpreaper
+    name: opendev/puppet-tmpreaper
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1436,7 +1436,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-translation_checksite
+    name: opendev/puppet-translation_checksite
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1448,7 +1448,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-ulimit
+    name: opendev/puppet-ulimit
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1460,7 +1460,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-unattended_upgrades
+    name: opendev/puppet-unattended_upgrades
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1472,7 +1472,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-unbound
+    name: opendev/puppet-unbound
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1484,7 +1484,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-user
+    name: opendev/puppet-user
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1496,7 +1496,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-vcsrepo
+    name: opendev/puppet-vcsrepo
     templates:
       - noop-jobs
     check:
@@ -1505,7 +1505,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-yum
+    name: opendev/puppet-yum
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1517,7 +1517,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-zanata
+    name: opendev/puppet-zanata
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1529,7 +1529,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/puppet-zuul
+    name: opendev/puppet-zuul
     templates:
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
@@ -1541,7 +1541,7 @@
       queue: system-config
 
 - project:
-    name: openstack-infra/pynotedb
+    name: opendev/pynotedb
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -1549,7 +1549,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/python-storyboardclient
+    name: opendev/python-storyboardclient
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -1560,12 +1560,12 @@
         - tox-cover
 
 - project:
-    name: openstack-infra/requestsexceptions
+    name: openstack/requestsexceptions
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/reviewday
+    name: openstack/reviewday
     templates:
       - publish-to-pypi
     check:
@@ -1579,19 +1579,19 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack-infra/reviewstats
+    name: openstack/reviewstats
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/shade
+    name: openstack/shade
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/statusbot
+    name: opendev/statusbot
     templates:
       - publish-to-pypi
     check:
@@ -1605,7 +1605,7 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack-infra/storyboard
+    name: opendev/storyboard
     templates:
       - publish-to-pypi
       - publish-tox-docs-infra
@@ -1617,7 +1617,7 @@
         - legacy-storyboard-js-integration
 
 - project:
-    name: openstack-infra/storyboard-webclient
+    name: opendev/storyboard-webclient
     release:
       jobs:
         - publish-openstack-javascript-content:
@@ -1631,7 +1631,7 @@
         - legacy-storyboard-js-integration
 
 - project:
-    name: openstack-infra/subunit2sql
+    name: opendev/subunit2sql
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -1640,21 +1640,21 @@
       - publish-to-pypi
 
 - project:
-    name: openstack-infra/system-config
+    name: opendev/system-config
     check:
       queue: system-config
     gate:
       queue: system-config
 
 - project:
-    name: openstack-infra/tripleo-ci
+    name: openstack/tripleo-ci
     check:
       queue: tripleo
     gate:
       queue: tripleo
 
 - project:
-    name: openstack-infra/yaml2ical
+    name: opendev/yaml2ical
     templates:
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
@@ -1666,7 +1666,7 @@
         - tox-pep8
 
 - project:
-    name: openstack-infra/zmq-event-publisher
+    name: x/zmq-event-publisher
     check:
       jobs:
         - legacy-zmq-event-publisher-maven-build-ubuntu-trusty
@@ -1684,13 +1684,13 @@
         - legacy-zmq-event-publisher-hpi-artifact
 
 - project:
-    name: openstack-infra/zuul
+    name: zuul/zuul
     experimental:
       jobs:
         - nodepool-zuul-functional
 
 - project:
-    name: openstack-infra/zuul-base-jobs
+    name: zuul/zuul-base-jobs
     templates:
       - build-tox-docs
     check:
@@ -1704,7 +1704,7 @@
         - publish-zuul-docs
 
 - project:
-    name: openstack-infra/zuul-jobs
+    name: zuul/zuul-jobs
     templates:
       - build-tox-docs
     check:
@@ -1762,30 +1762,30 @@
       - noop-jobs
 
 - project:
-    name: openstack/aeromancer
+    name: x/aeromancer
     templates:
       - noop-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/ailuropoda
+    name: x/ailuropoda
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/airship-berth
+    name: airship/berth
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/alexandria
+    name: x/alexandria
     templates:
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs-nonvoting
 
 - project:
-    name: openstack/almanach
+    name: x/almanach
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -1813,12 +1813,12 @@
         - announce-release
 
 - project:
-    name: openstack/ansible-role-ara
+    name: recordsansible/ansible-role-ara
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/ansible-role-bindep
+    name: x/ansible-role-bindep
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -1829,7 +1829,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ansible-role-cloud-launcher
+    name: x/ansible-role-cloud-launcher
     templates:
       - ansible-role-jobs
       - docs-on-readthedocs
@@ -1846,36 +1846,36 @@
       queue: tripleo
 
 - project:
-    name: openstack/ansible-role-diskimage-builder
+    name: windmill/ansible-role-diskimage-builder
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-fedmsg
+    name: x/ansible-role-fedmsg
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-gearman
+    name: windmill/ansible-role-gear
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-jenkins
+    name: x/ansible-role-jenkins
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/ansible-role-jenkins-job-builder
+    name: x/ansible-role-jenkins-job-builder
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-jenkins-plugins
+    name: x/ansible-role-jenkins-plugins
     templates:
       - noop-jobs
 
@@ -1915,19 +1915,19 @@
       - noop-jobs
 
 - project:
-    name: openstack/ansible-role-logrotate
+    name: windmill/ansible-role-logrotate
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-nginx
+    name: windmill/ansible-role-nginx
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-nodepool
+    name: windmill/ansible-role-nodepool
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -1938,7 +1938,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ansible-role-openstacksdk
+    name: windmill/ansible-role-openstacksdk
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -1956,19 +1956,19 @@
         - announce-release
 
 - project:
-    name: openstack/ansible-role-shade
+    name: x/ansible-role-shade
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-ssh
+    name: windmill/ansible-role-ssh
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-sudoers
+    name: windmill/ansible-role-sudoers
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -2012,7 +2012,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ansible-role-tripleo-congress
+    name: x/ansible-role-tripleo-congress
     templates:
       - publish-to-pypi
 
@@ -2166,19 +2166,19 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ansible-role-virtualenv
+    name: windmill/ansible-role-virtualenv
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-zookeeper
+    name: windmill/ansible-role-zookeeper
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/ansible-role-zuul
+    name: windmill/ansible-role-zuul
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -2196,17 +2196,17 @@
       - translation-jobs-master-only
 
 - project:
-    name: openstack/apmec
+    name: x/apmec
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/apmec-horizon
+    name: x/apmec-horizon
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/ara
+    name: recordsansible/ara
     templates:
       - publish-to-pypi-quietly
 
@@ -2225,7 +2225,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bansho
+    name: x/bansho
     templates:
       - noop-jobs
 
@@ -2252,7 +2252,7 @@
       queue: barbican
 
 - project:
-    name: openstack/bareon
+    name: x/bareon
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2261,7 +2261,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bareon-allocator
+    name: x/bareon-allocator
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2270,7 +2270,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bareon-api
+    name: x/bareon-api
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2279,12 +2279,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bareon-image-elements
+    name: x/bareon-image-elements
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/bareon-ironic
+    name: x/bareon-ironic
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2293,7 +2293,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bareon-specs
+    name: x/bareon-specs
     templates:
       - docs-on-readthedocs
       - build-only-specs-jobs
@@ -2304,7 +2304,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/bilean
+    name: x/bilean
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -2341,28 +2341,28 @@
       queue: blazar
 
 - project:
-    name: openstack/boartty
+    name: ttygroup/boartty
     templates:
       - noop-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/broadview-collector
+    name: x/broadview-collector
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/broadview-lib
+    name: x/broadview-lib
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/broadview-ui
+    name: x/broadview-ui
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/browbeat
+    name: x/browbeat
     templates:
       - publish-to-pypi
 
@@ -2377,7 +2377,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/cathead
+    name: x/cathead
     check:
       jobs:
         - openstack-tox-pep8
@@ -2408,7 +2408,7 @@
       rtd_webhook_id: '44767'
 
 - project:
-    name: openstack/ceilometer-zvm
+    name: x/ceilometer-zvm
     templates:
       - openstack-python-jobs
 
@@ -2418,39 +2418,39 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/charm-6wind-virtual-accelerator
+    name: x/charm-6wind-virtual-accelerator
     templates:
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
-    name: openstack/charm-neutron-api-plumgrid
+    name: x/charm-neutron-api-plumgrid
     templates:
       - python-charm-jobs
 
 - project:
-    name: openstack/charm-plumgrid-director
+    name: x/charm-plumgrid-director
     templates:
       - python-charm-jobs
 
 - project:
-    name: openstack/charm-plumgrid-edge
+    name: x/charm-plumgrid-edge
     templates:
       - python-charm-jobs
 
 - project:
-    name: openstack/charm-plumgrid-gateway
+    name: x/charm-plumgrid-gateway
     templates:
       - python-charm-jobs
 
 - project:
-    name: openstack/charm-vault
+    name: x/charm-vault
     templates:
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
-    name: openstack/ci-cd-pipeline-app-murano
+    name: x/ci-cd-pipeline-app-murano
     templates:
       - noop-jobs
 
@@ -2483,7 +2483,7 @@
               - ^tox.ini$
 
 - project:
-    name: openstack/cinder-fusioncompute
+    name: x/cinder-fusioncompute
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2503,7 +2503,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/cisco-ironic-contrib
+    name: x/cisco-ironic-contrib
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2515,12 +2515,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/cloud-init
+    name: x/cloud-init
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/cloudbase-init
+    name: x/cloudbase-init
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -2534,7 +2534,7 @@
         - build-openstack-releasenotes
 
 - project:
-    name: openstack/cloudcafe
+    name: x/cloudcafe
     templates:
       - noop-jobs
 
@@ -2563,34 +2563,34 @@
       queue: cloudkitty
 
 - project:
-    name: openstack/cloudpulse
+    name: x/cloudpulse
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/cloudroast
+    name: x/cloudroast
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/cognitive
+    name: x/cognitive
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/collectd-openstack-plugins
+    name: x/collectd-openstack-plugins
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/compass-adapters
+    name: x/compass-adapters
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/compass-core
+    name: x/compass-core
     check:
       jobs:
         - openstack-tox-pep8
@@ -2601,22 +2601,22 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/compass-install
+    name: x/compass-install
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/compass-specs
+    name: x/compass-specs
     templates:
       - build-only-specs-jobs
 
 - project:
-    name: openstack/compass-web
+    name: x/compass-web
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/compute-hyperv
+    name: x/compute-hyperv
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -2652,7 +2652,7 @@
       - translation-jobs-master-only
 
 - project:
-    name: openstack/conveyor
+    name: x/conveyor
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2668,12 +2668,12 @@
       - noop-jobs
 
 - project:
-    name: openstack/coreos-image-builder
+    name: x/coreos-image-builder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/coupler
+    name: x/coupler
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2684,7 +2684,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/cursive
+    name: x/cursive
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -2698,12 +2698,12 @@
       - api-ref-jobs
 
 - project:
-    name: openstack/daisycloud-core
+    name: x/daisycloud-core
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/dash-stack
+    name: x/dash-stack
     templates:
       - noop-jobs
 
@@ -2713,7 +2713,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/delimiter
+    name: x/delimiter
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2747,7 +2747,7 @@
       queue: designate
 
 - project:
-    name: openstack/devstack-plugin-additional-pkg-repos
+    name: x/devstack-plugin-additional-pkg-repos
     check:
       jobs:
         - openstack-tox-bashate
@@ -2761,7 +2761,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-bdd
+    name: x/devstack-plugin-bdd
     check:
       jobs:
         - openstack-tox-bashate
@@ -2775,7 +2775,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-glusterfs
+    name: x/devstack-plugin-glusterfs
     check:
       jobs:
         - openstack-tox-bashate
@@ -2818,7 +2818,7 @@
               - ^setup.cfg$
 
 - project:
-    name: openstack/devstack-plugin-hdfs
+    name: x/devstack-plugin-hdfs
     check:
       jobs:
         - openstack-tox-bashate
@@ -2841,7 +2841,7 @@
               - ^setup.cfg$
 
 - project:
-    name: openstack/devstack-plugin-libvirt-qemu
+    name: x/devstack-plugin-libvirt-qemu
     check:
       jobs:
         - openstack-tox-bashate
@@ -2850,7 +2850,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-mariadb
+    name: x/devstack-plugin-mariadb
     check:
       jobs:
         - openstack-tox-bashate
@@ -2859,7 +2859,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-nfs
+    name: x/devstack-plugin-nfs
     check:
       jobs:
         - openstack-tox-bashate
@@ -2873,7 +2873,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-sheepdog
+    name: x/devstack-plugin-sheepdog
     check:
       jobs:
         - openstack-tox-bashate
@@ -2887,7 +2887,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-tar-installer
+    name: x/devstack-plugin-tar-installer
     check:
       jobs:
         - openstack-tox-bashate
@@ -2896,7 +2896,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/devstack-plugin-vmax
+    name: x/devstack-plugin-vmax
     check:
       jobs:
         - openstack-tox-bashate
@@ -2946,14 +2946,14 @@
 
 
 - project:
-    name: openstack/distil
+    name: x/distil
     templates:
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
 
 - project:
-    name: openstack/distil-ui
+    name: x/distil-ui
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -2977,26 +2977,26 @@
             branches: master
 
 - project:
-    name: openstack/doc8
+    name: x/doc8
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/docker-machine-openstack
+    name: x/docker-machine-openstack
     templates:
       - golang-jobs
 
 - project:
-    name: openstack/downpour
+    name: x/downpour
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
       - publish-to-pypi
 
 - project:
-    name: openstack/dox
+    name: x/dox
     templates:
       - openstack-python35-jobs-nonvoting
       - publish-to-pypi
@@ -3017,7 +3017,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/drbd-devstack
+    name: x/drbd-devstack
     check:
       jobs:
         - openstack-tox-bashate
@@ -3026,7 +3026,7 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/driverlog
+    name: x/driverlog
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -3043,7 +3043,7 @@
       queue: ec2-api
 
 - project:
-    name: openstack/ec2-driver
+    name: x/ec2-driver
     templates:
       - noop-jobs
 
@@ -3057,7 +3057,7 @@
       queue: ec2-api
 
 - project:
-    name: openstack/ekko
+    name: x/ekko
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -3069,7 +3069,7 @@
       - noop-jobs
 
 - project:
-    name: openstack/entropy
+    name: x/entropy
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -3091,7 +3091,7 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/fixtures-git
+    name: x/fixtures-git
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -3103,13 +3103,13 @@
             voting: false
 
 - project:
-    name: openstack/flame
+    name: x/flame
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
-    name: openstack/foxnut
+    name: x/foxnut
     templates:
       - openstack-python-jobs
 
@@ -3187,7 +3187,7 @@
         - legacy-fuel-astute-puppet-unit-3.8-centos-7
 
 - project:
-    name: openstack/fuel-ccp
+    name: x/fuel-ccp
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
@@ -3196,160 +3196,160 @@
       - openstack-python35-jobs
 
 - project:
-    name: openstack/fuel-ccp-ceph
+    name: x/fuel-ccp-ceph
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-ci-config
+    name: x/fuel-ccp-ci-config
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-cinder
+    name: x/fuel-ccp-cinder
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-debian-base
+    name: x/fuel-ccp-debian-base
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-designate
+    name: x/fuel-ccp-designate
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-elasticsearch
+    name: x/fuel-ccp-elasticsearch
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-entrypoint
+    name: x/fuel-ccp-entrypoint
     templates:
       - openstack-python-jobs
       - fuel-ccp-cross-repo-gate
       - openstack-python35-jobs
 
 - project:
-    name: openstack/fuel-ccp-etcd
+    name: x/fuel-ccp-etcd
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-galera
+    name: x/fuel-ccp-galera
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-glance
+    name: x/fuel-ccp-glance
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-grafana
+    name: x/fuel-ccp-grafana
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-heat
+    name: x/fuel-ccp-heat
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-horizon
+    name: x/fuel-ccp-horizon
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-installer
+    name: x/fuel-ccp-installer
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/fuel-ccp-ironic
+    name: x/fuel-ccp-ironic
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-keystone
+    name: x/fuel-ccp-keystone
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-mariadb
+    name: x/fuel-ccp-mariadb
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-memcached
+    name: x/fuel-ccp-memcached
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-murano
+    name: x/fuel-ccp-murano
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-neutron
+    name: x/fuel-ccp-neutron
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-nginx
+    name: x/fuel-ccp-nginx
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-nova
+    name: x/fuel-ccp-nova
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-openstack-base
+    name: x/fuel-ccp-openstack-base
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-rabbitmq
+    name: x/fuel-ccp-rabbitmq
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-rally
+    name: x/fuel-ccp-rally
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-sahara
+    name: x/fuel-ccp-sahara
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-searchlight
+    name: x/fuel-ccp-searchlight
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-specs
+    name: x/fuel-ccp-specs
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-stacklight
+    name: x/fuel-ccp-stacklight
     templates:
       - fuel-ccp-component
 
 - project:
-    name: openstack/fuel-ccp-tests
+    name: x/fuel-ccp-tests
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/fuel-ccp-zmq
+    name: x/fuel-ccp-zmq
     templates:
       - fuel-ccp-component
 
@@ -3511,7 +3511,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/fuel-noop-fixtures
+    name: x/fuel-noop-fixtures
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -3584,267 +3584,267 @@
             branches: ^(?!stable/8\.0).*$
 
 - project:
-    name: openstack/fuel-plugin-6wind-virtual-accelerator
+    name: x/fuel-plugin-6wind-virtual-accelerator
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-astara
+    name: x/fuel-plugin-astara
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-availability-zones
+    name: x/fuel-plugin-availability-zones
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-bgpvpn
+    name: x/fuel-plugin-bgpvpn
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-bigswitch
+    name: x/fuel-plugin-bigswitch
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-block-device
+    name: x/fuel-plugin-block-device
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-calamari
+    name: x/fuel-plugin-calamari
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-calico
+    name: x/fuel-plugin-calico
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ceilometer-redis
+    name: x/fuel-plugin-ceilometer-redis
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ceph-multibackend
+    name: x/fuel-plugin-ceph-multibackend
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ci
+    name: x/fuel-plugin-ci
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-cinder-gcs
+    name: x/fuel-plugin-cinder-gcs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-cinder-kaminario
+    name: x/fuel-plugin-cinder-kaminario
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-cinder-netapp
+    name: x/fuel-plugin-cinder-netapp
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-cisco-aci
+    name: x/fuel-plugin-cisco-aci
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-congress
+    name: x/fuel-plugin-congress
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-contrail
+    name: x/fuel-plugin-contrail
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-datera-cinder
+    name: x/fuel-plugin-datera-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-dbaas-trove
+    name: x/fuel-plugin-dbaas-trove
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-debug
+    name: x/fuel-plugin-debug
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-designate
+    name: x/fuel-plugin-designate
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-database
+    name: x/fuel-plugin-detach-database
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-haproxy
+    name: x/fuel-plugin-detach-haproxy
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-horizon
+    name: x/fuel-plugin-detach-horizon
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-keystone
+    name: x/fuel-plugin-detach-keystone
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-netnode
+    name: x/fuel-plugin-detach-netnode
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-rabbitmq
+    name: x/fuel-plugin-detach-rabbitmq
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-detach-swift
+    name: x/fuel-plugin-detach-swift
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-dns-updater
+    name: x/fuel-plugin-dns-updater
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-dynatrace
+    name: x/fuel-plugin-dynatrace
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-elasticsearch-kibana
+    name: x/fuel-plugin-elasticsearch-kibana
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-emailnotifyd
+    name: x/fuel-plugin-emailnotifyd
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-external-emc
+    name: x/fuel-plugin-external-emc
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-external-glusterfs
+    name: x/fuel-plugin-external-glusterfs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-external-lb
+    name: x/fuel-plugin-external-lb
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-external-zabbix
+    name: x/fuel-plugin-external-zabbix
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-fortinet
+    name: x/fuel-plugin-fortinet
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-glance-nfs
+    name: x/fuel-plugin-glance-nfs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-gluon
+    name: x/fuel-plugin-gluon
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ha-fencing
+    name: x/fuel-plugin-ha-fencing
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-hedvig-cinder
+    name: x/fuel-plugin-hedvig-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-influxdb-grafana
+    name: x/fuel-plugin-influxdb-grafana
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-inkscope
+    name: x/fuel-plugin-inkscope
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ironic
+    name: x/fuel-plugin-ironic
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-kafka
+    name: x/fuel-plugin-kafka
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ldap
+    name: x/fuel-plugin-ldap
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ldap-slaves
+    name: x/fuel-plugin-ldap-slaves
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-lma-collector
+    name: x/fuel-plugin-lma-collector
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-lma-infrastructure-alerting
+    name: x/fuel-plugin-lma-infrastructure-alerting
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-manila
+    name: x/fuel-plugin-manila
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-mellanox
+    name: x/fuel-plugin-mellanox
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-midonet
+    name: x/fuel-plugin-midonet
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-mistral
+    name: x/fuel-plugin-mistral
     templates:
       - noop-jobs
 
@@ -3854,7 +3854,7 @@
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-murano-networking-sfc
+    name: x/fuel-plugin-murano-networking-sfc
     templates:
       - noop-jobs
 
@@ -3864,207 +3864,207 @@
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-network-node
+    name: x/fuel-plugin-network-node
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-networking-sfc
+    name: x/fuel-plugin-networking-sfc
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-neutron-fwaas
+    name: x/fuel-plugin-neutron-fwaas
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-neutron-lbaas
+    name: x/fuel-plugin-neutron-lbaas
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-neutron-vpnaas
+    name: x/fuel-plugin-neutron-vpnaas
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nimblestorage-cinder
+    name: x/fuel-plugin-nimblestorage-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nitrous
+    name: x/fuel-plugin-nitrous
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nova-nfs
+    name: x/fuel-plugin-nova-nfs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nsx-t
+    name: x/fuel-plugin-nsx-t
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nsxv
+    name: x/fuel-plugin-nsxv
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-nuage
+    name: x/fuel-plugin-nuage
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-onos
+    name: x/fuel-plugin-onos
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-openbook
+    name: x/fuel-plugin-openbook
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-opendaylight
+    name: x/fuel-plugin-opendaylight
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-openstack-telemetry
+    name: x/fuel-plugin-openstack-telemetry
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-ovs
+    name: x/fuel-plugin-ovs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-plumgrid
+    name: x/fuel-plugin-plumgrid
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-purestorage-cinder
+    name: x/fuel-plugin-purestorage-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-qemu
+    name: x/fuel-plugin-qemu
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-qlogic-sriov-vxlan
+    name: x/fuel-plugin-qlogic-sriov-vxlan
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-rally
+    name: x/fuel-plugin-rally
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-saltstack
+    name: x/fuel-plugin-saltstack
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-scaleio
+    name: x/fuel-plugin-scaleio
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-scaleio-cinder
+    name: x/fuel-plugin-scaleio-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-sensu
+    name: x/fuel-plugin-sensu
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-solidfire-cinder
+    name: x/fuel-plugin-solidfire-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-swiftstack
+    name: x/fuel-plugin-swiftstack
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-tacker
+    name: x/fuel-plugin-tacker
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-tempest
+    name: x/fuel-plugin-tempest
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-tintri-cinder
+    name: x/fuel-plugin-tintri-cinder
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-tls
+    name: x/fuel-plugin-tls
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-unity
+    name: x/fuel-plugin-unity
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-vmware-dvs
+    name: x/fuel-plugin-vmware-dvs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-vxlan
+    name: x/fuel-plugin-vxlan
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-watcher
+    name: x/fuel-plugin-watcher
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-wstunnel
+    name: x/fuel-plugin-wstunnel
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-xenserver
+    name: x/fuel-plugin-xenserver
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-zabbix-agents
+    name: x/fuel-plugin-zabbix-agents
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-zabbix-monitoring-emc
+    name: x/fuel-plugin-zabbix-monitoring-emc
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-zabbix-monitoring-extreme-networks
+    name: x/fuel-plugin-zabbix-monitoring-extreme-networks
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/fuel-plugin-zabbix-snmptrapd
+    name: x/fuel-plugin-zabbix-snmptrapd
     templates:
       - noop-jobs
 
@@ -4193,19 +4193,19 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/gabbi-tempest
+    name: x/gabbi-tempest
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/gce-api
+    name: x/gce-api
     templates:
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
 
 - project:
-    name: openstack/gerrit-dash-creator
+    name: x/gerrit-dash-creator
     templates:
       - publish-to-pypi
       - docs-on-readthedocs
@@ -4219,37 +4219,37 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/gertty
+    name: ttygroup/gertty
     templates:
       - noop-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/giftwrap
+    name: x/giftwrap
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/git-nit
+    name: x/git-nit
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/git-os-job
+    name: x/git-os-job
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/git-repo-manifests
+    name: x/git-repo-manifests
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/git-upstream
+    name: x/git-upstream
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -4280,7 +4280,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/glare
+    name: x/glare
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -4288,7 +4288,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/glare-specs
+    name: x/glare-specs
     templates:
       - build-only-specs-jobs
     check:
@@ -4299,24 +4299,24 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/gluon
+    name: x/gluon
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/golang-client
+    name: x/golang-client
     templates:
       - golang-jobs
 
 - project:
-    name: openstack/golang-commons
+    name: x/golang-commons
     templates:
       - golang-jobs
 
 - project:
-    name: openstack/gos-brick
+    name: x/gos-brick
     templates:
       - golang-jobs
 
@@ -4340,7 +4340,7 @@
         - publish-governance-website
 
 - project:
-    name: openstack/group-based-policy
+    name: x/group-based-policy
     templates:
       - openstack-python-jobs
       - openstack-python-jobs-trusty
@@ -4370,14 +4370,14 @@
             branches: ^(?!stable/mitaka).*$
 
 - project:
-    name: openstack/group-based-policy-automation
+    name: x/group-based-policy-automation
     templates:
       - openstack-python-jobs
       - openstack-python-jobs-trusty
       - publish-to-pypi
 
 - project:
-    name: openstack/group-based-policy-specs
+    name: x/group-based-policy-specs
     check:
       jobs:
         - openstack-tox-py27
@@ -4388,7 +4388,7 @@
         - build-openstack-sphinx-docs
 
 - project:
-    name: openstack/group-based-policy-ui
+    name: x/group-based-policy-ui
     templates:
       - openstack-python-jobs
       - openstack-python-jobs-trusty
@@ -4448,12 +4448,12 @@
       queue: horizon
 
 - project:
-    name: openstack/horizon-mellanox
+    name: x/horizon-mellanox
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/hurricane
+    name: x/hurricane
     templates:
       - openstack-python-jobs
 
@@ -4463,7 +4463,7 @@
       - translation-jobs-master-only
 
 - project:
-    name: openstack/inception
+    name: x/inception
     check:
       jobs:
         - openstack-tox-pep8
@@ -4481,7 +4481,7 @@
       queue: tripleo
 
 - project:
-    name: openstack/intel-nfv-ci-tests
+    name: x/intel-nfv-ci-tests
     check:
       jobs:
         - openstack-tox-pep8
@@ -4490,12 +4490,12 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/interop-workloads
+    name: x/interop-workloads
     templates:
       - build-openstack-sphinx-docs
 
 - project:
-    name: openstack/iotronic
+    name: x/iotronic
     templates:
       - openstack-python35-jobs
       - check-requirements
@@ -4508,7 +4508,7 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/iotronic-lightning-rod
+    name: x/iotronic-lightning-rod
     templates:
       - openstack-python35-jobs
       - check-requirements
@@ -4521,14 +4521,14 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/iotronic-ui
+    name: x/iotronic-ui
     templates:
       - openstack-python-jobs-horizon
       - check-requirements
       - publish-to-pypi
 
 - project:
-    name: openstack/ipa-example-hardware-managers
+    name: x/ipa-example-hardware-managers
     check:
       jobs:
         - openstack-tox-pep8
@@ -4577,7 +4577,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ironic-staging-drivers
+    name: x/ironic-staging-drivers
     templates:
       - publish-to-pypi
 
@@ -4597,13 +4597,13 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/jacket
+    name: x/jacket
     templates:
       - openstack-python-jobs
       - check-requirements
 
 - project:
-    name: openstack/jenkins-plugins-for-murano
+    name: x/jenkins-plugins-for-murano
     templates:
       - noop-jobs
 
@@ -4630,12 +4630,12 @@
         - legacy-js-openstack-lib-nodejs6-npm-sdk-docs
 
 - project:
-    name: openstack/k8s-cloud-provider
+    name: x/k8s-cloud-provider
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/k8s-docker-suite-app-murano
+    name: x/k8s-docker-suite-app-murano
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -4665,7 +4665,7 @@
       - nodejs4-publish-to-npm
 
 - project:
-    name: openstack/kayobe
+    name: x/kayobe
     templates:
       - publish-to-pypi
 
@@ -4702,7 +4702,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/kiloeyes
+    name: x/kiloeyes
     templates:
       - openstack-cover-jobs
       - publish-to-pypi
@@ -4716,7 +4716,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/kingbird
+    name: x/kingbird
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -4728,7 +4728,7 @@
             voting: false
 
 - project:
-    name: openstack/kingbird-dashboard
+    name: x/kingbird-dashboard
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -4736,7 +4736,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/kloudbuster
+    name: x/kloudbuster
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
@@ -4754,14 +4754,14 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/kosmos
+    name: x/kosmos
     templates:
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
-    name: openstack/kosmos-specs
+    name: x/kosmos-specs
     templates:
       - build-only-specs-jobs
 
@@ -4794,7 +4794,7 @@
       queue: kuryr
 
 - project:
-    name: openstack/kwapi
+    name: x/kwapi
     check:
       jobs:
         - openstack-tox-pep8
@@ -4868,7 +4868,7 @@
       - translation-jobs-rocky
 
 - project:
-    name: openstack/marshal
+    name: x/marshal
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -4890,12 +4890,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/meghdwar
+    name: x/meghdwar
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/merlin
+    name: x/merlin
     templates:
       - nodejs4-jobs
     post:
@@ -4911,12 +4911,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/meteos
+    name: x/meteos
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/meteos-ui
+    name: x/meteos-ui
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -4960,7 +4960,7 @@
       queue: mistral
 
 - project:
-    name: openstack/mitmstack
+    name: x/mitmstack
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -4968,7 +4968,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/mixmatch
+    name: x/mixmatch
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -4976,7 +4976,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/mogan
+    name: x/mogan
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -4984,7 +4984,7 @@
       - openstack-python35-jobs
 
 - project:
-    name: openstack/mogan-specs
+    name: x/mogan-specs
     templates:
       - build-only-specs-jobs
     check:
@@ -4995,7 +4995,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/mogan-ui
+    name: x/mogan-ui
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -5115,12 +5115,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/monasca-vagrant
+    name: x/monasca-vagrant
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/monitorstack
+    name: x/monitorstack
     templates:
       - check-requirements
       - ansible-role-jobs
@@ -5135,7 +5135,7 @@
         - build-openstack-releasenotes
 
 - project:
-    name: openstack/mors
+    name: x/mors
     templates:
       - noop-jobs
 
@@ -5175,7 +5175,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/murano-plugin-networking-sfc
+    name: x/murano-plugin-networking-sfc
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5190,12 +5190,12 @@
       queue: murano
 
 - project:
-    name: openstack/namos
+    name: x/namos
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/nemesis
+    name: x/nemesis
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5203,7 +5203,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/nerd-reviewer
+    name: x/nerd-reviewer
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -5213,7 +5213,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/network-checker
+    name: x/network-checker
     templates:
       - publish-to-pypi
     check:
@@ -5226,23 +5226,23 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/networking-6wind
+    name: x/networking-6wind
     templates:
       - openstack-python-jobs-neutron
 
 - project:
-    name: openstack/networking-ale-omniswitch
+    name: x/networking-ale-omniswitch
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-ansible
+    name: x/networking-ansible
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-arista
+    name: x/networking-arista
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5250,7 +5250,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-avaya
+    name: x/networking-avaya
     templates:
       - noop-jobs
 
@@ -5285,14 +5285,14 @@
               - openstack/horizon
 
 - project:
-    name: openstack/networking-bigswitch
+    name: x/networking-bigswitch
     templates:
       - openstack-python-jobs-neutron
       - openstack-python-jobs-trusty
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-brocade
+    name: x/networking-brocade
     templates:
       - openstack-python-jobs-neutron
 
@@ -5305,12 +5305,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-cisco
+    name: x/networking-cisco
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-cumulus
+    name: x/networking-cumulus
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5318,7 +5318,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-dpm
+    name: x/networking-dpm
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5338,18 +5338,18 @@
               - openstack/neutron
 
 - project:
-    name: openstack/networking-edge-vpn
+    name: x/networking-edge-vpn
     templates:
       - openstack-python-jobs-neutron
 
 - project:
-    name: openstack/networking-extreme
+    name: x/networking-extreme
     templates:
       - openstack-python-jobs-neutron
       - check-requirements
 
 - project:
-    name: openstack/networking-fortinet
+    name: x/networking-fortinet
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5357,7 +5357,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-fujitsu
+    name: x/networking-fujitsu
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5383,13 +5383,13 @@
       queue: networking-generic-switch
 
 - project:
-    name: openstack/networking-gluon
+    name: x/networking-gluon
     templates:
       - openstack-python-jobs-neutron
       - check-requirements
 
 - project:
-    name: openstack/networking-h3c
+    name: x/networking-h3c
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5397,7 +5397,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-hpe
+    name: x/networking-hpe
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5405,7 +5405,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-huawei
+    name: x/networking-huawei
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5418,13 +5418,13 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-icc
+    name: x/networking-icc
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-infoblox
+    name: x/networking-infoblox
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
@@ -5453,14 +5453,14 @@
       queue: networking-l2gw
 
 - project:
-    name: openstack/networking-lagopus
+    name: x/networking-lagopus
     templates:
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-lenovo
+    name: x/networking-lenovo
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
@@ -5480,15 +5480,15 @@
               - openstack/neutron-lbaas
               - openstack/neutron-dynamic-routing
               - openstack/networking-l2gw
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
 
 - project:
-    name: openstack/networking-mlnx
+    name: x/networking-mlnx
     templates:
       - openstack-python-jobs-neutron
 
 - project:
-    name: openstack/networking-nec
+    name: x/networking-nec
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5539,7 +5539,7 @@
               - openstack/networking-sfc
 
 - project:
-    name: openstack/networking-opencontrail
+    name: x/networking-opencontrail
     templates:
       - check-requirements
       - openstack-python-jobs-neutron
@@ -5559,7 +5559,7 @@
               - openstack/neutron
 
 - project:
-    name: openstack/networking-ovs-dpdk
+    name: x/networking-ovs-dpdk
     templates:
       - openstack-python-jobs-neutron
     experimental:
@@ -5570,13 +5570,13 @@
               - ^setup.cfg$
 
 - project:
-    name: openstack/networking-peregrine
+    name: x/networking-peregrine
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-plumgrid
+    name: x/networking-plumgrid
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
@@ -5596,32 +5596,32 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-spp
+    name: x/networking-spp
     templates:
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-vpp
+    name: x/networking-vpp
     templates:
       - openstack-python-jobs-neutron
 
 - project:
-    name: openstack/networking-vsphere
+    name: x/networking-vsphere
     templates:
       - check-requirements
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-zte
+    name: x/networking-zte
     templates:
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
-    name: openstack/networking-zvm
+    name: x/networking-zvm
     templates:
       - openstack-python-jobs-neutron
 
@@ -5675,7 +5675,7 @@
               - ^tox.ini$
 
 - project:
-    name: openstack/neutron-classifier
+    name: x/neutron-classifier
     templates:
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -5741,7 +5741,7 @@
       - translation-jobs-master-stable
 
 - project:
-    name: openstack/nfv-filters
+    name: x/nfv-filters
     templates:
       - openstack-python-jobs
 
@@ -5759,7 +5759,7 @@
       queue: integrated
 
 - project:
-    name: openstack/nova-dpm
+    name: x/nova-dpm
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5777,13 +5777,13 @@
         - openstack-tox-functional-py35
 
 - project:
-    name: openstack/nova-fusioncompute
+    name: x/nova-fusioncompute
     templates:
       - openstack-python-jobs
       - check-requirements
 
 - project:
-    name: openstack/nova-lxd
+    name: x/nova-lxd
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5809,7 +5809,7 @@
               - ^setup.cfg$
 
 - project:
-    name: openstack/nova-mksproxy
+    name: x/nova-mksproxy
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5824,18 +5824,18 @@
       rtd_webhook_id: '44764'
 
 - project:
-    name: openstack/nova-solver-scheduler
+    name: x/nova-solver-scheduler
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/nova-zvm-virt-driver
+    name: x/nova-zvm-virt-driver
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/novajoin
+    name: x/novajoin
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5847,7 +5847,7 @@
       queue: novajoin
 
 - project:
-    name: openstack/novajoin-tempest-plugin
+    name: x/novajoin-tempest-plugin
     templates:
       - check-requirements
       - tempest-plugin-jobs
@@ -5857,7 +5857,7 @@
       queue: novajoin
 
 - project:
-    name: openstack/oaktree
+    name: x/oaktree
     templates:
       - publish-to-pypi-quietly
       - openstack-python-jobs
@@ -5868,7 +5868,7 @@
       queue: oaktree
 
 - project:
-    name: openstack/oaktreemodel
+    name: x/oaktreemodel
     check:
       queue: oaktree
     gate:
@@ -5911,7 +5911,7 @@
       queue: octavia
 
 - project:
-    name: openstack/omni
+    name: x/omni
     check:
       jobs:
         - legacy-omni-tests
@@ -5920,7 +5920,7 @@
         - legacy-omni-tests
 
 - project:
-    name: openstack/ooi
+    name: x/ooi
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -5935,7 +5935,7 @@
         - openstack-tox-functional
 
 - project:
-    name: openstack/opencafe
+    name: x/opencafe
     check:
       jobs:
         - openstack-tox-pep8
@@ -6198,22 +6198,22 @@
       - translation-jobs-master-only
 
 - project:
-    name: openstack/openstack-mentoring-scripts
+    name: x/openstack-mentoring-scripts
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/openstack-resource-agents
+    name: x/openstack-resource-agents
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/openstack-resource-agents-specs
+    name: x/openstack-resource-agents-specs
     templates:
       - build-only-specs-jobs
 
 - project:
-    name: openstack/openstack-spaceport
+    name: x/openstack-spaceport
     templates:
       - noop-jobs
 
@@ -6248,7 +6248,7 @@
       - noop-jobs
 
 - project:
-    name: openstack/ops-telecom-nfv
+    name: x/ops-telecom-nfv
     templates:
       - noop-jobs
 
@@ -6291,7 +6291,7 @@
       queue: tripleo
 
 - project:
-    name: openstack/os-dpm
+    name: x/os-dpm
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -6299,7 +6299,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/os-faults
+    name: performa/os-faults
     templates:
       - publish-to-pypi
 
@@ -6309,12 +6309,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/os-log-merger
+    name: x/os-log-merger
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/os-namos
+    name: x/os-namos
     templates:
       - noop-jobs
 
@@ -6376,7 +6376,7 @@
       queue: os-win
 
 - project:
-    name: openstack/os-xenapi
+    name: x/os-xenapi
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -6394,12 +6394,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/osc-summit-counter
+    name: x/osc-summit-counter
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/osel
+    name: x/osel
     templates:
       - golang-jobs
 
@@ -6533,22 +6533,22 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/osops-coda
+    name: x/osops-coda
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/osops-example-configs
+    name: x/osops-example-configs
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/osops-tools-contrib
+    name: x/osops-tools-contrib
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/osops-tools-generic
+    name: x/osops-tools-generic
     check:
       jobs:
         - openstack-tox-bashate
@@ -6557,12 +6557,12 @@
         - openstack-tox-bashate
 
 - project:
-    name: openstack/osops-tools-logging
+    name: x/osops-tools-logging
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/osops-tools-monitoring
+    name: x/osops-tools-monitoring
     templates:
       - noop-jobs
 
@@ -6586,7 +6586,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/packetary
+    name: x/packetary
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -6595,7 +6595,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/packetary-specs
+    name: x/packetary-specs
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -6608,7 +6608,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/packstack
+    name: x/packstack
     check:
       jobs:
         - openstack-tox-pep8
@@ -6627,7 +6627,7 @@
         - release-openstack-python-without-pypi
 
 - project:
-    name: openstack/pandaman
+    name: x/pandaman
     templates:
       - openstack-python-jobs
 
@@ -6652,12 +6652,12 @@
       queue: tripleo
 
 - project:
-    name: openstack/performa
+    name: x/performa
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/picasso
+    name: x/picasso
     templates:
       - noop-jobs
 
@@ -6672,7 +6672,7 @@
       queue: integrated
 
 - project:
-    name: openstack/poppy
+    name: x/poppy
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -6682,7 +6682,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/poppy-ui
+    name: x/poppy-ui
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -6690,12 +6690,12 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/powervc-driver
+    name: x/powervc-driver
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/proliantutils
+    name: x/proliantutils
     templates:
       - openstack-cover-jobs
       - openstack-python35-jobs
@@ -6724,7 +6724,7 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-autossh
+    name: x/puppet-autossh
     templates:
       - puppet-openstack-check-jobs
 
@@ -6769,7 +6769,7 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-fenix
+    name: x/puppet-fenix
     templates:
       - noop-jobs
 
@@ -6824,7 +6824,7 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-midonet
+    name: x/puppet-midonet
     templates:
       - puppet-beaker-jobs
     check:
@@ -6913,7 +6913,7 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-n1k-vsm
+    name: x/puppet-n1k-vsm
     templates:
       - puppet-openstack-check-jobs
       - puppet-module-unit-jobs
@@ -6998,12 +6998,12 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-setproxy
+    name: x/puppet-setproxy
     templates:
       - puppet-openstack-check-jobs
 
 - project:
-    name: openstack/puppet-surveil
+    name: x/puppet-surveil
     templates:
       - noop-jobs
 
@@ -7037,7 +7037,7 @@
       - puppet-release-jobs
 
 - project:
-    name: openstack/puppet-tuskar
+    name: x/puppet-tuskar
     templates:
       - noop-jobs
 
@@ -7067,7 +7067,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/pyeclib
+    name: x/pyeclib
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -7076,7 +7076,7 @@
         - openstack-tox-py35
 
 - project:
-    name: openstack/pyghmi
+    name: x/pyghmi
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -7095,7 +7095,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-almanachclient
+    name: x/python-almanachclient
     templates:
       - openstack-python35-jobs
       - check-requirements
@@ -7115,7 +7115,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-apmecclient
+    name: x/python-apmecclient
     templates:
       - publish-to-pypi
 
@@ -7125,7 +7125,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-bileanclient
+    name: x/python-bileanclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7153,13 +7153,13 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-cloudpulseclient
+    name: x/python-cloudpulseclient
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/python-cognitiveclient
+    name: x/python-cognitiveclient
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -7180,14 +7180,14 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-distilclient
+    name: x/python-distilclient
     templates:
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
 
 - project:
-    name: openstack/python-don
+    name: x/python-don
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -7224,7 +7224,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-glareclient
+    name: x/python-glareclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7232,7 +7232,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-group-based-policy-client
+    name: x/python-group-based-policy-client
     templates:
       - openstack-python-jobs
       - openstack-python-jobs-trusty
@@ -7245,7 +7245,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-hnvclient
+    name: x/python-hnvclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7253,7 +7253,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-iotronicclient
+    name: x/python-iotronicclient
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -7270,7 +7270,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-jenkins
+    name: jjb/python-jenkins
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -7285,7 +7285,7 @@
             nodeset: ubuntu-bionic
 
 - project:
-    name: openstack/python-k8sclient
+    name: x/python-k8sclient
     templates:
       - noop-jobs
 
@@ -7302,7 +7302,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-kingbirdclient
+    name: x/python-kingbirdclient
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -7326,7 +7326,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-meteosclient
+    name: x/python-meteosclient
     templates:
       - openstack-python-jobs
 
@@ -7336,7 +7336,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-moganclient
+    name: x/python-moganclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7355,7 +7355,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-namosclient
+    name: x/python-namosclient
     templates:
       - noop-jobs
 
@@ -7377,7 +7377,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-oneviewclient
+    name: x/python-oneviewclient
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -7391,7 +7391,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-opentsdbclient
+    name: x/python-opentsdbclient
     templates:
       - openstack-python35-jobs
     check:
@@ -7409,7 +7409,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-picassoclient
+    name: x/python-picassoclient
     templates:
       - noop-jobs
 
@@ -7423,7 +7423,7 @@
       queue: qinling
 
 - project:
-    name: openstack/python-redfish
+    name: x/python-redfish
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7431,7 +7431,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-rsdclient
+    name: x/python-rsdclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7448,7 +7448,7 @@
       queue: sahara
 
 - project:
-    name: openstack/python-scciclient
+    name: x/python-scciclient
     templates:
       - check-requirements
       - openstack-python35-jobs
@@ -7473,7 +7473,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-surveilclient
+    name: x/python-surveilclient
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7494,7 +7494,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/python-tatuclient
+    name: x/python-tatuclient
     templates:
       - noop-jobs
 
@@ -7527,7 +7527,7 @@
       queue: trove
 
 - project:
-    name: openstack/python-valenceclient
+    name: x/python-valenceclient
     templates:
       - check-requirements
       - openstack-python-jobs
@@ -7569,7 +7569,7 @@
       - translation-jobs-master-only
 
 - project:
-    name: openstack/quark
+    name: x/quark
     templates:
       - check-requirements
       - publish-to-pypi
@@ -7583,7 +7583,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/radar
+    name: x/radar
     templates:
       - noop-jobs
 
@@ -7598,7 +7598,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/ramdisk-func-test
+    name: x/ramdisk-func-test
     check:
       jobs:
         - openstack-tox-pep8
@@ -7607,12 +7607,12 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/ranger
+    name: x/ranger
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/ranger-agent
+    name: x/ranger-agent
     templates:
       - openstack-python-jobs
 
@@ -7673,14 +7673,14 @@
               update_target: requirements-constraints
 
 - project:
-    name: openstack/rsd-lib
+    name: x/rsd-lib
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/rsd-virt-for-nova
+    name: x/rsd-virt-for-nova
     templates:
       - publish-to-pypi
 
@@ -7696,7 +7696,7 @@
       queue: sahara
 
 - project:
-    name: openstack/sahara-ci-config
+    name: x/sahara-ci-config
     check:
       jobs:
         - openstack-tox-pep8
@@ -7790,7 +7790,7 @@
       queue: sahara
 
 - project:
-    name: openstack/scalpels
+    name: x/scalpels
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -7845,7 +7845,7 @@
       queue: senlin
 
 - project:
-    name: openstack/shaker
+    name: performa/shaker
     templates:
       - publish-to-pypi
 
@@ -7861,92 +7861,92 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/shovel
+    name: x/shovel
     templates:
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
 - project:
-    name: openstack/shovel-horizon
+    name: x/shovel-horizon
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/slogging
+    name: x/slogging
     templates:
       - check-requirements
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/snap-ceilometer
+    name: x/snap-ceilometer
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-cinder
+    name: x/snap-cinder
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-glance
+    name: x/snap-glance
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-gnocchi
+    name: x/snap-gnocchi
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-keystone
+    name: x/snap-keystone
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-neutron
+    name: x/snap-neutron
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-nova
+    name: x/snap-nova
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-nova-hypervisor
+    name: x/snap-nova-hypervisor
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-openstackclients
+    name: x/snap-openstackclients
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-rally
+    name: x/snap-rally
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap-tempest
+    name: x/snap-tempest
     templates:
       - snap-jobs
 
 - project:
-    name: openstack/snap.openstack
+    name: x/snap.openstack
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/solar
+    name: x/solar
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/solar-resources
+    name: x/solar-resources
     templates:
       - noop-jobs
 
@@ -7985,7 +7985,7 @@
       queue: solum
 
 - project:
-    name: openstack/spanner
+    name: x/spanner
     templates:
       - openstack-python-jobs
 
@@ -7995,7 +7995,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/sqlalchemy-migrate
+    name: x/sqlalchemy-migrate
     templates:
       - docs-on-readthedocs
       - openstack-python35-jobs-nonvoting
@@ -8017,12 +8017,12 @@
         - publish-openstack-python-branch-tarball
 
 - project:
-    name: openstack/stackalytics
+    name: x/stackalytics
     templates:
       - publish-to-pypi-quietly
 
 - project:
-    name: openstack/stacklight-integration-tests
+    name: x/stacklight-integration-tests
     check:
       jobs:
         - openstack-tox-pep8
@@ -8031,7 +8031,7 @@
         - openstack-tox-pep8
 
 - project:
-    name: openstack/stacktach
+    name: x/stacktach
     check:
       jobs:
         - openstack-tox-pep8
@@ -8042,7 +8042,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-klugman
+    name: x/stacktach-klugman
     check:
       jobs:
         - openstack-tox-pep8
@@ -8053,7 +8053,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-notification-utils
+    name: x/stacktach-notification-utils
     check:
       jobs:
         - openstack-tox-pep8
@@ -8064,12 +8064,12 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-notigen
+    name: x/stacktach-notigen
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/stacktach-quince
+    name: x/stacktach-quince
     check:
       jobs:
         - openstack-tox-pep8
@@ -8080,7 +8080,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-quincy
+    name: x/stacktach-quincy
     check:
       jobs:
         - openstack-tox-pep8
@@ -8091,12 +8091,12 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-sandbox
+    name: x/stacktach-sandbox
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/stacktach-shoebox
+    name: x/stacktach-shoebox
     check:
       jobs:
         - openstack-tox-pep8
@@ -8107,7 +8107,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-simport
+    name: x/stacktach-simport
     check:
       jobs:
         - openstack-tox-pep8
@@ -8118,7 +8118,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-stackdistiller
+    name: x/stacktach-stackdistiller
     check:
       jobs:
         - openstack-tox-pep8
@@ -8129,7 +8129,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-timex
+    name: x/stacktach-timex
     check:
       jobs:
         - openstack-tox-pep8
@@ -8140,7 +8140,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stacktach-winchester
+    name: x/stacktach-winchester
     check:
       jobs:
         - openstack-tox-pep8
@@ -8151,12 +8151,12 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/stackube
+    name: x/stackube
     templates:
       - golang-jobs
 
 - project:
-    name: openstack/steth
+    name: x/steth
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -8172,7 +8172,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/surveil
+    name: x/surveil
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
@@ -8182,7 +8182,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/surveil-specs
+    name: x/surveil-specs
     templates:
       - noop-jobs
 
@@ -8197,7 +8197,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/swauth
+    name: x/swauth
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
@@ -8223,7 +8223,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/swift-ceph-backend
+    name: x/swift-ceph-backend
     check:
       jobs:
         - openstack-tox-pep8
@@ -8234,7 +8234,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/swift3
+    name: x/swift3
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
@@ -8249,7 +8249,7 @@
         - release-openstack-python-without-pypi
 
 - project:
-    name: openstack/swiftonfile
+    name: x/swiftonfile
     check:
       jobs:
         - openstack-tox-pep8
@@ -8260,7 +8260,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/swiftonhpss
+    name: x/swiftonhpss
     templates:
       - publish-to-pypi
     check:
@@ -8273,13 +8273,13 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/synergy-scheduler-manager
+    name: x/synergy-scheduler-manager
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/synergy-service
+    name: x/synergy-service
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -8312,7 +8312,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/tap-as-a-service
+    name: x/tap-as-a-service
     templates:
       - openstack-cover-jobs-neutron
       - check-requirements
@@ -8320,7 +8320,7 @@
       - openstack-python35-jobs-neutron
 
 - project:
-    name: openstack/tap-as-a-service-dashboard
+    name: x/tap-as-a-service-dashboard
     templates:
       - check-requirements
       - openstack-python-jobs-horizon
@@ -8332,22 +8332,22 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/tatu
+    name: x/tatu
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/tatu-dashboard
+    name: x/tatu-dashboard
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/tc-as-a-service
+    name: x/tc-as-a-service
     templates:
       - openstack-python-jobs
 
 - project:
-    name: openstack/telcowg-usecases
+    name: x/telcowg-usecases
     templates:
       - build-only-specs-jobs
     check:
@@ -8395,18 +8395,18 @@
       - noop-jobs
 
 - project:
-    name: openstack/terracotta
+    name: x/terracotta
     templates:
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
-    name: openstack/third-party-ci-tools
+    name: x/third-party-ci-tools
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/timmy
+    name: x/timmy
     templates:
       - openstack-python-jobs
       - publish-to-pypi
@@ -8440,7 +8440,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/trio2o
+    name: x/trio2o
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -8584,7 +8584,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/turbo-hipster
+    name: x/turbo-hipster
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
@@ -8601,12 +8601,12 @@
       - noop-jobs
 
 - project:
-    name: openstack/vahana
+    name: x/vahana
     templates:
       - noop-jobs
 
 - project:
-    name: openstack/valence
+    name: x/valence
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -8620,12 +8620,12 @@
         - build-openstack-releasenotes
 
 - project:
-    name: openstack/valence-specs
+    name: x/valence-specs
     templates:
       - build-only-specs-jobs
 
 - project:
-    name: openstack/valet
+    name: x/valet
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -8638,7 +8638,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/virtualpdu
+    name: x/virtualpdu
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8677,7 +8677,7 @@
       queue: vitrage
 
 - project:
-    name: openstack/vm-bm-wg
+    name: x/vm-bm-wg
     check:
       jobs:
         - openstack-tox-py27
@@ -8686,7 +8686,7 @@
         - openstack-tox-py27
 
 - project:
-    name: openstack/vmtp
+    name: x/vmtp
     templates:
       - openstack-python-jobs
       # Revert to docs-on-readthedocs when fixed
@@ -8694,7 +8694,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/vmware-nsx
+    name: x/vmware-nsx
     templates:
       - openstack-python-jobs-neutron
       - check-requirements
@@ -8711,11 +8711,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-pep8:
             required-projects:
@@ -8723,11 +8723,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py27:
             timeout: 5400
@@ -8736,11 +8736,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py35:
             timeout: 5400
@@ -8749,11 +8749,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
     gate:
       queue: vmware-nsx
@@ -8764,11 +8764,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-pep8:
             required-projects:
@@ -8776,11 +8776,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py27:
             timeout: 5400
@@ -8789,11 +8789,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py35:
             timeout: 5400
@@ -8802,11 +8802,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
     periodic-stable:
       jobs:
@@ -8821,11 +8821,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py35:
             timeout: 5400
@@ -8838,11 +8838,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
         - build-openstack-sphinx-docs:
             branches:
@@ -8854,11 +8854,11 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
     periodic:
       jobs:
@@ -8869,15 +8869,15 @@
               - openstack/networking-l2gw
               - openstack/networking-sfc
               - openstack/neutron-lbaas
-              - openstack/vmware-nsxlib
+              - x/vmware-nsxlib
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - openstack/tap-as-a-service
+              - x/tap-as-a-service
               - openstack/octavia
 
 - project:
-    name: openstack/vmware-nsx-tempest-plugin
+    name: x/vmware-nsx-tempest-plugin
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8889,7 +8889,7 @@
       queue: vmware-nsx
 
 - project:
-    name: openstack/vmware-nsxlib
+    name: x/vmware-nsxlib
     templates:
       - openstack-python-jobs
       - check-requirements
@@ -8897,7 +8897,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/vmware-vspc
+    name: x/vmware-vspc
     templates:
       - openstack-python35-jobs
       - publish-to-pypi
@@ -8943,18 +8943,18 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/windmill
+    name: windmill/windmill
     templates:
       # Revert to docs-on-readthedocs when fixed
       - docs-on-readthedocs-failing
 
 - project:
-    name: openstack/wsme
+    name: x/wsme
     templates:
       - publish-to-pypi
 
 - project:
-    name: openstack/xenapi-os-testing
+    name: x/xenapi-os-testing
     templates:
       - noop-jobs
 
@@ -8971,13 +8971,13 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/xstatic-angular-cookies
+    name: x/xstatic-angular-cookies
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
-    name: openstack/xstatic-angular-fileupload
+    name: x/xstatic-angular-fileupload
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
@@ -9001,7 +9001,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/xstatic-angular-mock
+    name: x/xstatic-angular-mock
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
@@ -9013,7 +9013,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/xstatic-angular-sanitize
+    name: x/xstatic-angular-sanitize
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
@@ -9096,7 +9096,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/xstatic-jquery.bootstrap.wizard
+    name: x/xstatic-jquery.bootstrap.wizard
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
@@ -9144,7 +9144,7 @@
       - publish-to-pypi
 
 - project:
-    name: openstack/xstatic-qunit
+    name: x/xstatic-qunit
     templates:
       - noop-jobs
       - publish-xstatic-to-pypi
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index af830b5c19..9a53c82597 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -342,9 +342,9 @@
 - secret:
     name: proposal_ssh_key
     data:
-      fqdn: review.openstack.org
+      fqdn: review.opendev.org
       ssh_known_hosts: |
-        review.openstack.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH proposal-bot@review.openstack.org
+        review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH proposal-bot@review.opendev.org
       ssh_private_key: !encrypted/pkcs1-oaep
         - Aqh9/dY8+VN2zfbbh/1gds/SScE1NOF9v/lAB8GdgiddZCNL2l0fFK3o0KL87IQYq+kN1
           nq/q6cSsl13eQxzdH4kig0IwvoRoabsQefHnGX0Bfg2+1eHRirseEhwZ2cY93sLWiZa1C
@@ -422,9 +422,9 @@
 - secret:
     name: release_ssh_key
     data:
-      fqdn: review.openstack.org
+      fqdn: review.opendev.org
       ssh_known_hosts: |
-        review.openstack.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH release@review.openstack.org
+        review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH release@review.opendev.org
       ssh_private_key: !encrypted/pkcs1-oaep
         - x1+fTO5A9nI+9ZzmPkcnhdGjUl831xromQ8r/j5/boiWmfQ2Cw3NGD6B+KosOmWXmF8f/
           kzVz7+/D2cBwNlBci4mrLvJHqYMaHUVCq32ciokJaC3vgEuX6qyb4UDYaCNdHMxVK7wFB
@@ -542,7 +542,7 @@
           UYUxkWiH21RHbKGs5aTegydQmB/Pgw/HoF7yz9XbktfZ4PVghZJ4ssD/S1rq55wE+VwjE
           Nx5z/lAk0hzM5MWQj0ZtHsqWs/xqodo4i7ucLNWs9UInT+1e2Md9SphQa3COK9FadhmfM
           9zPvfZpEiF/0aC5VoZyKKwFUJvgTj+vxnN2P2JTQVQvTlxnIXxFZANV8LcHmBI=
-      consumer_key: 'System-wide: Ubuntu (review.openstack.org)'
+      consumer_key: 'System-wide: Ubuntu (review.opendev.org)'
 
 - secret:
     name: static_ssh_key
diff --git a/zuul.d/starlingx-jobs.yaml b/zuul.d/starlingx-jobs.yaml
index 540d838ba5..6f47d3142b 100644
--- a/zuul.d/starlingx-jobs.yaml
+++ b/zuul.d/starlingx-jobs.yaml
@@ -18,8 +18,8 @@
       - playbooks/sphinx/post-infra.yaml
       - playbooks/publish/starlingx-afs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     secrets:
       - secret: afsdocs_secret
         name: afs
@@ -66,7 +66,7 @@
     # Set final to avoid override of afs_subpath variable.
     final: true
     allowed-projects:
-      - openstack/stx-docs
+      - starlingx/docs
     vars:
       # Define empty so we publish to the webroot
       afs_subpath: ""
@@ -82,7 +82,7 @@
     # Set final to avoid override of afs_subpath variable.
     final: true
     allowed-projects:
-      - openstack/stx-governance
+      - starlingx/governance
     vars:
       afs_subpath: "/governance"
 
@@ -114,6 +114,6 @@
     # Set final to avoid override of afs_subpath variable.
     final: true
     allowed-projects:
-      - openstack/stx-specs
+      - starlingx/specs
     vars:
       afs_subpath: "/specs"
diff --git a/zuul.d/zuul-jobs.yaml b/zuul.d/zuul-jobs.yaml
index cbb8747978..929f685a4d 100644
--- a/zuul.d/zuul-jobs.yaml
+++ b/zuul.d/zuul-jobs.yaml
@@ -3,12 +3,12 @@
     description: |
       Publishes content in artifacts/ to the Zuul website.
     allowed-projects:
-      - openstack-infra/zuul-website
-      - openstack-infra/zuul-website-media
+      - zuul/zuul-website
+      - zuul/zuul-website-media
     post-run:
       - playbooks/publish/zuul-afs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     secrets:
       - secret: afsdocs_secret
         name: afs
@@ -23,10 +23,10 @@
     # Set final to avoid override of afs_subpath variable.
     final: true
     allowed-projects:
-      - openstack-infra/nodepool
-      - openstack-infra/zuul
-      - openstack-infra/zuul-jobs
-      - openstack-infra/zuul-base-jobs
+      - zuul/nodepool
+      - zuul/zuul
+      - zuul/zuul-jobs
+      - zuul/zuul-base-jobs
     pre-run: playbooks/project-config/pre-tox.yaml
     run: playbooks/project-config/run-tox.yaml
     post-run:
@@ -34,8 +34,8 @@
       - playbooks/sphinx/post-infra.yaml
       - playbooks/publish/zuul-afs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
-      - zuul: openstack-infra/openstack-zuul-jobs
+      - zuul: zuul/zuul-jobs
+      - zuul: openstack/openstack-zuul-jobs
     secrets:
       - secret: afsdocs_secret
         name: afs
diff --git a/zuul/main.yaml b/zuul/main.yaml
index ab36245b68..a637f5913a 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -7,7 +7,7 @@
           - opendev/project-config
           - opendev/base-jobs
         untrusted-projects:
-          - openstack-infra/zuul-jobs
+          - zuul/zuul-jobs
           - inaugust/inaugust.com
           - inaugust/src.sh
           - inaugust/ttrun
@@ -28,7 +28,7 @@
                 - job
                 - secret
         untrusted-projects:
-          - openstack-infra/zuul-jobs
+          - zuul/zuul-jobs
       github:
         untrusted-projects:
           # Don't load any configuration from these projects because we
@@ -55,236 +55,236 @@
     source:
       gerrit:
         config-projects:
-          - openstack-infra/project-config
+          - openstack/project-config
           # Only use jobs and secrets from this repo, we do not want
           # the project definition.
           - opendev/base-jobs:
-              shadow: openstack-infra/project-config
+              shadow: openstack/project-config
               include:
                 - job
                 - secret
-          - openstack-infra/zuul-base-jobs:
+          - zuul/zuul-base-jobs:
               shadow:
                 - opendev/base-jobs
-                - openstack-infra/project-config
+                - openstack/project-config
         untrusted-projects:
           # Order matters, load common job repos first
-          - openstack-infra/zuul-jobs:
-              shadow: openstack-infra/project-config
-          - openstack-infra/openstack-zuul-jobs
-          - openstack-infra/openstack-zuul-roles
+          - zuul/zuul-jobs:
+              shadow: openstack/project-config
+          - openstack/openstack-zuul-jobs
+          - openstack/openstack-zuul-roles
           # devstack-gate, devstack and tempest all define things expected
           # to be widely used.
-          - openstack-infra/devstack-gate
-          - openstack-dev/devstack
+          - openstack/devstack-gate
+          - openstack/devstack
           - openstack/tempest
           # openstack-ansible-tests is used across multiple
           # roles including ansible-hardening
           - openstack/openstack-ansible-tests
           # After this point, sorting projects alphabetically will help
           # merge conflicts
-          - openstack-dev/bashate
+          - openstack/bashate
           - openstack-dev/ci-sandbox:
               exclude: pipeline
-          - openstack-dev/cookiecutter
-          - openstack-dev/devstack-plugin-cookiecutter
-          - openstack-dev/devstack-vagrant
-          - openstack-dev/grenade
-          - openstack-dev/hacking
-          - openstack-dev/heat-cfnclient
-          - openstack-dev/openstack-nose
+          - openstack/cookiecutter
+          - openstack/devstack-plugin-cookiecutter
+          - openstack/devstack-vagrant
+          - openstack/grenade
+          - openstack/hacking
+          - openstack/heat-cfnclient
+          - openstack/openstack-nose
           - openstack-dev/os-http
-          - openstack-dev/oslo-cookiecutter
-          - openstack-dev/pbr
+          - openstack/oslo-cookiecutter
+          - openstack/pbr
           - openstack-dev/sandbox
-          - openstack-dev/specs-cookiecutter
-          - openstack-infra/afsmon
-          - openstack-infra/ansible-role-puppet
-          - openstack-infra/askbot-theme
-          - openstack-infra/bindep
-          - openstack-infra/bugdaystats
-          - openstack-infra/ciwatch
-          - openstack-infra/elastic-recheck
-          - openstack-infra/gear
-          - openstack-infra/gearman-plugin
-          - openstack-infra/germqtt
-          - openstack-infra/gerrit
-          - openstack-infra/gerritbot
-          - openstack-infra/gerritlib
-          - openstack-infra/git-restack
-          - openstack-infra/git-review
-          - openstack-infra/gitdm
-          - openstack-infra/glean
-          - openstack-infra/grafyaml
-          - openstack-infra/groups
-          - openstack-infra/groups-static-pages
-          - openstack-infra/infra-ansible
-          - openstack-infra/infra-manual
-          - openstack-infra/infra-specs
-          - openstack-infra/irc-meetings
-          - openstack-infra/jeepyb
-          - openstack-infra/jenkins-job-builder
-          - openstack-infra/lodgeit
-          - openstack-infra/log-classify
-          - openstack-infra/log_processor
-          - openstack-infra/logstash-filters
-          - openstack-infra/lpmqtt
-          - openstack-infra/meetbot
-          - openstack-infra/mqtt_statsd
+          - openstack/specs-cookiecutter
+          - opendev/afsmon
+          - opendev/ansible-role-puppet
+          - opendev/askbot-theme
+          - opendev/bindep
+          - openstack/bugdaystats
+          - x/ciwatch
+          - opendev/elastic-recheck
+          - opendev/gear
+          - x/gearman-plugin
+          - opendev/germqtt
+          - opendev/gerrit
+          - opendev/gerritbot
+          - opendev/gerritlib
+          - opendev/git-restack
+          - openstack/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
+          - jjb/jenkins-job-builder
+          - opendev/lodgeit
+          - opendev/log-classify
+          - opendev/log_processor
+          - openstack/logstash-filters
+          - opendev/lpmqtt
+          - opendev/meetbot
+          - opendev/mqtt_statsd
           - openstack-infra/netlify-sandbox
-          - openstack-infra/nodepool
-          - openstack-infra/nose-html-output
-          - openstack-infra/odsreg
+          - zuul/nodepool
+          - openstack/nose-html-output
+          - osf/odsreg
           - openstack-infra/opendev-website
-          - openstack-infra/openstackid
-          - openstack-infra/openstackid-resources
-          - openstack-infra/openstackweb
-          - openstack-infra/os-loganalyze
-          - openstack-infra/project-config-example
-          - openstack-infra/publications
-          - openstack-infra/puppet-accessbot
-          - openstack-infra/puppet-ansible
-          - openstack-infra/puppet-apparmor
-          - 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-ciwatch
-          - 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-infra-cookiecutter
-          - openstack-infra/puppet-infracloud
-          - openstack-infra/puppet-ipsilon
-          - 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-openafs
-          - openstack-infra/puppet-openstack_health
-          - openstack-infra/puppet-openstack_infra_spec_helper
-          - openstack-infra/puppet-openstackci
-          - 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-puppet
-          - 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-statusbot
-          - openstack-infra/puppet-storyboard
-          - openstack-infra/puppet-subunit2sql
-          - openstack-infra/puppet-sudoers
-          - openstack-infra/puppet-tmpreaper
-          - openstack-infra/puppet-translation_checksite
-          - openstack-infra/puppet-ulimit
-          - openstack-infra/puppet-unattended_upgrades
-          - openstack-infra/puppet-unbound
-          - openstack-infra/puppet-user
-          - openstack-infra/puppet-vcsrepo
-          - openstack-infra/puppet-yum
-          - openstack-infra/puppet-zanata
-          - openstack-infra/puppet-zuul
-          - openstack-infra/pynotedb
-          - openstack-infra/python-storyboardclient
-          - openstack-infra/requestsexceptions
-          - openstack-infra/reviewday
-          - openstack-infra/reviewstats
-          - openstack-infra/shade
-          - openstack-infra/statusbot
-          - openstack-infra/storyboard
-          - openstack-infra/storyboard-webclient
-          - openstack-infra/subunit2sql
-          - openstack-infra/system-config
-          - openstack-infra/tripleo-ci
-          - openstack-infra/yaml2ical
-          - openstack-infra/zmq-event-publisher
+          - osf/openstackid
+          - osf/openstackid-resources
+          - osf/openstackweb
+          - openstack/os-loganalyze
+          - opendev/project-config-example
+          - opendev/publications
+          - opendev/puppet-accessbot
+          - opendev/puppet-ansible
+          - opendev/puppet-apparmor
+          - opendev/puppet-askbot
+          - opendev/puppet-asterisk
+          - opendev/puppet-bandersnatch
+          - opendev/puppet-bugdaystats
+          - opendev/puppet-bup
+          - opendev/puppet-cgit
+          - opendev/puppet-ciwatch
+          - opendev/puppet-diskimage_builder
+          - opendev/puppet-drupal
+          - opendev/puppet-elastic_recheck
+          - opendev/puppet-elasticsearch
+          - opendev/puppet-ethercalc
+          - opendev/puppet-etherpad_lite
+          - opendev/puppet-exim
+          - opendev/puppet-germqtt
+          - opendev/puppet-gerrit
+          - opendev/puppet-gerritbot
+          - opendev/puppet-github
+          - opendev/puppet-grafyaml
+          - opendev/puppet-graphite
+          - opendev/puppet-haveged
+          - opendev/puppet-hound
+          - opendev/puppet-httpd
+          - opendev/puppet-infra-cookiecutter
+          - opendev/puppet-infracloud
+          - opendev/puppet-ipsilon
+          - opendev/puppet-iptables
+          - opendev/puppet-jeepyb
+          - opendev/puppet-jenkins
+          - opendev/puppet-kerberos
+          - opendev/puppet-kibana
+          - opendev/puppet-lodgeit
+          - opendev/puppet-log_processor
+          - opendev/puppet-logrotate
+          - opendev/puppet-logstash
+          - opendev/puppet-lpmqtt
+          - opendev/puppet-mailman
+          - opendev/puppet-mediawiki
+          - opendev/puppet-meetbot
+          - opendev/puppet-mosquitto
+          - opendev/puppet-mqtt_statsd
+          - opendev/puppet-mysql_backup
+          - opendev/puppet-nodepool
+          - opendev/puppet-openafs
+          - opendev/puppet-openstack_health
+          - opendev/puppet-openstack_infra_spec_helper
+          - opendev/puppet-openstackci
+          - opendev/puppet-openstackid
+          - opendev/puppet-os_client_config
+          - opendev/puppet-packagekit
+          - opendev/puppet-pgsql_backup
+          - opendev/puppet-phabricator
+          - opendev/puppet-pip
+          - opendev/puppet-planet
+          - opendev/puppet-project_config
+          - opendev/puppet-ptgbot
+          - opendev/puppet-puppet
+          - opendev/puppet-redis
+          - opendev/puppet-refstack
+          - opendev/puppet-reviewday
+          - opendev/puppet-simpleproxy
+          - opendev/puppet-snmpd
+          - opendev/puppet-ssh
+          - opendev/puppet-ssl_cert_check
+          - opendev/puppet-statusbot
+          - opendev/puppet-storyboard
+          - opendev/puppet-subunit2sql
+          - opendev/puppet-sudoers
+          - opendev/puppet-tmpreaper
+          - opendev/puppet-translation_checksite
+          - opendev/puppet-ulimit
+          - opendev/puppet-unattended_upgrades
+          - opendev/puppet-unbound
+          - opendev/puppet-user
+          - opendev/puppet-vcsrepo
+          - opendev/puppet-yum
+          - opendev/puppet-zanata
+          - opendev/puppet-zuul
+          - opendev/pynotedb
+          - opendev/python-storyboardclient
+          - openstack/requestsexceptions
+          - openstack/reviewday
+          - openstack/reviewstats
+          - openstack/shade
+          - opendev/statusbot
+          - opendev/storyboard
+          - opendev/storyboard-webclient
+          - opendev/subunit2sql
+          - opendev/system-config
+          - openstack/tripleo-ci
+          - opendev/yaml2ical
+          - x/zmq-event-publisher
           - openstack-infra/zone-opendev.org
           - openstack-infra/zone-zuul-ci.org
-          - openstack-infra/zuul
-          - openstack-infra/zuul-preview
-          - openstack-infra/zuul-website
-          - openstack-infra/zuul-website-media
+          - zuul/zuul
+          - zuul/zuul-preview
+          - zuul/zuul-website
+          - zuul/zuul-website-media
           - openstack/adjutant
           - openstack/adjutant-ui
-          - openstack/aeromancer
-          - openstack/ailuropoda
-          - openstack/airship-armada
-          - openstack/airship-berth
-          - openstack/airship-deckhand
-          - openstack/airship-divingbell
-          - openstack/airship-drydock
-          - openstack/airship-governance
-          - openstack/airship-in-a-bottle
-          - openstack/airship-maas
-          - openstack/airship-pegleg
-          - openstack/airship-promenade
-          - openstack/airship-shipyard
-          - openstack/airship-specs
-          - openstack/airship-spyglass
-          - openstack/airship-tempest-plugin
-          - openstack/airship-treasuremap
-          - openstack/airship-utils
-          - openstack/alexandria
-          - openstack/almanach
+          - x/aeromancer
+          - x/ailuropoda
+          - airship/armada
+          - airship/berth
+          - airship/deckhand
+          - airship/divingbell
+          - airship/drydock
+          - airship/governance
+          - airship/in-a-bottle
+          - airship/maas
+          - airship/pegleg
+          - airship/promenade
+          - airship/shipyard
+          - airship/specs
+          - airship/spyglass
+          - airship/tempest-plugin
+          - airship/treasuremap
+          - airship/utils
+          - x/alexandria
+          - x/almanach
           - openstack/ansible-config_template
           - openstack/ansible-hardening
-          - openstack/ansible-role-ansible
-          - openstack/ansible-role-ara
+          - windmill/ansible-role-ansible
+          - recordsansible/ansible-role-ara
           - openstack/ansible-role-atos-hsm
-          - openstack/ansible-role-bindep
-          - openstack/ansible-role-borgbackup
-          - openstack/ansible-role-borgmatic
-          - openstack/ansible-role-carbon
+          - x/ansible-role-bindep
+          - windmill/ansible-role-borgbackup
+          - windmill/ansible-role-borgmatic
+          - windmill/ansible-role-carbon
           - openstack/ansible-role-chrony
-          - openstack/ansible-role-cloud-launcher
+          - x/ansible-role-cloud-launcher
           - openstack/ansible-role-collect-logs
           - openstack/ansible-role-container-registry
-          - openstack/ansible-role-diskimage-builder
-          - openstack/ansible-role-fedmsg
-          - openstack/ansible-role-gearman
-          - openstack/ansible-role-grafyaml
-          - openstack/ansible-role-jenkins
-          - openstack/ansible-role-jenkins-job-builder
-          - openstack/ansible-role-jenkins-plugins
+          - 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
           - openstack/ansible-role-k8s-cinder
           - openstack/ansible-role-k8s-cookiecutter
           - openstack/ansible-role-k8s-glance
@@ -292,18 +292,18 @@
           - openstack/ansible-role-k8s-mariadb
           - openstack/ansible-role-k8s-rabbitmq
           - openstack/ansible-role-k8s-tripleo
-          - openstack/ansible-role-logrotate
-          - openstack/ansible-role-nginx
-          - openstack/ansible-role-nodepool
+          - windmill/ansible-role-logrotate
+          - windmill/ansible-role-nginx
+          - windmill/ansible-role-nodepool
           - openstack/ansible-role-openstack-operations
-          - openstack/ansible-role-openstacksdk
+          - windmill/ansible-role-openstacksdk
           - openstack/ansible-role-python_venv_build
           - openstack/ansible-role-qdrouterd
           - openstack/ansible-role-redhat-subscription
-          - openstack/ansible-role-shade
-          - openstack/ansible-role-ssh
-          - openstack/ansible-role-statsd
-          - openstack/ansible-role-sudoers
+          - x/ansible-role-shade
+          - windmill/ansible-role-ssh
+          - windmill/ansible-role-statsd
+          - windmill/ansible-role-sudoers
           - openstack/ansible-role-systemd_mount
           - openstack/ansible-role-systemd_networkd
           - openstack/ansible-role-systemd_service
@@ -312,7 +312,7 @@
           - openstack/ansible-role-tripleo-barbican
           - openstack/ansible-role-tripleo-ceilometer
           - openstack/ansible-role-tripleo-cinder
-          - openstack/ansible-role-tripleo-congress
+          - x/ansible-role-tripleo-congress
           - openstack/ansible-role-tripleo-cookiecutter
           - openstack/ansible-role-tripleo-designate
           - openstack/ansible-role-tripleo-glance
@@ -343,53 +343,53 @@
           - openstack/ansible-role-tripleo-tempest
           - openstack/ansible-role-tripleo-ui
           - openstack/ansible-role-tripleo-zaqar
-          - openstack/ansible-role-virtualenv
-          - openstack/ansible-role-whisper
-          - openstack/ansible-role-zookeeper
-          - openstack/ansible-role-zuul
+          - windmill/ansible-role-virtualenv
+          - windmill/ansible-role-whisper
+          - windmill/ansible-role-zookeeper
+          - windmill/ansible-role-zuul
           - openstack/aodh
           - openstack/api-sig
           - openstack/api-site
-          - openstack/apmec
-          - openstack/apmec-horizon
-          - openstack/ara
-          - openstack/ara-infra
-          - openstack/ara-web
+          - x/apmec
+          - x/apmec-horizon
+          - recordsansible/ara
+          - recordsansible/ara-infra
+          - recordsansible/ara-web
           - openstack/arch-design
           - openstack/arch-wg
           - openstack/auto-scaling-sig
           - openstack/automaton
-          - openstack/bansho
+          - x/bansho
           - openstack/barbican
           - openstack/barbican-specs
           - openstack/barbican-tempest-plugin
-          - openstack/bareon
-          - openstack/bareon-allocator
-          - openstack/bareon-api
-          - openstack/bareon-image-elements
-          - openstack/bareon-ironic
-          - openstack/bareon-specs
+          - x/bareon
+          - x/bareon-allocator
+          - x/bareon-api
+          - x/bareon-image-elements
+          - x/bareon-ironic
+          - x/bareon-specs
           - openstack/bifrost
-          - openstack/bilean
+          - x/bilean
           - openstack/blazar
           - openstack/blazar-dashboard
           - openstack/blazar-nova
           - openstack/blazar-specs
           - openstack/blazar-tempest-plugin
-          - openstack/boartty
-          - openstack/broadview-collector
-          - openstack/broadview-lib
-          - openstack/broadview-ui
-          - openstack/browbeat
+          - ttygroup/boartty
+          - x/broadview-collector
+          - x/broadview-lib
+          - x/broadview-ui
+          - x/browbeat
           - openstack/castellan
           - openstack/castellan-ui
-          - openstack/cathead
+          - x/cathead
           - openstack/ceilometer
           - openstack/ceilometer-powervm
-          - openstack/ceilometer-zvm
+          - x/ceilometer-zvm
           - openstack/ceilometermiddleware
-          - openstack/certbot-dns-openstack
-          - openstack/charm-6wind-virtual-accelerator
+          - x/certbot-dns-openstack
+          - x/charm-6wind-virtual-accelerator
           - openstack/charm-aodh
           - openstack/charm-barbican
           - openstack/charm-barbican-softhsm
@@ -416,7 +416,7 @@
           - openstack/charm-guide
           - openstack/charm-hacluster
           - openstack/charm-heat
-          - openstack/charm-interface-barbican-hsm
+          - x/charm-interface-barbican-hsm
           - openstack/charm-interface-barbican-secrets
           - openstack/charm-interface-bgp
           - openstack/charm-interface-bind-rndc
@@ -464,7 +464,7 @@
           - openstack/charm-neutron-api
           - openstack/charm-neutron-api-genericswitch
           - openstack/charm-neutron-api-odl
-          - openstack/charm-neutron-api-plumgrid
+          - x/charm-neutron-api-plumgrid
           - openstack/charm-neutron-dynamic-routing
           - openstack/charm-neutron-gateway
           - openstack/charm-neutron-openvswitch
@@ -480,52 +480,52 @@
           - openstack/charm-pacemaker-remote
           - openstack/charm-panko
           - openstack/charm-percona-cluster
-          - openstack/charm-plumgrid-director
-          - openstack/charm-plumgrid-edge
-          - openstack/charm-plumgrid-gateway
+          - x/charm-plumgrid-director
+          - x/charm-plumgrid-edge
+          - x/charm-plumgrid-gateway
           - openstack/charm-rabbitmq-server
           - openstack/charm-specs
           - openstack/charm-swift-proxy
           - openstack/charm-swift-storage
           - openstack/charm-tempest
           - openstack/charm-trove
-          - openstack/charm-vault
+          - x/charm-vault
           - openstack/charms.ceph
           - openstack/charms.openstack
-          - openstack/ci-cd-pipeline-app-murano
+          - x/ci-cd-pipeline-app-murano
           - openstack/cinder
-          - openstack/cinder-fusioncompute
+          - x/cinder-fusioncompute
           - openstack/cinder-specs
           - openstack/cinder-tempest-plugin
           - openstack/cinderlib
-          - openstack/cisco-ironic-contrib
-          - openstack/cl-openstack-client
+          - x/cisco-ironic-contrib
+          - x/cl-openstack-client
           - openstack/cliff
-          - openstack/cloud-init
-          - openstack/cloudbase-init
-          - openstack/cloudcafe
+          - x/cloud-init
+          - x/cloudbase-init
+          - x/cloudcafe
           - openstack/cloudkitty
           - openstack/cloudkitty-dashboard
           - openstack/cloudkitty-specs
           - openstack/cloudkitty-tempest-plugin
-          - openstack/cloudpulse
-          - openstack/cloudroast
-          - openstack/coats
-          - openstack/cognitive
-          - openstack/collectd-openstack-plugins
-          - openstack/compass-adapters
-          - openstack/compass-core
-          - openstack/compass-install
-          - openstack/compass-specs
-          - openstack/compass-web
-          - openstack/compute-hyperv
+          - x/cloudpulse
+          - x/cloudroast
+          - x/coats
+          - x/cognitive
+          - x/collectd-openstack-plugins
+          - x/compass-adapters
+          - x/compass-core
+          - x/compass-install
+          - x/compass-specs
+          - x/compass-web
+          - x/compute-hyperv
           - openstack/congress
           - openstack/congress-dashboard
           - openstack/congress-specs
           - openstack/congress-tempest-plugin
           - openstack/constellations
           - openstack/contributor-guide
-          - openstack/conveyor
+          - x/conveyor
           - openstack/cookbook-openstack-application-catalog
           - openstack/cookbook-openstack-bare-metal
           - openstack/cookbook-openstack-block-storage
@@ -543,66 +543,66 @@
           - openstack/cookbook-openstack-orchestration
           - openstack/cookbook-openstack-telemetry
           - openstack/cookbook-openstackclient
-          - openstack/coreos-image-builder
-          - openstack/coupler
+          - x/coreos-image-builder
+          - x/coupler
           - openstack/coverage2sql
-          - openstack/cursive
+          - x/cursive
           - openstack/cyborg
           - openstack/cyborg-specs
-          - openstack/daisycloud-core
-          - openstack/dash-stack
+          - x/daisycloud-core
+          - x/dash-stack
           - openstack/debtcollector
-          - openstack/delimiter
+          - x/delimiter
           - openstack/designate
           - openstack/designate-dashboard
           - openstack/designate-specs
           - openstack/designate-tempest-plugin
-          - openstack/devstack-plugin-additional-pkg-repos
+          - x/devstack-plugin-additional-pkg-repos
           - openstack/devstack-plugin-amqp1
-          - openstack/devstack-plugin-bdd
+          - x/devstack-plugin-bdd
           - openstack/devstack-plugin-ceph
           - openstack/devstack-plugin-container
-          - openstack/devstack-plugin-glusterfs
-          - openstack/devstack-plugin-hdfs
+          - x/devstack-plugin-glusterfs
+          - x/devstack-plugin-hdfs
           - openstack/devstack-plugin-kafka
-          - openstack/devstack-plugin-libvirt-qemu
-          - openstack/devstack-plugin-mariadb
-          - openstack/devstack-plugin-nfs
+          - x/devstack-plugin-libvirt-qemu
+          - x/devstack-plugin-mariadb
+          - x/devstack-plugin-nfs
           - openstack/devstack-plugin-pika
-          - openstack/devstack-plugin-sheepdog
-          - openstack/devstack-plugin-tar-installer
-          - openstack/devstack-plugin-vmax
+          - x/devstack-plugin-sheepdog
+          - x/devstack-plugin-tar-installer
+          - x/devstack-plugin-vmax
           - openstack/devstack-plugin-zmq
           - openstack/devstack-tools
           - openstack/dib-utils
           - openstack/diskimage-builder
-          - openstack/distil
-          - openstack/distil-ui
+          - x/distil
+          - x/distil-ui
           - openstack/django_openstack_auth
-          - openstack/doc8
-          - openstack/docker-machine-openstack
+          - x/doc8
+          - x/docker-machine-openstack
           - openstack/docs-specs
-          - openstack/downpour
-          - openstack/dox
+          - x/downpour
+          - x/dox
           - openstack/dragonflow
-          - openstack/drbd-devstack
-          - openstack/driverlog
+          - x/drbd-devstack
+          - x/driverlog
           - openstack/ec2-api
-          - openstack/ec2-driver
+          - x/ec2-driver
           - openstack/ec2api-tempest-plugin
-          - openstack/edge-computing-group
-          - openstack/ekko
+          - osf/edge-computing-group
+          - x/ekko
           - openstack/election
           - openstack/enterprise-wg
-          - openstack/entropy
+          - x/entropy
           - openstack/eslint-config-openstack
           - openstack/faafo
-          - openstack/fenix
-          - openstack/fixtures-git
-          - openstack/flame
-          - openstack/flare
-          - openstack/four-opens
-          - openstack/foxnut
+          - x/fenix
+          - x/fixtures-git
+          - x/flame
+          - x/flare
+          - osf/four-opens
+          - x/foxnut
           - openstack/freezer
           - openstack/freezer-api
           - openstack/freezer-dr
@@ -611,38 +611,38 @@
           - openstack/freezer-web-ui
           - openstack/fuel-agent
           - openstack/fuel-astute
-          - openstack/fuel-ccp
-          - openstack/fuel-ccp-ceph
-          - openstack/fuel-ccp-ci-config
-          - openstack/fuel-ccp-cinder
-          - openstack/fuel-ccp-debian-base
-          - openstack/fuel-ccp-designate
-          - openstack/fuel-ccp-elasticsearch
-          - openstack/fuel-ccp-entrypoint
-          - openstack/fuel-ccp-etcd
-          - openstack/fuel-ccp-galera
-          - openstack/fuel-ccp-glance
-          - openstack/fuel-ccp-grafana
-          - openstack/fuel-ccp-heat
-          - openstack/fuel-ccp-horizon
-          - openstack/fuel-ccp-installer
-          - openstack/fuel-ccp-ironic
-          - openstack/fuel-ccp-keystone
-          - openstack/fuel-ccp-mariadb
-          - openstack/fuel-ccp-memcached
-          - openstack/fuel-ccp-murano
-          - openstack/fuel-ccp-neutron
-          - openstack/fuel-ccp-nginx
-          - openstack/fuel-ccp-nova
-          - openstack/fuel-ccp-openstack-base
-          - openstack/fuel-ccp-rabbitmq
-          - openstack/fuel-ccp-rally
-          - openstack/fuel-ccp-sahara
-          - openstack/fuel-ccp-searchlight
-          - openstack/fuel-ccp-specs
-          - openstack/fuel-ccp-stacklight
-          - openstack/fuel-ccp-tests
-          - openstack/fuel-ccp-zmq
+          - x/fuel-ccp
+          - x/fuel-ccp-ceph
+          - x/fuel-ccp-ci-config
+          - x/fuel-ccp-cinder
+          - x/fuel-ccp-debian-base
+          - x/fuel-ccp-designate
+          - x/fuel-ccp-elasticsearch
+          - x/fuel-ccp-entrypoint
+          - x/fuel-ccp-etcd
+          - x/fuel-ccp-galera
+          - x/fuel-ccp-glance
+          - x/fuel-ccp-grafana
+          - x/fuel-ccp-heat
+          - x/fuel-ccp-horizon
+          - x/fuel-ccp-installer
+          - x/fuel-ccp-ironic
+          - x/fuel-ccp-keystone
+          - x/fuel-ccp-mariadb
+          - x/fuel-ccp-memcached
+          - x/fuel-ccp-murano
+          - x/fuel-ccp-neutron
+          - x/fuel-ccp-nginx
+          - x/fuel-ccp-nova
+          - x/fuel-ccp-openstack-base
+          - x/fuel-ccp-rabbitmq
+          - x/fuel-ccp-rally
+          - x/fuel-ccp-sahara
+          - x/fuel-ccp-searchlight
+          - x/fuel-ccp-specs
+          - x/fuel-ccp-stacklight
+          - x/fuel-ccp-tests
+          - x/fuel-ccp-zmq
           - openstack/fuel-dev-tools
           - openstack/fuel-devops
           - openstack/fuel-docs
@@ -654,106 +654,106 @@
           - openstack/fuel-nailgun-extension-cluster-upgrade
           - openstack/fuel-nailgun-extension-converted-serializers
           - openstack/fuel-nailgun-extension-iac
-          - openstack/fuel-noop-fixtures
+          - x/fuel-noop-fixtures
           - openstack/fuel-octane
           - openstack/fuel-ostf
-          - openstack/fuel-plugin-6wind-virtual-accelerator
-          - openstack/fuel-plugin-astara
-          - openstack/fuel-plugin-availability-zones
-          - openstack/fuel-plugin-bgpvpn
-          - openstack/fuel-plugin-bigswitch
-          - openstack/fuel-plugin-block-device
-          - openstack/fuel-plugin-calamari
-          - openstack/fuel-plugin-calico
-          - openstack/fuel-plugin-ceilometer-redis
-          - openstack/fuel-plugin-ceph-multibackend
-          - openstack/fuel-plugin-ci
-          - openstack/fuel-plugin-cinder-gcs
-          - openstack/fuel-plugin-cinder-kaminario
-          - openstack/fuel-plugin-cinder-netapp
-          - openstack/fuel-plugin-cisco-aci
-          - openstack/fuel-plugin-congress
-          - openstack/fuel-plugin-contrail
-          - openstack/fuel-plugin-datera-cinder
-          - openstack/fuel-plugin-dbaas-trove
-          - openstack/fuel-plugin-debug
-          - openstack/fuel-plugin-designate
-          - openstack/fuel-plugin-detach-database
-          - openstack/fuel-plugin-detach-haproxy
-          - openstack/fuel-plugin-detach-horizon
-          - openstack/fuel-plugin-detach-keystone
-          - openstack/fuel-plugin-detach-netnode
-          - openstack/fuel-plugin-detach-rabbitmq
-          - openstack/fuel-plugin-detach-swift
-          - openstack/fuel-plugin-dns-updater
-          - openstack/fuel-plugin-dynatrace
-          - openstack/fuel-plugin-elasticsearch-kibana
-          - openstack/fuel-plugin-emailnotifyd
-          - openstack/fuel-plugin-external-emc
-          - openstack/fuel-plugin-external-glusterfs
-          - openstack/fuel-plugin-external-lb
-          - openstack/fuel-plugin-external-zabbix
-          - openstack/fuel-plugin-fortinet
-          - openstack/fuel-plugin-glance-nfs
-          - openstack/fuel-plugin-gluon
-          - openstack/fuel-plugin-ha-fencing
-          - openstack/fuel-plugin-hedvig-cinder
-          - openstack/fuel-plugin-influxdb-grafana
-          - openstack/fuel-plugin-inkscope
-          - openstack/fuel-plugin-ironic
-          - openstack/fuel-plugin-kafka
-          - openstack/fuel-plugin-ldap
-          - openstack/fuel-plugin-ldap-slaves
-          - openstack/fuel-plugin-lma-collector
-          - openstack/fuel-plugin-lma-infrastructure-alerting
-          - openstack/fuel-plugin-manila
-          - openstack/fuel-plugin-mellanox
-          - openstack/fuel-plugin-midonet
-          - openstack/fuel-plugin-mistral
+          - x/fuel-plugin-6wind-virtual-accelerator
+          - x/fuel-plugin-astara
+          - x/fuel-plugin-availability-zones
+          - x/fuel-plugin-bgpvpn
+          - x/fuel-plugin-bigswitch
+          - x/fuel-plugin-block-device
+          - x/fuel-plugin-calamari
+          - x/fuel-plugin-calico
+          - x/fuel-plugin-ceilometer-redis
+          - x/fuel-plugin-ceph-multibackend
+          - x/fuel-plugin-ci
+          - x/fuel-plugin-cinder-gcs
+          - x/fuel-plugin-cinder-kaminario
+          - x/fuel-plugin-cinder-netapp
+          - x/fuel-plugin-cisco-aci
+          - x/fuel-plugin-congress
+          - x/fuel-plugin-contrail
+          - x/fuel-plugin-datera-cinder
+          - x/fuel-plugin-dbaas-trove
+          - x/fuel-plugin-debug
+          - x/fuel-plugin-designate
+          - x/fuel-plugin-detach-database
+          - x/fuel-plugin-detach-haproxy
+          - x/fuel-plugin-detach-horizon
+          - x/fuel-plugin-detach-keystone
+          - x/fuel-plugin-detach-netnode
+          - x/fuel-plugin-detach-rabbitmq
+          - x/fuel-plugin-detach-swift
+          - x/fuel-plugin-dns-updater
+          - x/fuel-plugin-dynatrace
+          - x/fuel-plugin-elasticsearch-kibana
+          - x/fuel-plugin-emailnotifyd
+          - x/fuel-plugin-external-emc
+          - x/fuel-plugin-external-glusterfs
+          - x/fuel-plugin-external-lb
+          - x/fuel-plugin-external-zabbix
+          - x/fuel-plugin-fortinet
+          - x/fuel-plugin-glance-nfs
+          - x/fuel-plugin-gluon
+          - x/fuel-plugin-ha-fencing
+          - x/fuel-plugin-hedvig-cinder
+          - x/fuel-plugin-influxdb-grafana
+          - x/fuel-plugin-inkscope
+          - x/fuel-plugin-ironic
+          - x/fuel-plugin-kafka
+          - x/fuel-plugin-ldap
+          - x/fuel-plugin-ldap-slaves
+          - x/fuel-plugin-lma-collector
+          - x/fuel-plugin-lma-infrastructure-alerting
+          - x/fuel-plugin-manila
+          - x/fuel-plugin-mellanox
+          - x/fuel-plugin-midonet
+          - x/fuel-plugin-mistral
           - openstack/fuel-plugin-murano
-          - openstack/fuel-plugin-murano-networking-sfc
+          - x/fuel-plugin-murano-networking-sfc
           - openstack/fuel-plugin-murano-tests
-          - openstack/fuel-plugin-network-node
-          - openstack/fuel-plugin-networking-sfc
-          - openstack/fuel-plugin-neutron-fwaas
-          - openstack/fuel-plugin-neutron-lbaas
-          - openstack/fuel-plugin-neutron-vpnaas
-          - openstack/fuel-plugin-nimblestorage-cinder
-          - openstack/fuel-plugin-nitrous
-          - openstack/fuel-plugin-nova-nfs
-          - openstack/fuel-plugin-nsx-t
-          - openstack/fuel-plugin-nsxv
-          - openstack/fuel-plugin-nuage
-          - openstack/fuel-plugin-onos
-          - openstack/fuel-plugin-openbook
-          - openstack/fuel-plugin-opendaylight
-          - openstack/fuel-plugin-openstack-telemetry
-          - openstack/fuel-plugin-ovs
-          - openstack/fuel-plugin-plumgrid
-          - openstack/fuel-plugin-purestorage-cinder
-          - openstack/fuel-plugin-qemu
-          - openstack/fuel-plugin-qlogic-sriov-vxlan
-          - openstack/fuel-plugin-rally
-          - openstack/fuel-plugin-saltstack
-          - openstack/fuel-plugin-scaleio
-          - openstack/fuel-plugin-scaleio-cinder
-          - openstack/fuel-plugin-sensu
-          - openstack/fuel-plugin-solidfire-cinder
-          - openstack/fuel-plugin-swiftstack
-          - openstack/fuel-plugin-tacker
-          - openstack/fuel-plugin-tempest
-          - openstack/fuel-plugin-tintri-cinder
-          - openstack/fuel-plugin-tls
-          - openstack/fuel-plugin-unity
-          - openstack/fuel-plugin-vmware-dvs
-          - openstack/fuel-plugin-vxlan
-          - openstack/fuel-plugin-watcher
-          - openstack/fuel-plugin-wstunnel
-          - openstack/fuel-plugin-xenserver
-          - openstack/fuel-plugin-zabbix-agents
-          - openstack/fuel-plugin-zabbix-monitoring-emc
-          - openstack/fuel-plugin-zabbix-monitoring-extreme-networks
-          - openstack/fuel-plugin-zabbix-snmptrapd
+          - x/fuel-plugin-network-node
+          - x/fuel-plugin-networking-sfc
+          - x/fuel-plugin-neutron-fwaas
+          - x/fuel-plugin-neutron-lbaas
+          - x/fuel-plugin-neutron-vpnaas
+          - x/fuel-plugin-nimblestorage-cinder
+          - x/fuel-plugin-nitrous
+          - x/fuel-plugin-nova-nfs
+          - x/fuel-plugin-nsx-t
+          - x/fuel-plugin-nsxv
+          - x/fuel-plugin-nuage
+          - x/fuel-plugin-onos
+          - x/fuel-plugin-openbook
+          - x/fuel-plugin-opendaylight
+          - x/fuel-plugin-openstack-telemetry
+          - x/fuel-plugin-ovs
+          - x/fuel-plugin-plumgrid
+          - x/fuel-plugin-purestorage-cinder
+          - x/fuel-plugin-qemu
+          - x/fuel-plugin-qlogic-sriov-vxlan
+          - x/fuel-plugin-rally
+          - x/fuel-plugin-saltstack
+          - x/fuel-plugin-scaleio
+          - x/fuel-plugin-scaleio-cinder
+          - x/fuel-plugin-sensu
+          - x/fuel-plugin-solidfire-cinder
+          - x/fuel-plugin-swiftstack
+          - x/fuel-plugin-tacker
+          - x/fuel-plugin-tempest
+          - x/fuel-plugin-tintri-cinder
+          - x/fuel-plugin-tls
+          - x/fuel-plugin-unity
+          - x/fuel-plugin-vmware-dvs
+          - x/fuel-plugin-vxlan
+          - x/fuel-plugin-watcher
+          - x/fuel-plugin-wstunnel
+          - x/fuel-plugin-xenserver
+          - x/fuel-plugin-zabbix-agents
+          - x/fuel-plugin-zabbix-monitoring-emc
+          - x/fuel-plugin-zabbix-monitoring-extreme-networks
+          - x/fuel-plugin-zabbix-snmptrapd
           - openstack/fuel-plugins
           - openstack/fuel-qa
           - openstack/fuel-specs
@@ -762,36 +762,36 @@
           - openstack/fuel-virtualbox
           - openstack/fuel-web
           - openstack/futurist
-          - openstack/gabbi-tempest
-          - openstack/gce-api
-          - openstack/gerrit-dash-creator
-          - openstack/gertty
-          - openstack/giftwrap
-          - openstack/git-nit
-          - openstack/git-os-job
-          - openstack/git-repo-manifests
-          - openstack/git-upstream
+          - x/gabbi-tempest
+          - x/gce-api
+          - x/gerrit-dash-creator
+          - ttygroup/gertty
+          - x/giftwrap
+          - x/git-nit
+          - x/git-os-job
+          - x/git-repo-manifests
+          - x/git-upstream
           - openstack/glance
           - openstack/glance-specs
           - openstack/glance_store
-          - openstack/glare
-          - openstack/glare-specs
-          - openstack/gluon
+          - x/glare
+          - x/glare-specs
+          - x/gluon
           - openstack/goal-tools
-          - openstack/golang-client
-          - openstack/golang-commons
-          - openstack/gos-brick
+          - x/golang-client
+          - x/golang-commons
+          - x/gos-brick
           - openstack/governance
           - openstack/governance-sigs
           - openstack/governance-uc
           - openstack/governance-website
-          - openstack/group-based-policy
-          - openstack/group-based-policy-automation
-          - openstack/group-based-policy-specs
-          - openstack/group-based-policy-ui
-          - openstack/gyan
-          - openstack/gyan-dashboard
-          - openstack/gyan-specs
+          - x/group-based-policy
+          - x/group-based-policy-automation
+          - x/group-based-policy-specs
+          - x/group-based-policy-ui
+          - x/gyan
+          - x/gyan-dashboard
+          - x/gyan-specs
           - openstack/ha-guide
           - openstack/heat
           - openstack/heat-agents
@@ -802,19 +802,19 @@
           - openstack/heat-templates
           - openstack/heat-translator
           - openstack/horizon
-          - openstack/horizon-mellanox
-          - openstack/hurricane
+          - x/horizon-mellanox
+          - x/hurricane
           - openstack/i18n
           - openstack/i18n-specs
-          - openstack/inception
+          - x/inception
           - openstack/instack-undercloud
-          - openstack/intel-nfv-ci-tests
+          - x/intel-nfv-ci-tests
           - openstack/interop
-          - openstack/interop-workloads
-          - openstack/iotronic
-          - openstack/iotronic-lightning-rod
-          - openstack/iotronic-ui
-          - openstack/ipa-example-hardware-managers
+          - x/interop-workloads
+          - x/iotronic
+          - x/iotronic-lightning-rod
+          - x/iotronic-ui
+          - x/ipa-example-hardware-managers
           - openstack/ironic
           - openstack/ironic-inspector
           - openstack/ironic-inspector-specs
@@ -822,43 +822,43 @@
           - openstack/ironic-python-agent
           - openstack/ironic-python-agent-builder
           - openstack/ironic-specs
-          - openstack/ironic-staging-drivers
+          - x/ironic-staging-drivers
           - openstack/ironic-tempest-plugin
           - openstack/ironic-ui
-          - openstack/jacket
-          - openstack/jenkins-plugins-for-murano
+          - x/jacket
+          - x/jenkins-plugins-for-murano
           - openstack/js-openstack-lib
-          - openstack/k8s-cloud-provider
-          - openstack/k8s-docker-suite-app-murano
+          - x/k8s-cloud-provider
+          - x/k8s-docker-suite-app-murano
           - openstack/karbor
           - openstack/karbor-dashboard
           - openstack/karma-subunit-reporter
-          - openstack/kayobe
-          - openstack/kayobe-config
-          - openstack/kayobe-config-dev
+          - x/kayobe
+          - x/kayobe-config
+          - x/kayobe-config-dev
           - openstack/keystone
           - openstack/keystone-specs
           - openstack/keystone-tempest-plugin
           - openstack/keystoneauth
           - openstack/keystonemiddleware
-          - openstack/kiloeyes
-          - openstack/kingbird
-          - openstack/kingbird-dashboard
-          - openstack/kloudbuster
+          - x/kiloeyes
+          - x/kingbird
+          - x/kingbird-dashboard
+          - x/kloudbuster
           - openstack/kolla
           - openstack/kolla-ansible
           - openstack/kolla-cli
-          - openstack/kosmos
-          - openstack/kosmos-specs
+          - x/kosmos
+          - x/kosmos-specs
           - openstack/kuryr
           - openstack/kuryr-kubernetes
           - openstack/kuryr-libnetwork
           - openstack/kuryr-tempest-plugin
-          - openstack/ku.stella
-          - openstack/kwapi
+          - x/ku.stella
+          - x/kwapi
           - openstack/ldappool
-          - openstack/liberasurecode
-          - openstack/limestone-ci-cloud
+          - x/liberasurecode
+          - limestone/ci-cloud-config
           - openstack/loci
           - openstack/magnum
           - openstack/magnum-specs
@@ -870,16 +870,16 @@
           - openstack/manila-tempest-plugin
           - openstack/manila-test-image
           - openstack/manila-ui
-          - openstack/marshal
+          - x/marshal
           - openstack/masakari
           - openstack/masakari-dashboard
           - openstack/masakari-monitors
           - openstack/masakari-specs
-          - openstack/meghdwar
-          - openstack/merlin
+          - x/meghdwar
+          - x/merlin
           - openstack/metalsmith
-          - openstack/meteos
-          - openstack/meteos-ui
+          - x/meteos
+          - x/meteos-ui
           - openstack/microversion-parse
           - openstack/mistral
           - openstack/mistral-dashboard
@@ -887,11 +887,11 @@
           - openstack/mistral-lib
           - openstack/mistral-specs
           - openstack/mistral-tempest-plugin
-          - openstack/mitmstack
-          - openstack/mixmatch
-          - openstack/mogan
-          - openstack/mogan-specs
-          - openstack/mogan-ui
+          - x/mitmstack
+          - x/mixmatch
+          - x/mogan
+          - x/mogan-specs
+          - x/mogan-ui
           - openstack/molteniron
           - openstack/monasca-agent
           - openstack/monasca-analytics
@@ -910,73 +910,73 @@
           - openstack/monasca-thresh
           - openstack/monasca-transform
           - openstack/monasca-ui
-          - openstack/monasca-vagrant
-          - openstack/monitorstack
-          - openstack/mors
+          - x/monasca-vagrant
+          - x/monitorstack
+          - x/mors
           - openstack/mox3
           - openstack/murano
           - openstack/murano-agent
           - openstack/murano-apps
           - openstack/murano-dashboard
           - openstack/murano-pkg-check
-          - openstack/murano-plugin-networking-sfc
+          - x/murano-plugin-networking-sfc
           - openstack/murano-specs
           - openstack/murano-tempest-plugin
-          - openstack/namos
-          - openstack/nemesis
-          - openstack/nerd-reviewer
-          - openstack/network-checker
-          - openstack/networking-6wind
-          - openstack/networking-ale-omniswitch
-          - openstack/networking-ansible
-          - openstack/networking-arista
-          - openstack/networking-avaya
+          - x/namos
+          - x/nemesis
+          - x/nerd-reviewer
+          - x/network-checker
+          - x/networking-6wind
+          - x/networking-ale-omniswitch
+          - x/networking-ansible
+          - x/networking-arista
+          - x/networking-avaya
           - openstack/networking-bagpipe
           - openstack/networking-baremetal
           - openstack/networking-bgpvpn
-          - openstack/networking-bigswitch
-          - openstack/networking-brocade
+          - x/networking-bigswitch
+          - x/networking-brocade
           - openstack/networking-calico
-          - openstack/networking-cisco
-          - openstack/networking-cumulus
-          - openstack/networking-dpm
-          - openstack/networking-edge-vpn
-          - openstack/networking-extreme
-          - openstack/networking-fortinet
-          - openstack/networking-fujitsu
+          - x/networking-cisco
+          - x/networking-cumulus
+          - x/networking-dpm
+          - x/networking-edge-vpn
+          - x/networking-extreme
+          - x/networking-fortinet
+          - x/networking-fujitsu
           - openstack/networking-generic-switch
           - openstack/networking-generic-switch-tempest-plugin
-          - openstack/networking-gluon
-          - openstack/networking-h3c
-          - openstack/networking-hpe
-          - openstack/networking-huawei
+          - x/networking-gluon
+          - x/networking-h3c
+          - x/networking-hpe
+          - x/networking-huawei
           - openstack/networking-hyperv
-          - openstack/networking-icc
-          - openstack/networking-infoblox
+          - x/networking-icc
+          - x/networking-infoblox
           - openstack/networking-l2gw
           - openstack/networking-l2gw-tempest-plugin
-          - openstack/networking-lagopus
-          - openstack/networking-lenovo
+          - x/networking-lagopus
+          - x/networking-lenovo
           - openstack/networking-midonet
-          - openstack/networking-mlnx
-          - openstack/networking-nec
+          - x/networking-mlnx
+          - x/networking-nec
           - openstack/networking-odl
-          - openstack/networking-omnipath
+          - x/networking-omnipath
           - openstack/networking-onos
-          - openstack/networking-opencontrail
+          - x/networking-opencontrail
           - openstack/networking-ovn
-          - openstack/networking-ovs-dpdk
-          - openstack/networking-peregrine
-          - openstack/networking-plumgrid
+          - x/networking-ovs-dpdk
+          - x/networking-peregrine
+          - x/networking-plumgrid
           - openstack/networking-powervm
           - openstack/networking-sfc
-          - openstack/networking-spp
-          - openstack/networking-vpp
-          - openstack/networking-vsphere
-          - openstack/networking-zte
-          - openstack/networking-zvm
+          - x/networking-spp
+          - x/networking-vpp
+          - x/networking-vsphere
+          - x/networking-zte
+          - x/networking-zvm
           - openstack/neutron
-          - openstack/neutron-classifier
+          - x/neutron-classifier
           - openstack/neutron-dynamic-routing
           - openstack/neutron-fwaas
           - openstack/neutron-fwaas-dashboard
@@ -988,27 +988,27 @@
           - openstack/neutron-tempest-plugin
           - openstack/neutron-vpnaas
           - openstack/neutron-vpnaas-dashboard
-          - openstack/nfv-filters
+          - x/nfv-filters
           - openstack/nova
-          - openstack/nova-dpm
-          - openstack/nova-fusioncompute
-          - openstack/nova-lxd
-          - openstack/nova-mksproxy
+          - x/nova-dpm
+          - x/nova-fusioncompute
+          - x/nova-lxd
+          - x/nova-mksproxy
           - openstack/nova-powervm
-          - openstack/nova-solver-scheduler
+          - x/nova-solver-scheduler
           - openstack/nova-specs
-          - openstack/nova-zvm-virt-driver
-          - openstack/novajoin
-          - openstack/novajoin-tempest-plugin
-          - openstack/oaktree
-          - openstack/oaktreemodel
+          - x/nova-zvm-virt-driver
+          - x/novajoin
+          - x/novajoin-tempest-plugin
+          - x/oaktree
+          - x/oaktreemodel
           - openstack/octavia
           - openstack/octavia-dashboard
           - openstack/octavia-lib
           - openstack/octavia-tempest-plugin
-          - openstack/omni
-          - openstack/ooi
-          - openstack/opencafe
+          - x/omni
+          - x/ooi
+          - x/opencafe
           - openstack/openstack
           - openstack/openstack-ansible
           - openstack/openstack-ansible-apt_package_pinning
@@ -1081,13 +1081,13 @@
           - openstack/openstack-helm-images
           - openstack/openstack-helm-infra
           - openstack/openstack-manuals
-          - openstack/openstack-map
-          - openstack/openstack-mentoring-scripts
+          - osf/openstack-map
+          - x/openstack-mentoring-scripts
           - openstack/openstack-planet
-          - openstack/openstack-resource-agents
-          - openstack/openstack-resource-agents-specs
-          - openstack/openstack-service-broker
-          - openstack/openstack-spaceport
+          - x/openstack-resource-agents
+          - x/openstack-resource-agents-specs
+          - x/openstack-service-broker
+          - x/openstack-spaceport
           - openstack/openstack-specs
           - openstack/openstack-ux
           - openstack/openstack-virtual-baremetal
@@ -1096,18 +1096,18 @@
           - openstack/openstacksdk
           - openstack/operations-guide
           - openstack/ops-tags-team
-          - openstack/ops-telecom-nfv
+          - x/ops-telecom-nfv
           - openstack/os-acc
           - openstack/os-api-ref
           - openstack/os-apply-config
           - openstack/os-brick
           - openstack/os-client-config
           - openstack/os-collect-config
-          - openstack/os-dpm
-          - openstack/os-faults
+          - x/os-dpm
+          - performa/os-faults
           - openstack/os-ken
-          - openstack/os-log-merger
-          - openstack/os-namos
+          - x/os-log-merger
+          - x/os-namos
           - openstack/os-net-config
           - openstack/os-performance-tools
           - openstack/os-refresh-config
@@ -1117,11 +1117,11 @@
           - openstack/os-traits
           - openstack/os-vif
           - openstack/os-win
-          - openstack/os-xenapi
+          - x/os-xenapi
           - openstack/osc-lib
           - openstack/osc-placement
-          - openstack/osc-summit-counter
-          - openstack/osel
+          - x/osc-summit-counter
+          - x/osel
           - openstack/oslo-specs
           - openstack/oslo.cache
           - openstack/oslo.concurrency
@@ -1146,40 +1146,40 @@
           - openstack/oslo.vmware
           - openstack/oslosphinx
           - openstack/oslotest
-          - openstack/osops-coda
-          - openstack/osops-example-configs
-          - openstack/osops-tools-contrib
-          - openstack/osops-tools-generic
-          - openstack/osops-tools-logging
-          - openstack/osops-tools-monitoring
+          - x/osops-coda
+          - x/osops-example-configs
+          - x/osops-tools-contrib
+          - x/osops-tools-generic
+          - x/osops-tools-logging
+          - x/osops-tools-monitoring
           - openstack/osprofiler
-          - openstack/ospurge
+          - x/ospurge
           - openstack/ossa
           - openstack/oswin-tempest-plugin
           - openstack/ovsdbapp
-          - openstack/packetary
-          - openstack/packetary-specs
-          - openstack/packstack
-          - openstack/pandaman
+          - x/packetary
+          - x/packetary-specs
+          - x/packstack
+          - x/pandaman
           - openstack/panko
           - openstack/patrole
           - openstack/paunch
-          - openstack/pbrx
-          - openstack/performa
+          - x/pbrx
+          - x/performa
           - openstack/performance-docs
-          - openstack/picasso
+          - x/picasso
           - openstack/placement
-          - openstack/poppy
-          - openstack/poppy-ui
-          - openstack/powervc-driver
+          - x/poppy
+          - x/poppy-ui
+          - x/powervc-driver
           - openstack/project-navigator-data
           - openstack/project-team-guide
-          - openstack/proliantutils
-          - openstack/promstat
+          - x/proliantutils
+          - x/promstat
           - openstack/ptgbot
           - openstack/publiccloud-wg
           - openstack/puppet-aodh
-          - openstack/puppet-autossh
+          - x/puppet-autossh
           - openstack/puppet-barbican
           - openstack/puppet-ceilometer
           - openstack/puppet-ceph
@@ -1189,7 +1189,7 @@
           - openstack/puppet-crane
           - openstack/puppet-designate
           - openstack/puppet-ec2api
-          - openstack/puppet-fenix
+          - x/puppet-fenix
           - openstack/puppet-freezer
           - openstack/puppet-glance
           - openstack/puppet-glare
@@ -1200,12 +1200,12 @@
           - openstack/puppet-keystone
           - openstack/puppet-magnum
           - openstack/puppet-manila
-          - openstack/puppet-midonet
+          - x/puppet-midonet
           - openstack/puppet-mistral
-          - openstack/puppet-modulesync-configs
+          - x/puppet-modulesync-configs
           - openstack/puppet-monasca
           - openstack/puppet-murano
-          - openstack/puppet-n1k-vsm
+          - x/puppet-n1k-vsm
           - openstack/puppet-neutron
           - openstack/puppet-nova
           - openstack/puppet-octavia
@@ -1225,91 +1225,91 @@
           - openstack/puppet-rally
           - openstack/puppet-sahara
           - openstack/puppet-senlin
-          - openstack/puppet-setproxy
-          - openstack/puppet-surveil
+          - x/puppet-setproxy
+          - x/puppet-surveil
           - openstack/puppet-swift
           - openstack/puppet-tacker
           - openstack/puppet-tempest
           - openstack/puppet-tripleo
           - openstack/puppet-trove
-          - openstack/puppet-tuskar
+          - x/puppet-tuskar
           - openstack/puppet-vitrage
           - openstack/puppet-vswitch
           - openstack/puppet-watcher
           - openstack/puppet-zaqar
           - openstack/pycadf
-          - openstack/pyeclib
-          - openstack/pyghmi
+          - x/pyeclib
+          - x/pyghmi
           - openstack/pymod2pkg
           - openstack/python-adjutantclient
-          - openstack/python-almanachclient
+          - x/python-almanachclient
           - openstack/python-aodhclient
-          - openstack/python-apmecclient
+          - x/python-apmecclient
           - openstack/python-barbicanclient
-          - openstack/python-bileanclient
+          - x/python-bileanclient
           - openstack/python-blazarclient
           - openstack/python-brick-cinderclient-ext
           - openstack/python-cinderclient
           - openstack/python-cloudkittyclient
-          - openstack/python-cloudpulseclient
-          - openstack/python-cognitiveclient
+          - x/python-cloudpulseclient
+          - x/python-cognitiveclient
           - openstack/python-congressclient
           - openstack/python-cyborgclient
           - openstack/python-designateclient
-          - openstack/python-distilclient
-          - openstack/python-don
+          - x/python-distilclient
+          - x/python-don
           - openstack/python-dracclient
-          - openstack/python-fenixclient
+          - x/python-fenixclient
           - openstack/python-freezerclient
           - openstack/python-fuelclient
           - openstack/python-glanceclient
-          - openstack/python-glareclient
-          - openstack/python-group-based-policy-client
-          - openstack/python-gyanclient
+          - x/python-glareclient
+          - x/python-group-based-policy-client
+          - x/python-gyanclient
           - openstack/python-heatclient
-          - openstack/python-hnvclient
-          - openstack/python-iotronicclient
+          - x/python-hnvclient
+          - x/python-iotronicclient
           - openstack/python-ironic-inspector-client
           - openstack/python-ironicclient
-          - openstack/python-jenkins
-          - openstack/python-k8sclient
+          - jjb/python-jenkins
+          - x/python-k8sclient
           - openstack/python-karborclient
           - openstack/python-keystoneclient
-          - openstack/python-kingbirdclient
+          - x/python-kingbirdclient
           - openstack/python-magnumclient
           - openstack/python-manilaclient
           - openstack/python-masakariclient
-          - openstack/python-meteosclient
+          - x/python-meteosclient
           - openstack/python-mistralclient
-          - openstack/python-moganclient
+          - x/python-moganclient
           - openstack/python-monascaclient
           - openstack/python-muranoclient
-          - openstack/python-namosclient
+          - x/python-namosclient
           - openstack/python-neutronclient
           - openstack/python-novaclient
           - openstack/python-octaviaclient
-          - openstack/python-oneviewclient
+          - x/python-oneviewclient
           - openstack/python-openstackclient
-          - openstack/python-opentsdbclient
+          - x/python-opentsdbclient
           - openstack/python-pankoclient
-          - openstack/python-picassoclient
+          - x/python-picassoclient
           - openstack/python-qinlingclient
-          - openstack/python-redfish
-          - openstack/python-rsdclient
+          - x/python-redfish
+          - x/python-rsdclient
           - openstack/python-saharaclient
-          - openstack/python-scciclient
+          - x/python-scciclient
           - openstack/python-searchlightclient
           - openstack/python-senlinclient
           - openstack/python-solumclient
-          - openstack/python-surveilclient
+          - x/python-surveilclient
           - openstack/python-swiftclient
           - openstack/python-tackerclient
-          - openstack/python-tatuclient
+          - x/python-tatuclient
           - openstack/python-tempestconf
           - openstack/python-tricircleclient
           - openstack/python-tripleoclient
           - openstack/python-troveclient
-          - openstack/python-valenceclient
+          - x/python-valenceclient
           - openstack/python-vitrageclient
           - openstack/python-watcherclient
           - openstack/python-zaqarclient
@@ -1317,13 +1317,13 @@
           - openstack/qa-specs
           - openstack/qinling
           - openstack/qinling-dashboard
-          - openstack/quark
-          - openstack/radar
+          - x/quark
+          - x/radar
           - openstack/rally
           - openstack/rally-openstack
-          - openstack/ramdisk-func-test
-          - openstack/ranger
-          - openstack/ranger-agent
+          - x/ramdisk-func-test
+          - x/ranger
+          - x/ranger-agent
           - openstack/refstack
           - openstack/refstack-client
           - openstack/release-schedule-generator
@@ -1334,10 +1334,10 @@
           - openstack/requirements
           - openstack/rpm-packaging
           - openstack/rpm-packaging-tools
-          - openstack/rsd-lib
-          - openstack/rsd-virt-for-nova
+          - x/rsd-lib
+          - x/rsd-virt-for-nova
           - openstack/sahara
-          - openstack/sahara-ci-config
+          - x/sahara-ci-config
           - openstack/sahara-dashboard
           - openstack/sahara-extra
           - openstack/sahara-image-elements
@@ -1349,8 +1349,8 @@
           - openstack/sahara-plugin-vanilla
           - openstack/sahara-specs
           - openstack/sahara-tests
-          - openstack/sardonic
-          - openstack/scalpels
+          - sardonic/sardonic
+          - x/scalpels
           - openstack/scientific-wg
           - openstack/searchlight
           - openstack/searchlight-specs
@@ -1363,103 +1363,103 @@
           - openstack/senlin-dashboard
           - openstack/senlin-tempest-plugin
           - openstack/service-types-authority
-          - openstack/shaker
+          - performa/shaker
           - openstack/shotgun
-          - openstack/shovel
-          - openstack/shovel-horizon
-          - openstack/slogging
-          - openstack/snap-ceilometer
-          - openstack/snap-cinder
-          - openstack/snap-glance
-          - openstack/snap-gnocchi
-          - openstack/snap-keystone
-          - openstack/snap-neutron
-          - openstack/snap-nova
-          - openstack/snap-nova-hypervisor
-          - openstack/snap-openstackclients
-          - openstack/snap-rally
-          - openstack/snap-tempest
-          - openstack/snap.openstack
-          - openstack/solar
-          - openstack/solar-resources
+          - x/shovel
+          - x/shovel-horizon
+          - x/slogging
+          - x/snap-ceilometer
+          - x/snap-cinder
+          - x/snap-glance
+          - x/snap-gnocchi
+          - x/snap-keystone
+          - x/snap-neutron
+          - x/snap-nova
+          - x/snap-nova-hypervisor
+          - x/snap-openstackclients
+          - x/snap-rally
+          - x/snap-tempest
+          - x/snap.openstack
+          - x/solar
+          - x/solar-resources
           - openstack/solum
           - openstack/solum-dashboard
           - openstack/solum-infra-guestagent
           - openstack/solum-specs
           - openstack/solum-tempest-plugin
-          - openstack/spanner
+          - x/spanner
           - openstack/sphinx-feature-classification
-          - openstack/sqlalchemy-migrate
-          - openstack/stackalytics
-          - openstack/stacklight-integration-tests
-          - openstack/stacktach
-          - openstack/stacktach-klugman
-          - openstack/stacktach-notification-utils
-          - openstack/stacktach-notigen
-          - openstack/stacktach-quince
-          - openstack/stacktach-quincy
-          - openstack/stacktach-sandbox
-          - openstack/stacktach-shoebox
-          - openstack/stacktach-simport
-          - openstack/stacktach-stackdistiller
-          - openstack/stacktach-timex
-          - openstack/stacktach-winchester
-          - openstack/stackube
+          - x/sqlalchemy-migrate
+          - x/stackalytics
+          - x/stacklight-integration-tests
+          - x/stacktach
+          - x/stacktach-klugman
+          - x/stacktach-notification-utils
+          - x/stacktach-notigen
+          - x/stacktach-quince
+          - x/stacktach-quincy
+          - x/stacktach-sandbox
+          - x/stacktach-shoebox
+          - x/stacktach-simport
+          - x/stacktach-stackdistiller
+          - x/stacktach-timex
+          - x/stacktach-winchester
+          - x/stackube
           - openstack/stackviz
-          - openstack/steth
+          - x/steth
           - openstack/stevedore
           - openstack/storlets
-          - openstack/surveil
-          - openstack/surveil-specs
+          - x/surveil
+          - x/surveil-specs
           - openstack/sushy
           - openstack/sushy-tools
-          - openstack/swauth
+          - x/swauth
           - openstack/swift
           - openstack/swift-bench
-          - openstack/swift-ceph-backend
+          - x/swift-ceph-backend
           - openstack/swift-specs
-          - openstack/swift3
-          - openstack/swiftonfile
-          - openstack/swiftonhpss
-          - openstack/stx-clients
-          - openstack/stx-config
-          - openstack/stx-distcloud
-          - openstack/stx-distcloud-client
-          - openstack/stx-docs
-          - openstack/stx-fault
-          - openstack/stx-governance
-          - openstack/stx-gplv2
-          - openstack/stx-gplv3
-          - openstack/stx-gui
-          - openstack/stx-ha
-          - openstack/stx-integ
-          - openstack/stx-manifest
-          - openstack/stx-metal
-          - openstack/stx-nfv
-          - openstack/stx-root
-          - openstack/stx-specs
-          - openstack/stx-test
-          - openstack/stx-tis-repo
-          - openstack/stx-tools
-          - openstack/stx-update
-          - openstack/stx-upstream
-          - openstack/stx-utils
-          - openstack/synergy-scheduler-manager
-          - openstack/synergy-service
+          - x/swift3
+          - x/swiftonfile
+          - x/swiftonhpss
+          - starlingx/clients
+          - starlingx/config
+          - starlingx/distcloud
+          - starlingx/distcloud-client
+          - starlingx/docs
+          - starlingx/fault
+          - starlingx/governance
+          - starlingx/gplv2
+          - starlingx/gplv3
+          - starlingx/gui
+          - starlingx/ha
+          - starlingx/integ
+          - starlingx/manifest
+          - starlingx/metal
+          - starlingx/nfv
+          - starlingx/root
+          - starlingx/specs
+          - starlingx/test
+          - starlingx/tis-repo
+          - starlingx/tools
+          - starlingx/update
+          - starlingx/upstream
+          - starlingx/utils
+          - x/synergy-scheduler-manager
+          - x/synergy-service
           - openstack/syntribos
           - openstack/syntribos-openstack-templates
           - openstack/syntribos-payloads
           - openstack/tacker
           - openstack/tacker-horizon
           - openstack/tacker-specs
-          - openstack/tap-as-a-service
-          - openstack/tap-as-a-service-dashboard
-          - openstack/tap-as-a-service-tempest-plugin
+          - x/tap-as-a-service
+          - x/tap-as-a-service-dashboard
+          - x/tap-as-a-service-tempest-plugin
           - openstack/taskflow
-          - openstack/tatu
-          - openstack/tatu-dashboard
-          - openstack/tc-as-a-service
-          - openstack/telcowg-usecases
+          - x/tatu
+          - x/tatu-dashboard
+          - x/tc-as-a-service
+          - x/telcowg-usecases
           - openstack/telemetry-specs
           - openstack/telemetry-tempest-plugin
           - openstack/tempest-horizon
@@ -1468,17 +1468,17 @@
           - openstack/tempest-stress
           - openstack/tempest-tripleo-ui
           - openstack/tenks
-          - openstack/terracotta
-          - openstack/third-party-ci-tools
-          - openstack/timmy
-          - openstack/tobiko
+          - x/terracotta
+          - x/third-party-ci-tools
+          - x/timmy
+          - x/tobiko
           - openstack/tooz
           - openstack/tosca-parser
           - openstack/training-guides
           - openstack/training-labs
           - openstack/transparency-policy
           - openstack/tricircle
-          - openstack/trio2o
+          - x/trio2o
           - openstack/tripleo-ansible
           - openstack/tripleo-common
           - openstack/tripleo-common-tempest-plugin
@@ -1500,49 +1500,49 @@
           - openstack/trove-specs
           - openstack/trove-tempest-plugin
           - openstack/tuning-box
-          - openstack/turbo-hipster
+          - x/turbo-hipster
           - openstack/uc-recognition
           - openstack/ui-cookiecutter
           - openstack/upstream-institute-virtual-environment
-          - openstack/vahana
-          - openstack/valence
-          - openstack/valence-specs
-          - openstack/valet
+          - x/vahana
+          - x/valence
+          - x/valence-specs
+          - x/valet
           - openstack/virtualbmc
-          - openstack/virtualpdu
+          - x/virtualpdu
           - openstack/vitrage
           - openstack/vitrage-dashboard
           - openstack/vitrage-specs
           - openstack/vitrage-tempest-plugin
-          - openstack/vm-bm-wg
-          - openstack/vmtp
-          - openstack/vmware-nsx
-          - openstack/vmware-nsx-tempest-plugin
-          - openstack/vmware-nsxlib
-          - openstack/vmware-vspc
+          - x/vm-bm-wg
+          - x/vmtp
+          - x/vmware-nsx
+          - x/vmware-nsx-tempest-plugin
+          - x/vmware-nsxlib
+          - x/vmware-vspc
           - openstack/watcher
           - openstack/watcher-dashboard
           - openstack/watcher-specs
           - openstack/watcher-tempest-plugin
           - openstack/whereto
-          - openstack/whitebox-tempest-plugin
-          - openstack/windmill
-          - openstack/windmill-backup
-          - openstack/windmill-config
-          - openstack/windmill-ops
+          - x/whitebox-tempest-plugin
+          - windmill/windmill
+          - windmill/windmill-backup
+          - windmill/windmill-config
+          - windmill/windmill-ops
           - openstack/workload-ref-archs
-          - openstack/wsme
-          - openstack/xenapi-os-testing
+          - x/wsme
+          - x/xenapi-os-testing
           - openstack/xstatic-angular
           - openstack/xstatic-angular-bootstrap
-          - openstack/xstatic-angular-cookies
-          - openstack/xstatic-angular-fileupload
+          - x/xstatic-angular-cookies
+          - x/xstatic-angular-fileupload
           - openstack/xstatic-angular-gettext
           - openstack/xstatic-angular-lrdragndrop
           - openstack/xstatic-angular-material
-          - openstack/xstatic-angular-mock
+          - x/xstatic-angular-mock
           - openstack/xstatic-angular-notify
-          - openstack/xstatic-angular-sanitize
+          - x/xstatic-angular-sanitize
           - openstack/xstatic-angular-smart-table
           - openstack/xstatic-angular-ui-router
           - openstack/xstatic-angular-uuid
@@ -1556,7 +1556,7 @@
           - openstack/xstatic-hogan
           - openstack/xstatic-jasmine
           - openstack/xstatic-jquery-migrate
-          - openstack/xstatic-jquery.bootstrap.wizard
+          - x/xstatic-jquery.bootstrap.wizard
           - openstack/xstatic-jquery.quicksearch
           - openstack/xstatic-jquery.tablesorter
           - openstack/xstatic-js-yaml
@@ -1564,7 +1564,7 @@
           - openstack/xstatic-json2yaml
           - openstack/xstatic-magic-search
           - openstack/xstatic-mdi
-          - openstack/xstatic-qunit
+          - x/xstatic-qunit
           - openstack/xstatic-rickshaw
           - openstack/xstatic-roboto-fontface
           - openstack/xstatic-spin
@@ -1625,5 +1625,5 @@
                 - job
                 - secret
         untrusted-projects:
-          - openstack-infra/zuul-jobs
-          - openstack-infra/zuul-sphinx
+          - zuul/zuul-jobs
+          - zuul/zuul-sphinx