diff --git a/.gitreview b/.gitreview
index 49b22be..18a4eb6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-amqp1.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 44f5019..d28490f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,7 +8,7 @@
     post-run: playbooks/devstack-plugin-amqp1-tempest-dsvm-full/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/devstack-plugin-amqp1
       - openstack/tempest
 
diff --git a/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml b/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml
index 369cab4..875f3a8 100644
--- a/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml
+++ b/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/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 }}'
@@ -32,7 +32,7 @@
           export DEVSTACK_GATE_TEMPEST_FULL=1
 
           export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 https://git.openstack.org/openstack/devstack-plugin-amqp1"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 https://opendev.org/openstack/devstack-plugin-amqp1"
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh