diff --git a/.gitreview b/.gitreview
index 26205628a..e58c8875f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/vitrage.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 40960e9a8..00913c600 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -32,7 +32,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-api-py27/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/mistral
       - openstack/python-vitrageclient
@@ -50,7 +50,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-api-py3/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/mistral
       - openstack/python-vitrageclient
@@ -68,7 +68,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-datasources-py27/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/mistral
       - openstack/python-vitrageclient
@@ -86,7 +86,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-datasources-py3/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/mistral
       - openstack/python-vitrageclient
@@ -105,7 +105,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-mock-py27/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/python-vitrageclient
       - openstack/vitrage
       - openstack/vitrage-tempest-plugin
@@ -122,7 +122,7 @@
     post-run: playbooks/legacy/vitrage-dsvm-mock-py3/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/python-vitrageclient
       - openstack/vitrage
       - openstack/vitrage-tempest-plugin
@@ -138,8 +138,8 @@
     post-run: playbooks/legacy/vitrage-grenade/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/vitrage
       - openstack/python-vitrageclient
     irrelevant-files:
diff --git a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
index 328cd601e..452c7da30 100644
--- a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-api-py27/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 }}'
diff --git a/playbooks/legacy/vitrage-dsvm-api-py3/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py3/run.yaml
index 9ede804a6..692da3fdf 100644
--- a/playbooks/legacy/vitrage-dsvm-api-py3/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-api-py3/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 }}'
diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
index 69d34aad6..9386b0d17 100644
--- a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-datasources-py27/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 }}'
diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml
index 25c131a8c..581c51199 100644
--- a/playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-datasources-py3/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 }}'
diff --git a/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml
index d5e36f4c0..8cd2ce008 100644
--- a/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-mock-py27/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 }}'
diff --git a/playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml b/playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml
index 01a8b5d1a..b4864972f 100644
--- a/playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-mock-py3/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 }}'
diff --git a/playbooks/legacy/vitrage-grenade/run.yaml b/playbooks/legacy/vitrage-grenade/run.yaml
index efa1df061..73ef2fe1e 100644
--- a/playbooks/legacy/vitrage-grenade/run.yaml
+++ b/playbooks/legacy/vitrage-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 }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin vitrage https://git.openstack.org/openstack/vitrage
+          enable_plugin vitrage https://opendev.org/openstack/vitrage
           # TEMPEST_PLUGINS+=' ../'
           EOF
         executable: /bin/bash
@@ -40,11 +40,11 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PROJECTS="openstack/vitrage $PROJECTS"
           export PROJECTS="openstack/python-vitrageclient $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export GRENADE_PLUGINRC="enable_grenade_plugin vitrage https://git.openstack.org/openstack/vitrage"
+          export GRENADE_PLUGINRC="enable_grenade_plugin vitrage https://opendev.org/openstack/vitrage"
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_GRENADE=pullup