diff --git a/.gitreview b/.gitreview
index a1e6ccf91..ec29d64e9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/neutron-fwaas.git
diff --git a/.zuul.yaml b/.zuul.yaml
index da04572c9..394d12444 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -36,7 +36,7 @@
     post-run: playbooks/neutron-fwaas-fullstack/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
     irrelevant-files:
       - ^.*\.rst$
@@ -52,7 +52,7 @@
     post-run: playbooks/legacy/neutron-fullstack-python35/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
     irrelevant-files:
       - ^.*\.rst$
diff --git a/playbooks/neutron-fwaas-fullstack/run.yaml b/playbooks/neutron-fwaas-fullstack/run.yaml
index 668d5ea24..1d2be9c91 100644
--- a/playbooks/neutron-fwaas-fullstack/run.yaml
+++ b/playbooks/neutron-fwaas-fullstack/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 }}'