diff --git a/.gitreview b/.gitreview
index 83cdf3bf7..60fb69b19 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-novaclient.git
 defaultbranch=stable/queens
diff --git a/.zuul.yaml b/.zuul.yaml
index 038b0e20f..ef37a515c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
     post-run: playbooks/legacy/novaclient-dsvm-functional/post.yaml
     timeout: 7200
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/nova
       - openstack/python-novaclient
 
diff --git a/playbooks/legacy/novaclient-dsvm-functional/run.yaml b/playbooks/legacy/novaclient-dsvm-functional/run.yaml
index 935b3f134..a3d1f4979 100644
--- a/playbooks/legacy/novaclient-dsvm-functional/run.yaml
+++ b/playbooks/legacy/novaclient-dsvm-functional/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 }}'