diff --git a/.gitreview b/.gitreview
index 5f58c7108..3de0d1340 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/aodh.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 2d0cb0743..c8fc94cba 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,7 +40,7 @@
     post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       # To install Gnocchi
       - openstack/ceilometer
@@ -54,7 +54,7 @@
     post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       # To install Gnocchi
       - openstack/ceilometer
diff --git a/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
index d26a588ff..e92c06363 100644
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
+++ b/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/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 }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
 
           EOF
         executable: /bin/bash
@@ -45,8 +45,8 @@
           export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://git.openstack.org/openstack/telemetry-tempest-plugin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://opendev.org/openstack/telemetry-tempest-plugin"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export AODH_BACKEND=mysql
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
index 8340a149f..9264ac3d3 100644
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
+++ b/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
@@ -14,12 +14,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,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
 
           EOF
         executable: /bin/bash
@@ -46,8 +46,8 @@
           export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://git.openstack.org/openstack/telemetry-tempest-plugin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://opendev.org/openstack/telemetry-tempest-plugin"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export AODH_BACKEND=postgresql
           export DEVSTACK_GATE_POSTGRES=1