diff --git a/.gitreview b/.gitreview
index b0264b5222..92ff091176 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/sahara.git
 defaultbranch=stable/queens
diff --git a/.zuul.yaml b/.zuul.yaml
index f82c689041..64d407df89 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -46,8 +46,8 @@
     post-run: playbooks/sahara-grenade/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/sahara
       - openstack/python-saharaclient
       - openstack/heat
diff --git a/playbooks/sahara-grenade/run.yaml b/playbooks/sahara-grenade/run.yaml
index 08607c53e0..12e94f5556 100644
--- a/playbooks/sahara-grenade/run.yaml
+++ b/playbooks/sahara-grenade/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -39,15 +39,15 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PROJECTS="openstack/sahara $PROJECTS"
           export PROJECTS="openstack/python-saharaclient $PROJECTS"
           export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-heatclient $PROJECTS"
           export PROJECTS="openstack/sahara-tests $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
-          export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
+          export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://opendev.org/openstack/sahara"
+          export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://opendev.org/openstack/heat"
 
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
diff --git a/roles/build-sahara-images-cli/defaults/main.yaml b/roles/build-sahara-images-cli/defaults/main.yaml
index 0f2c9f523a..bcd34c08c2 100644
--- a/roles/build-sahara-images-cli/defaults/main.yaml
+++ b/roles/build-sahara-images-cli/defaults/main.yaml
@@ -1,4 +1,4 @@
 ---
-sahara_src_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/sahara'].src_dir }}"
+sahara_src_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/sahara'].src_dir }}"
 sahara_build_directory: /var/tmp/sahara-image-build
 sahara_plugin: vanilla