diff --git a/.gitreview b/.gitreview
index 31aa568bf2..17c96bbec9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/glance.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 2be419e9e7..50af38ba36 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,8 @@
     post-run: playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/glance
 
 - job:
@@ -54,11 +54,11 @@
     description: Abstract job for Glance vs. oslo libraries
     # NOTE(rosmaita): we only need functional test jobs, oslo is
     # already running periodic jobs using our unit tests.  Those
-    # jobs are configured for glance in openstack-infra/project-config/
+    # jobs are configured for glance in openstack/project-config/
     # zuul.d/projects.yaml using the template 'periodic-jobs-with-oslo-master'
-    # which is defined in openstack-infra/openstack-zuul-jobs/zuul.d/
+    # which is defined in openstack/openstack-zuul-jobs/zuul.d/
     # project-templates.yaml; the jobs the template refers to are
-    # defined in openstack-infra/openstack-zuul-jobs/zuul.d/jobs.yaml
+    # defined in openstack/openstack-zuul-jobs/zuul.d/jobs.yaml
     required-projects:
       - name: openstack/debtcollector
       - name: openstack/futurist
@@ -180,7 +180,7 @@
     abstract: true
     description: Abstract job for Glance vs. cursive and related libs
     required-projects:
-      - name: openstack/cursive
+      - name: x/cursive
       - name: openstack/python-barbicanclient
       - name: openstack/castellan
 
@@ -295,7 +295,7 @@
         # The "tips" jobs can be removed from the stable branch .zuul.yaml
         # files if someone is so inclined, but that would require manual
         # maintenance, so we do not do it by default.  Another option is
-        # to define these jobs in the openstack-infra/project-config repo.
+        # to define these jobs in the openstack/project-config repo.
         # That would make us less agile in adjusting these tests, so we
         # aren't doing that either.
         - glance-tox-functional-oslo-tips:
diff --git a/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
index e161970d4a..bc7e1b11b9 100644
--- a/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
+++ b/playbooks/legacy/glance-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,7 +31,7 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_CONFIGDRIVE=0
           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