diff --git a/.gitreview b/.gitreview
index 784c1900ea..4eee726db6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-openstackclient.git
diff --git a/.zuul.yaml b/.zuul.yaml
index e1ffb0ebe0..69c39a64c4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,7 @@
       tox_envlist: py27
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
-      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
     name: osc-tox-py27-tips
@@ -37,7 +37,7 @@
     vars:
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
-      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
     name: osc-tox-py35-tips
@@ -58,7 +58,7 @@
     vars:
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
-      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
     name: osc-functional-devstack-base
@@ -100,7 +100,7 @@
       osc_environment:
         PYTHONUNBUFFERED: 'true'
         OS_CLOUD: devstack-admin
-      zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
+      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 # The Neutron bits are here rather than in osc-functional-devstack-base to
 # simplify removing Neutron in the osc-functional-devstack-n-net job.
@@ -111,7 +111,7 @@
     vars:
       devstack_plugins:
         # NOTE(amotoki): Some neutron features are enabled by devstack plugin
-        neutron: https://git.openstack.org/openstack/neutron
+        neutron: https://opendev.org/openstack/neutron
       devstack_services:
         neutron-network-segment-range: true
         neutron-segments: true