diff --git a/.gitreview b/.gitreview
index e8cbabf..e6588d7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/refstack-client.git
diff --git a/.zuul.yaml b/.zuul.yaml
index b583d9b..1c08f16 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,12 +20,12 @@
     required-projects:
       - openstack/refstack-client
       - openstack/tempest
-      - openstack-dev/devstack
+      - openstack/devstack
       - openstack/python-tempestconf
     roles:
       - zuul: openstack/python-tempestconf
       - zuul: openstack/tempest
-      - zuul: openstack-dev/devstack
+      - zuul: openstack/devstack
       - zuul: openstack/refstack-client
     run: playbooks/tempestconf-refstack-devstack.yaml
     vars:
diff --git a/roles/generate-tempestconf-refstack/tasks/main.yaml b/roles/generate-tempestconf-refstack/tasks/main.yaml
index dd3f119..5041b97 100644
--- a/roles/generate-tempestconf-refstack/tasks/main.yaml
+++ b/roles/generate-tempestconf-refstack/tasks/main.yaml
@@ -48,4 +48,4 @@
         executable: /bin/bash
 
   vars:
-    refstack_client_src_relative_path: "{{ zuul.projects['git.openstack.org/openstack/refstack-client'].src_dir }}"
+    refstack_client_src_relative_path: "{{ zuul.projects['opendev.org/openstack/refstack-client'].src_dir }}"