diff --git a/.gitreview b/.gitreview
index 184583f0d66..bda84bf1231 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/neutron.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 7d76e048279..d495e1b2aab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -108,10 +108,10 @@
     description: Run neutron functional tests
     timeout: 7800
     required-projects:
-      - git.openstack.org/openstack-dev/devstack
+      - opendev.org/openstack/devstack
       - openstack/neutron
     roles:
-      - zuul: openstack-dev/devstack
+      - zuul: openstack/devstack
     pre-run: playbooks/configure_functional_job.yaml
     run: playbooks/run_functional_job.yaml
     post-run: playbooks/post_functional_job.yaml
@@ -164,8 +164,8 @@
       devstack_localrc:
         USE_PYTHON3: true
       devstack_plugins:
-        rally-openstack: https://git.openstack.org/openstack/rally-openstack
-        neutron: https://git.openstack.org/openstack/neutron
+        rally-openstack: https://opendev.org/openstack/rally-openstack
+        neutron: https://opendev.org/openstack/neutron
       devstack_services:
         neutron-trunk: true
       rally_task: rally-jobs/task-neutron.yaml
@@ -185,7 +185,7 @@
     parent: tempest-full-py3
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
     vars:
@@ -199,7 +199,7 @@
     parent: tempest-full-py3
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
     vars:
@@ -225,8 +225,8 @@
     post-run: playbooks/legacy/neutron-grenade-multinode/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/neutron
     irrelevant-files: *tempest-irrelevant-files
 
@@ -237,8 +237,8 @@
     post-run: playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml
     timeout: 7500
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/neutron
     irrelevant-files: *tempest-irrelevant-files
 
@@ -250,7 +250,7 @@
     roles:
       - zuul: openstack/neutron-tempest-plugin
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
     pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml
@@ -317,13 +317,13 @@
     parent: tempest-full-py3
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
     vars:
       tempest_concurrency: 4
       devstack_plugins:
-        neutron: https://git.openstack.org/openstack/neutron.git
+        neutron: https://opendev.org/openstack/neutron.git
       devstack_services:
         tls-proxy: false
         tempest: true
@@ -380,8 +380,8 @@
     post-run: playbooks/legacy/neutron-grenade/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/neutron
     irrelevant-files: *tempest-irrelevant-files
 
@@ -392,7 +392,7 @@
     post-run: playbooks/legacy/neutron-tempest-postgres-full/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
 
@@ -403,7 +403,7 @@
     post-run: playbooks/legacy/neutron-tempest-with-os-ken-master/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
 
diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml
index 4410afb4104..39bacf3e5c9 100644
--- a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml
+++ b/playbooks/legacy/neutron-grenade-dvr-multinode/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 }}'
@@ -33,7 +33,7 @@
           export DEVSTACK_GATE_GRENADE=pullup
           export DEVSTACK_GATE_USE_PYTHON3=True
           # Test DVR upgrade on multinode
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export DEVSTACK_GATE_NEUTRON_DVR=1
           export BRANCH_OVERRIDE=default
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
diff --git a/playbooks/legacy/neutron-grenade-multinode/run.yaml b/playbooks/legacy/neutron-grenade-multinode/run.yaml
index 2d2101db0c1..32071a43ed0 100644
--- a/playbooks/legacy/neutron-grenade-multinode/run.yaml
+++ b/playbooks/legacy/neutron-grenade-multinode/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 }}'
@@ -32,7 +32,7 @@
           export DEVSTACK_GATE_CONFIGDRIVE=0
           export DEVSTACK_GATE_GRENADE=pullup
           export DEVSTACK_GATE_USE_PYTHON3=True
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           # Default to non DVR
           export DEVSTACK_GATE_NEUTRON_DVR=0
           export BRANCH_OVERRIDE=default
diff --git a/playbooks/legacy/neutron-grenade/run.yaml b/playbooks/legacy/neutron-grenade/run.yaml
index 6ba1edb44bc..9b26a9be162 100644
--- a/playbooks/legacy/neutron-grenade/run.yaml
+++ b/playbooks/legacy/neutron-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 }}'
@@ -41,7 +41,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/neutron-tempest-postgres-full/run.yaml b/playbooks/legacy/neutron-tempest-postgres-full/run.yaml
index e1e6ad749e9..89846b53c09 100644
--- a/playbooks/legacy/neutron-tempest-postgres-full/run.yaml
+++ b/playbooks/legacy/neutron-tempest-postgres-full/run.yaml
@@ -14,12 +14,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/neutron-tempest-with-os-ken-master/run.yaml b/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml
index be6c842069c..da193ae071a 100644
--- a/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml
+++ b/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml
@@ -14,12 +14,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/roles/configure_functional_tests/defaults/main.yaml b/roles/configure_functional_tests/defaults/main.yaml
index e849e80429b..615b9785085 100644
--- a/roles/configure_functional_tests/defaults/main.yaml
+++ b/roles/configure_functional_tests/defaults/main.yaml
@@ -1,5 +1,5 @@
 tests_venv: "{{ tox_envlist }}"
-base_dir: "{{ ansible_user_dir }}/src/git.openstack.org"
+base_dir: "{{ ansible_user_dir }}/src/opendev.org"
 gate_dest_dir: "{{ base_dir }}/openstack"
-devstack_dir: "{{ base_dir }}/openstack-dev/devstack"
+devstack_dir: "{{ base_dir }}/openstack/devstack"
 neutron_dir: "{{ gate_dest_dir }}/neutron"