diff --git a/.gitreview b/.gitreview
index 842ec1626..fc06cb8e7 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/ocata
diff --git a/.zuul.yaml b/.zuul.yaml
index 648de0cf9..37f9eb3ee 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,7 +6,7 @@
     timeout: 7200
     voting: false
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/nova
       - openstack/python-novaclient
 
@@ -17,7 +17,7 @@
     post-run: playbooks/legacy/novaclient-dsvm-functional-neutron/post.yaml
     timeout: 7200
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/nova
       - openstack/python-novaclient
diff --git a/playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml b/playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml
index 8b7766319..50afd6fba 100644
--- a/playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml
+++ b/playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/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 }}'
diff --git a/playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml b/playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml
index 68231b1ac..d7927a00e 100644
--- a/playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml
+++ b/playbooks/legacy/novaclient-dsvm-functional-neutron/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 }}'