diff --git a/.gitreview b/.gitreview
index 1cbce9d1..993b795c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/neutron-dynamic-routing.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 35f09634..5dfb409d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-functional/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
     irrelevant-files:
@@ -21,7 +21,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-api/post.yaml
     timeout: 7500
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
       - openstack/neutron-tempest-plugin
@@ -38,7 +38,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
       - openstack/neutron-tempest-plugin
@@ -55,7 +55,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
       - openstack/neutron-tempest-plugin
@@ -72,7 +72,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
       - openstack/neutron-tempest-plugin
@@ -89,7 +89,7 @@
     post-run: playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-dynamic-routing
       - openstack/neutron-tempest-plugin
diff --git a/playbooks/neutron-dynamic-routing-dsvm-functional/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-functional/run.yaml
index 53d18a85..9713e4af 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-functional/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-functional/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/neutron-dynamic-routing-dsvm-tempest-api/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-api/run.yaml
index 39f938a6..52521c14 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-api/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-api/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 }}'
@@ -30,8 +30,8 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing
-          enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin
+          enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
+          enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml
index 960336a8..64b3a340 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/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 }}'
@@ -40,8 +40,8 @@
           export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
           export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
           DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
           export DEVSTACK_LOCAL_CONFIG
           # NOTE(frickler): Some tests are failing when running in parallel, likely due collisions in the docker setup
           export TEMPEST_CONCURRENCY=1
diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml
index 9cb98495..33c4d087 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/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 }}'
@@ -40,8 +40,8 @@
           export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
           export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
           DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
           export DEVSTACK_LOCAL_CONFIG
 
           function gate_hook {
diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml
index 26240141..634960b4 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/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 }}'
@@ -40,8 +40,8 @@
           export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
           DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
           export DEVSTACK_LOCAL_CONFIG
 
           function gate_hook {
diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml
index abefe7ab..13a8e73a 100644
--- a/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/run.yaml
+++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-with-os-ken-master-scenario-ipv4/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 }}'
@@ -40,8 +40,8 @@
           export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
           export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
           DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing"
-          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin"
           if [[ "ipv4" == "basic" ]]; then
               DEVSTACK_LOCAL_CONFIG+=$'\n'"BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.ChanceScheduler"
           fi
@@ -50,7 +50,7 @@
           function gate_hook {
               local os_ken_path=$BASE/new/os_ken_master
               if [[ ! -d $os_ken_path ]]; then
-                  git clone https://git.openstack.org/openstack/os-ken $os_ken_path
+                  git clone https://opendev.org/openstack/os-ken $os_ken_path
               fi
               sudo pip install -e $os_ken_path
               bash -xe $BASE/new/neutron-dynamic-routing/neutron_dynamic_routing/tests/contrib/gate_hook.sh dsvm-scenario