diff --git a/.gitreview b/.gitreview
index eecf939449d..99feb9c2668 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/cinder.git
diff --git a/.zuul.yaml b/.zuul.yaml
index ec90a9e6d01..d1d1ad6a346 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -114,7 +114,7 @@
     post-run: playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/barbican
       - openstack/python-barbicanclient
       - openstack/tempest
@@ -138,7 +138,7 @@
     timeout: 7800
     vars:
       devstack_plugins:
-        rally-openstack: https://git.openstack.org/openstack/rally-openstack
+        rally-openstack: https://opendev.org/openstack/rally-openstack
       rally_task: rally-jobs/cinder.yaml
     required-projects:
       - openstack/rally-openstack
diff --git a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml
index 541fb503a9a..f6e3ad880e0 100644
--- a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml
+++ b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/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 @@
           CINDER_ISCSI_HELPER=lioadm
           CINDER_LVM_TYPE=thin
           enable_service barbican
-          enable_plugin barbican https://git.openstack.org/openstack/barbican
+          enable_plugin barbican https://opendev.org/openstack/barbican
 
           # Test with local file locks
           CINDER_COORDINATION_URL='file://$state_path'