diff --git a/.gitreview b/.gitreview
index 4d7422e..8cdc988 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/openstackclient.git
diff --git a/.zuul.yaml b/.zuul.yaml
index c408c8b..7c05059 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,7 +6,7 @@
     timeout: 1800
     required-projects:
       - openstack/openstackclient
-      - openstack/pbrx
+      - x/pbrx
       - openstack/python-openstackclient
       - openstack/python-barbicanclient
       - openstack/python-cloudkittyclient
@@ -22,7 +22,7 @@
       - openstack/python-octaviaclient
       - openstack/python-pankoclient
       - openstack/python-qinlingclient
-      - openstack/python-rsdclient
+      - x/python-rsdclient
       - openstack/python-saharaclient
       - openstack/python-searchlightclient
       - openstack/python-senlinclient
diff --git a/playbooks/openstackclient-check-plugins/run.yaml b/playbooks/openstackclient-check-plugins/run.yaml
index 17ab5f2..09fe362 100644
--- a/playbooks/openstackclient-check-plugins/run.yaml
+++ b/playbooks/openstackclient-check-plugins/run.yaml
@@ -16,4 +16,4 @@
           echo "------------------------------------------------------------"
           osc_plugins/bin/openstack --version
           osc_plugins/bin/python tests/check_osc_commands.py
-        chdir: /home/zuul/src/git.openstack.org/openstack/openstackclient
+        chdir: /home/zuul/src/opendev.org/openstack/openstackclient