diff --git a/.gitreview b/.gitreview
index cd914fe02a..e8ebbd0e6a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/keystone.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 8b3cd6a953..547d423f1a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,7 +15,7 @@
     parent: devstack-tempest
     timeout: 4200
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/keystone
       - openstack/keystone-tempest-plugin
     vars:
@@ -43,7 +43,7 @@
         keystone-saml2-federation: true
         tls-proxy: false
       devstack_plugins:
-        keystone: https://git.openstack.org/openstack/keystone
+        keystone: https://opendev.org/openstack/keystone
       zuul_copy_output:
         /etc/shibboleth: logs
 
@@ -87,8 +87,8 @@
     post-run: playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/keystone
 
 # Experimental
@@ -103,7 +103,7 @@
         keystone-saml2-federation: true
         tls-proxy: false
       devstack_plugins:
-        keystone: https://git.openstack.org/openstack/keystone
+        keystone: https://opendev.org/openstack/keystone
       zuul_copy_output:
         /etc/shibboleth: logs
 
@@ -119,7 +119,7 @@
         keystone-saml2-federation: true
         tls-proxy: false
       devstack_plugins:
-        keystone: https://git.openstack.org/openstack/keystone
+        keystone: https://opendev.org/openstack/keystone
       zuul_copy_output:
         /etc/shibboleth: logs
 
diff --git a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
index ba5f3c1cab..83131cec5b 100644
--- a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml
+++ b/playbooks/legacy/keystone-dsvm-grenade-multinode/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 }}'
@@ -31,14 +31,14 @@
           export DEVSTACK_GATE_CONFIGDRIVE=0
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_GRENADE=pullup
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export BRANCH_OVERRIDE=default
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
           export DEVSTACK_GATE_TOPOLOGY="multinode"
           export MULTI_KEYSTONE=1
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin keystone https://git.openstack.org/openstack/keystone"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin keystone https://opendev.org/openstack/keystone"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"MULTI_KEYSTONE=1"
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh