diff --git a/.gitreview b/.gitreview
index 51b366d90..7a67acadd 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/neutron-vpnaas.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 40d466394..6d05d8277 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -37,8 +37,8 @@
       tempest_test_regex: ^neutron_vpnaas\.
       tox_envlist: all-plugin
       devstack_plugins:
-        neutron-vpnaas: https://git.openstack.org/openstack/neutron-vpnaas
-        neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin
+        neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas
+        neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
       devstack_localrc:
         IPSEC_PACKAGE: strongswan
     irrelevant-files:
@@ -70,7 +70,7 @@
     post-run: playbooks/legacy/neutron-vpnaas-dsvm-functional-sswan/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-vpnaas
     irrelevant-files:
@@ -86,7 +86,7 @@
     post-run: playbooks/legacy/neutron-vpnaas-dsvm-rally/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-vpnaas
       - openstack/rally
diff --git a/playbooks/legacy/neutron-vpnaas-dsvm-functional-sswan/run.yaml b/playbooks/legacy/neutron-vpnaas-dsvm-functional-sswan/run.yaml
index c610f9384..1027c54ce 100644
--- a/playbooks/legacy/neutron-vpnaas-dsvm-functional-sswan/run.yaml
+++ b/playbooks/legacy/neutron-vpnaas-dsvm-functional-sswan/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-vpnaas-dsvm-rally/run.yaml b/playbooks/legacy/neutron-vpnaas-dsvm-rally/run.yaml
index b370153f2..3d7215015 100644
--- a/playbooks/legacy/neutron-vpnaas-dsvm-rally/run.yaml
+++ b/playbooks/legacy/neutron-vpnaas-dsvm-rally/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,8 +29,8 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas
-          enable_plugin rally https://git.openstack.org/openstack/rally
+          enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas
+          enable_plugin rally https://opendev.org/openstack/rally
 
           EOF
         executable: /bin/bash