diff --git a/.gitreview b/.gitreview
index 2e306b44..2ce6389a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/tap-as-a-service.git
+project=x/tap-as-a-service.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 19901239..8e4bccc7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,8 +16,8 @@
     post-run: playbooks/legacy/tempest-dsvm-tap-as-a-service/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/tap-as-a-service
+      - openstack/devstack-gate
+      - x/tap-as-a-service
       - openstack/tempest
     irrelevant-files:
       - ^(test-|)requirements.txt$
diff --git a/playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml b/playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml
index c2de4525..f75d4097 100644
--- a/playbooks/legacy/tempest-dsvm-tap-as-a-service/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-tap-as-a-service/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 tap-as-a-service https://git.openstack.org/openstack/tap-as-a-service
+          enable_plugin tap-as-a-service https://opendev.org/x/tap-as-a-service
 
           EOF
         executable: /bin/bash
@@ -50,7 +50,7 @@
           fi
 
           # Enable tap-as-a-service
-          export PROJECTS="openstack/tap-as-a-service $PROJECTS"
+          export PROJECTS="x/tap-as-a-service $PROJECTS"
           export ENABLED_SERVICES=taas,taas_agent
 
           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/tap-as-a-service/devstack/devstackgaterc