diff --git a/.gitreview b/.gitreview
index dcd8ae2..c514e08 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/castellan.git
 defaultbranch=stable/stein
diff --git a/.zuul.yaml b/.zuul.yaml
index 5ac7642..fb5c546 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,12 +39,12 @@
         s-object: false
         s-proxy: false
       devstack_plugins:
-        barbican: https://git.openstack.org/openstack/barbican
+        barbican: https://opendev.org/openstack/barbican
       tox_environment:
         PYTHONUNBUFFERED: 'true'
         tox_install_siblings: false # I don't know what this means
       tox_envlist: functional
-      zuul_work_dir: src/git.openstack.org/openstack/castellan
+      zuul_work_dir: src/opendev.org/openstack/castellan
 
 - project:
     check: