diff --git a/.gitreview b/.gitreview
index 8c0f1885..6f144192 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-dev/grenade.git
+project=openstack/grenade.git
 
diff --git a/.zuul.yaml b/.zuul.yaml
index 16736954..ef3c34b8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,8 @@
     post-run: playbooks/legacy/grenade-postgresql/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
     irrelevant-files: &grenade-irrelevant-files
       - ^.*\.rst$
       - ^doc/.*$
@@ -18,8 +18,8 @@
     post-run: playbooks/legacy/grenade-py3/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
     irrelevant-files: *grenade-irrelevant-files
 
 - project:
diff --git a/playbooks/legacy/grenade-postgresql/run.yaml b/playbooks/legacy/grenade-postgresql/run.yaml
index e93cb0b2..55c833e7 100644
--- a/playbooks/legacy/grenade-postgresql/run.yaml
+++ b/playbooks/legacy/grenade-postgresql/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 }}'
@@ -27,7 +27,7 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_GRENADE=pullup
diff --git a/playbooks/legacy/grenade-py3/run.yaml b/playbooks/legacy/grenade-py3/run.yaml
index e845c786..2e54bdf4 100644
--- a/playbooks/legacy/grenade-py3/run.yaml
+++ b/playbooks/legacy/grenade-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 }}'
@@ -27,7 +27,7 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_GRENADE=pullup