diff --git a/.gitreview b/.gitreview
index ed5da6b..d41d3f9 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-tempest-plugin.git
+project=x/tap-as-a-service-tempest-plugin.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 5871044..886dd23 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -26,12 +26,12 @@
     description: |
       Perform setup common to all tap-as-a-service tempest tests
     roles:
-      - zuul: openstack-dev/devstack
+      - zuul: openstack/devstack
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/neutron
-      - openstack/tap-as-a-service
-      - openstack/tap-as-a-service-tempest-plugin
+      - x/tap-as-a-service
+      - x/tap-as-a-service-tempest-plugin
       - openstack/tempest
     vars:
       tempest_test_regex: ^neutron_taas_tempest_plugin\.
@@ -103,8 +103,8 @@
         USE_PYTHON3: false
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        tap-as-a-service: git://git.openstack.org/openstack/tap-as-a-service.git
+        neutron: git://opendev.org/openstack/neutron.git
+        tap-as-a-service: git://opendev.org/x/tap-as-a-service.git
       # tempest_plugins:
       #   - tap-as-a-service-tempest-plugin
       devstack_services: