diff --git a/.gitreview b/.gitreview
index 8df29968..ae015c0b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-dev/pbr.git
+project=openstack/pbr.git
diff --git a/.zuul.yaml b/.zuul.yaml
index df57d8d9..0f13f836 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,11 +3,11 @@
     parent: legacy-dsvm-base
     timeout: 7800
     required-projects:
-      - openstack-dev/devstack
-      - openstack-dev/grenade
-      - openstack-dev/pbr
-      - openstack-infra/devstack-gate
-      - openstack-infra/tripleo-ci
+      - openstack/devstack
+      - openstack/grenade
+      - openstack/pbr
+      - openstack/devstack-gate
+      - openstack/tripleo-ci
       - openstack/aodh
       - openstack/automaton
       - openstack/ceilometer
diff --git a/playbooks/legacy/pbr-installation-devstack/run.yaml b/playbooks/legacy/pbr-installation-devstack/run.yaml
index aeb5efa5..c3591cec 100644
--- a/playbooks/legacy/pbr-installation-devstack/run.yaml
+++ b/playbooks/legacy/pbr-installation-devstack/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,11 +30,11 @@
           # Define the entire projects list here so that what we
           # test requirements against is independent of what d-g
           # thinks is relevant.
-          export PROJECTS="openstack-infra/devstack-gate $PROJECTS"
-          export PROJECTS="openstack-dev/devstack $PROJECTS"
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          export PROJECTS="openstack-dev/pbr $PROJECTS"
-          export PROJECTS="openstack-infra/tripleo-ci $PROJECTS"
+          export PROJECTS="openstack/devstack-gate $PROJECTS"
+          export PROJECTS="openstack/devstack $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
+          export PROJECTS="openstack/pbr $PROJECTS"
+          export PROJECTS="openstack/tripleo-ci $PROJECTS"
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/automaton $PROJECTS"
           export PROJECTS="openstack/ceilometer $PROJECTS"
diff --git a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml
index 8b3fa7d9..554d44b2 100644
--- a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml
+++ b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,11 +30,11 @@
           # Define the entire projects list here so that what we
           # test requirements against is independent of what d-g
           # thinks is relevant.
-          export PROJECTS="openstack-infra/devstack-gate $PROJECTS"
-          export PROJECTS="openstack-dev/devstack $PROJECTS"
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          export PROJECTS="openstack-dev/pbr $PROJECTS"
-          export PROJECTS="openstack-infra/tripleo-ci $PROJECTS"
+          export PROJECTS="openstack/devstack-gate $PROJECTS"
+          export PROJECTS="openstack/devstack $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
+          export PROJECTS="openstack/pbr $PROJECTS"
+          export PROJECTS="openstack/tripleo-ci $PROJECTS"
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/automaton $PROJECTS"
           export PROJECTS="openstack/ceilometer $PROJECTS"