diff --git a/.gitreview b/.gitreview
index ae0c760..dac68ac 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/neutron-classifier.git
+project=x/neutron-classifier.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 6b2c3f3..f8dad8d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,9 +17,9 @@
     post-run: playbooks/legacy/neutron-classifier-functional-dsvm/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
-      - git.openstack.org/openstack/keystone
-      - git.openstack.org/openstack/neutron
+      - openstack/devstack-gate
+      - opendev.org/openstack/keystone
+      - opendev.org/openstack/neutron
     roles:
       - zuul: openstack-infra/devstack
     vars:
diff --git a/playbooks/legacy/neutron-classifier-functional-dsvm/run.yaml b/playbooks/legacy/neutron-classifier-functional-dsvm/run.yaml
index ee303d2..276ed16 100644
--- a/playbooks/legacy/neutron-classifier-functional-dsvm/run.yaml
+++ b/playbooks/legacy/neutron-classifier-functional-dsvm/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,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin neutron-classifier https://git.openstack.org/openstack/neutron-classifier
+          enable_plugin neutron-classifier https://opendev.org/x/neutron-classifier
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -52,7 +52,7 @@
           # Because we are testing a non standard project, add
           # our project repository. This makes zuul do the right
           # reference magic for testing changes.
-          export PROJECTS="openstack/neutron-classifier $PROJECTS"
+          export PROJECTS="x/neutron-classifier $PROJECTS"
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           function gate_hook {