diff --git a/deliverables/_independent/bashate.yaml b/deliverables/_independent/bashate.yaml
index 64f1c291ec..f61d02bea3 100644
--- a/deliverables/_independent/bashate.yaml
+++ b/deliverables/_independent/bashate.yaml
@@ -6,7 +6,7 @@ include-pypi-link: yes
 releases:
   - version: 0.6.0
     projects:
-      - repo: openstack-dev/bashate
+      - repo: openstack/bashate
         hash: 8e303ee19406652bbd7587581b03c9931e75b67d
 repository-settings:
-  openstack-dev/bashate: {}
+  openstack/bashate: {}
diff --git a/deliverables/_independent/hacking.yaml b/deliverables/_independent/hacking.yaml
index adedc89587..28a1a3c841 100644
--- a/deliverables/_independent/hacking.yaml
+++ b/deliverables/_independent/hacking.yaml
@@ -6,119 +6,119 @@ include-pypi-link: yes
 releases:
   - version: 0.5.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 4e90f08824bc947b8fc968b19ff1a3729ee6a222
   - version: 0.5.1
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 5e64a3a3774f04e2a29299698fdc3b4c72fa8040
   - version: 0.5.2
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 54b008fafeb2aa7e95e1d14bb075c3961e797ce3
   - version: 0.5.3
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: e28296ed27c7aa355f7be8cea7dc949d2cebf8da
   - version: 0.5.4
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 99ecd73f4711d2a53829d7a5e7c61494d2f6ec38
   - version: 0.5.5
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 87b6b5b7ddbf603817fdbfb751464fa8576a40a4
   - version: 0.5.6
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: ce26036d816a4e2bd99c73c23fe794b4fc5a0a67
   - version: 0.7.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 6e1404cb221190645c7ef66e8d77e3402cba01eb
   - version: 0.7.1
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: af33512bf3bd7fb7a4934254ae9710a9d64c3a36
   - version: 0.7.2
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 00ccb88d61cf5c6dda5c07a16be4a93b7fd6351e
   - version: 0.8.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 2214bf033bc262934a8fc71033421e0aee82fd14
   - version: 0.8.1
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 86ef983ce39ebee9b4426efa296eb427fd2ac852
   - version: 0.9.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 4e300803f2ab44becbe737abdd1459aa026000c9
   - version: 0.9.1
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 2d76161033be1682382d095588eb2ebabb52f992
   - version: 0.9.2
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: e56eddf55b4e8be9826e8eb968b2893ecab7201b
   - version: 0.9.3
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 4e258c4222d1c9ff06213ba783035802e3bdbc46
   - version: 0.9.4
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: b45ac441395f06399662963a04d84c84470e14a8
   - version: 0.9.5
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 3af414c0c9e5c64cb764c0e131a876b22a0553cd
   - version: 0.9.6
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: f63394c9a427bdad21bf219135eeb030c2e01145
   - version: 0.10.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: ec6048f13558b93653091e83d8d0dc621f3cbefb
   - version: 0.10.1
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: e25679be7f3b9b2f2bbea6ce5af4fcd69ba2d574
   - version: 0.10.2
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: bc4b1118e155784bc306c01733375ffec56b89b3
   - version: 0.11.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 059ee83ad7a938701c9098cfbdf34068f9ef8014
   - version: 0.12.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 6be124c025019c04e31dabe58448a69bf21c76fa
   - version: 0.13.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: e72ce1831aad4947fe07adbb8d55a79b8e16571b
   - version: 0.10.3
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 64ab385e180ae0471aa3e9eb77a0f7f4ed13efb5
   - version: 0.9.7
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: d987e18e6978b07f562a01d4b4dc060b05f03a9d
   - version: 1.0.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: d842b77cab8ea1ac76c006b7d99455c835475549
   - version: 1.1.0
     projects:
-      - repo: openstack-dev/hacking
+      - repo: openstack/hacking
         hash: 0a43156fab3ca870334098afd1914b5e0bdbc3e6
 repository-settings:
-  openstack-dev/hacking: {}
+  openstack/hacking: {}
diff --git a/deliverables/_independent/pbr.yaml b/deliverables/_independent/pbr.yaml
index a201df3f6e..cb0e95a3bf 100644
--- a/deliverables/_independent/pbr.yaml
+++ b/deliverables/_independent/pbr.yaml
@@ -6,127 +6,127 @@ include-pypi-link: yes
 releases:
   - version: 0.11.1
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 6e472b4905411a39e993c81c382a27ca9c771ef5
   - version: 1.3.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 61a3a1ecdf99c680e509742fdc6c441b499af130
   - version: 1.4.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 1e4d8836840622434230055e054666e164e10d14
   - version: 1.5.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 5c0bb9186fe2d65901744b00af24c8c50b3e1d29
   - version: 1.6.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 1e05037c2ae02a4d52d0f50abf00d61021971508
   - version: 1.7.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 8047f2feafeead5f4913f9ab1d7d2c6d0ccf79e0
   - version: 1.8.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: daa905cad45ea89b557b6468af021270980b9c24
   - version: 1.8.1
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 36a2bf130999f06562b5eb063e1c49ae2d6e35a7
   - version: 1.9.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: d4e29cb5d23e2bd1cf1b8a6b166b034279c764d7
   - version: 1.9.1
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: a27f51242b041f8afd79d4fa2d4d6eaf1dda9f0c
   - version: 1.10.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 83b9e6f3a64debf5924a2a160cbe3eb60c515817
   - version: 2.0.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 882875a66e644e36feb2d864ae231f43bcd39e8c
   - version: 2.1.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 5a21031398e426c20562417081eaabf2b535aca2
   - version: 3.0.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: ca6e92c723c927d730db251c428b402d1c0701cb
   - version: 3.0.1
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: c02406601a7d7c453c77318ff5b5af6d760e80ae
   - version: 3.1.0
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: 3c059cb701e55c7c550f2bbe9626c9c063b0d77e
   - version: 3.1.1
     projects:
-      - repo: openstack-dev/pbr
+      - repo: openstack/pbr
         hash: d43badb6c1a9cf776a0899cae964966f6ccd07de
   - projects:
       - hash: 1f2c7314853d254c58f3adf7f03ca80589cb6f36
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.0.0
   - projects:
       - hash: 7b0374d680d50c67112e1220761a1a68d6606b48
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.0.1
   - projects:
       - hash: 7767c44ab1289ed7d1cc4f9e12986bef07865d5c
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.0.2
   - projects:
       - hash: f30aa7a97f0a41a10da7f84a19faef0b4d0f77f5
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.0.3
   - projects:
       - hash: ee26945cb3b290983a4b6d71bec2ed5aaf163989
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.0.4
   - projects:
       - hash: 73234c84b58d317c0a944a5fb5a47e59ad267e3d
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.1.0
   - projects:
       - hash: 915e62ef7b1af4f3449457af1dbb77b0d11635f3
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.1.1
   - projects:
       - hash: 6f5c1ee8e4e9c1c05f16b7dfe57c3245ad38b0cf
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.2.0
   - projects:
       - hash: 97e343c0cfe03e5d09a810a0e9f1f239fd76233f
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 4.3.0
   - projects:
       - hash: 73a763d1e3cb2f00c2dc4fbfecfab487f9698818
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 5.0.0
   - projects:
       - hash: bd300d07ee016bf04b5da783fa696754b8a49af8
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 5.1.0
   - projects:
       - hash: 6a88aadaa8352bd1c687ef8234c6ad74159276de
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 5.1.1
   - projects:
       - hash: 7909c7afd31debbc64786c891cacdd39a9932eb8
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 5.1.2
   - projects:
       - hash: 02dfb82e91cb2aafe48002ef079e6914cafca3ff
-        repo: openstack-dev/pbr
+        repo: openstack/pbr
     version: 5.1.3
   - projects:
       - hash: 55429ef85692298a6f2dacb38bfa27f2aac5477f
diff --git a/deliverables/pike/devstack.yaml b/deliverables/pike/devstack.yaml
index 2690aa6878..3ffbc641bd 100644
--- a/deliverables/pike/devstack.yaml
+++ b/deliverables/pike/devstack.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/devstack: 98ab7d9646730f02983380648831aa2682abcc0c
+      openstack/devstack: 98ab7d9646730f02983380648831aa2682abcc0c
     name: stable/pike
 repository-settings:
-  openstack-dev/devstack: {}
+  openstack/devstack: {}
diff --git a/deliverables/pike/grenade.yaml b/deliverables/pike/grenade.yaml
index 6799a9c431..073349b463 100644
--- a/deliverables/pike/grenade.yaml
+++ b/deliverables/pike/grenade.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/grenade: 1e3a981a6cf6216daa60fcd7583ad6e9cb1cefcc
+      openstack/grenade: 1e3a981a6cf6216daa60fcd7583ad6e9cb1cefcc
     name: stable/pike
 repository-settings:
-  openstack-dev/grenade: {}
+  openstack/grenade: {}
diff --git a/deliverables/queens/devstack.yaml b/deliverables/queens/devstack.yaml
index aac06bf150..fac65fb4dd 100644
--- a/deliverables/queens/devstack.yaml
+++ b/deliverables/queens/devstack.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/devstack: 47467acf2f607c7e436eb3d42c5cf764011883f9
+      openstack/devstack: 47467acf2f607c7e436eb3d42c5cf764011883f9
     name: stable/queens
 repository-settings:
-  openstack-dev/devstack: {}
+  openstack/devstack: {}
diff --git a/deliverables/queens/grenade.yaml b/deliverables/queens/grenade.yaml
index 830ad81af6..2e476ddcd9 100644
--- a/deliverables/queens/grenade.yaml
+++ b/deliverables/queens/grenade.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/grenade: fce6befbb50fdc774f16fa963dd51e2bb8eedd63
+      openstack/grenade: fce6befbb50fdc774f16fa963dd51e2bb8eedd63
     name: stable/queens
 repository-settings:
-  openstack-dev/grenade: {}
+  openstack/grenade: {}
diff --git a/deliverables/rocky/devstack.yaml b/deliverables/rocky/devstack.yaml
index b811ee9f66..d43447656e 100644
--- a/deliverables/rocky/devstack.yaml
+++ b/deliverables/rocky/devstack.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/devstack: 8c1052001629d62f001d04c182500fa293858f47
+      openstack/devstack: 8c1052001629d62f001d04c182500fa293858f47
     name: stable/rocky
 repository-settings:
-  openstack-dev/devstack: {}
+  openstack/devstack: {}
diff --git a/deliverables/rocky/grenade.yaml b/deliverables/rocky/grenade.yaml
index 66841540a8..20895157eb 100644
--- a/deliverables/rocky/grenade.yaml
+++ b/deliverables/rocky/grenade.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/grenade: dc7f4a4ba5697d5a73a1e656d4a1717964324eab
+      openstack/grenade: dc7f4a4ba5697d5a73a1e656d4a1717964324eab
     name: stable/rocky
 repository-settings:
-  openstack-dev/grenade: {}
+  openstack/grenade: {}
diff --git a/deliverables/stein/devstack.yaml b/deliverables/stein/devstack.yaml
index 0a3b2ccf56..a5be74374a 100644
--- a/deliverables/stein/devstack.yaml
+++ b/deliverables/stein/devstack.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/devstack: 18d1dc99b75d27f321e4789f2ba8961d4cc165a2
+      openstack/devstack: 18d1dc99b75d27f321e4789f2ba8961d4cc165a2
     name: stable/stein
 repository-settings:
-  openstack-dev/devstack: {}
+  openstack/devstack: {}
diff --git a/deliverables/stein/grenade.yaml b/deliverables/stein/grenade.yaml
index 125d8047c5..83d7363261 100644
--- a/deliverables/stein/grenade.yaml
+++ b/deliverables/stein/grenade.yaml
@@ -6,7 +6,7 @@ type: other
 stable-branch-type: tagless
 branches:
   - location:
-      openstack-dev/grenade: d814cf0cdf72337f91cd2269f2139bb7b242896f
+      openstack/grenade: d814cf0cdf72337f91cd2269f2139bb7b242896f
     name: stable/stein
 repository-settings:
-  openstack-dev/grenade: {}
+  openstack/grenade: {}
diff --git a/deliverables/train/devstack.yaml b/deliverables/train/devstack.yaml
index da22a72cb9..829c6b4bfc 100644
--- a/deliverables/train/devstack.yaml
+++ b/deliverables/train/devstack.yaml
@@ -5,4 +5,4 @@ team: 'Quality Assurance'
 type: other
 stable-branch-type: tagless
 repository-settings:
-  openstack-dev/devstack: {}
+  openstack/devstack: {}
diff --git a/deliverables/train/grenade.yaml b/deliverables/train/grenade.yaml
index c932cfe4f1..3e9884f84d 100644
--- a/deliverables/train/grenade.yaml
+++ b/deliverables/train/grenade.yaml
@@ -5,4 +5,4 @@ team: 'Quality Assurance'
 type: other
 stable-branch-type: tagless
 repository-settings:
-  openstack-dev/grenade: {}
+  openstack/grenade: {}