diff --git a/.gitreview b/.gitreview
index 35d93597c..c520ed7f2 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-infra/shade.git
+project=openstack/shade.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 67a562f90..9b55798d1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,11 +5,11 @@
       Run tox python 27 unittests against master of important libs
     vars:
       tox_install_siblings: true
-      zuul_work_dir: src/git.openstack.org/openstack-infra/shade
+      zuul_work_dir: src/opendev.org/openstack/shade
     # shade in required-projects so that os-client-config and keystoneauth
     # can add the job as well
     required-projects:
-      - openstack-infra/shade
+      - openstack/shade
       - openstack/keystoneauth
       - openstack/openstacksdk
       - openstack/os-client-config
@@ -21,11 +21,11 @@
       Run tox python 35 unittests against master of important libs
     vars:
       tox_install_siblings: true
-      zuul_work_dir: src/git.openstack.org/openstack-infra/shade
+      zuul_work_dir: src/opendev.org/openstack/shade
     # shade in required-projects so that os-client-config and keystoneauth
     # can add the job as well
     required-projects:
-      - openstack-infra/shade
+      - openstack/shade
       - openstack/keystoneauth
       - openstack/openstacksdk
       - openstack/os-client-config
@@ -51,7 +51,7 @@
       # These jobs will DTRT when shade triggers them, but we want to make
       # sure stable branches of shade never get cloned by other people,
       # since stable branches of shade are, well, not actually things.
-      - name: openstack-infra/shade
+      - name: openstack/shade
         override-checkout: master
       - name: openstack/heat
       - name: openstack/swift
@@ -75,7 +75,7 @@
         s-object: true
         s-proxy: true
       devstack_plugins:
-        heat: https://git.openstack.org/openstack/heat
+        heat: https://opendev.org/openstack/heat
       tox_environment:
         # Do we really need to set this? It's cargo culted
         PYTHONUNBUFFERED: 'true'
@@ -88,7 +88,7 @@
         SHADE_HAS_SWIFT: 1
       tox_install_siblings: false
       tox_envlist: functional
-      zuul_work_dir: src/git.openstack.org/openstack-infra/shade
+      zuul_work_dir: src/opendev.org/openstack/shade
 
 - job:
     name: shade-functional-devstack-legacy
@@ -159,7 +159,7 @@
       - openstack/python-magnumclient
     vars:
       devstack_plugins:
-        magnum: https://git.openstack.org/openstack/magnum
+        magnum: https://opendev.org/openstack/magnum
       devstack_localrc:
         MAGNUM_GUEST_IMAGE_URL: https://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2
         MAGNUM_IMAGE_NAME: fedora-atomic-f23-dib
@@ -192,9 +192,9 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: stable-2.5
-      - name: openstack-infra/shade
+      - name: openstack/shade
         override-checkout: master
-      - name: openstack-dev/devstack
+      - name: openstack/devstack
         override-checkout: master
     vars:
       # test-matrix grabs branch from the zuul branch setting. If the job