diff --git a/.gitreview b/.gitreview
index 2fa0844..b6894d8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/patrole.git
diff --git a/.zuul.yaml b/.zuul.yaml
index f8d17f9..1537b00 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,7 +9,7 @@
       - name: openstack/patrole
     timeout: 7800
     roles:
-      - zuul: openstack-dev/devstack
+      - zuul: openstack/devstack
     # Define common irrelevant files to use everywhere else
     irrelevant-files: &patrole-irrelevant-files
       - ^(test-|)requirements.txt$
@@ -24,7 +24,7 @@
       devstack_localrc:
         TEMPEST_PLUGINS: "'/opt/stack/patrole'"
       devstack_plugins:
-        patrole: git://git.openstack.org/openstack/patrole.git
+        patrole: git://opendev.org/openstack/patrole.git
       devstack_services:
         tempest: true
         neutron: true
@@ -47,15 +47,15 @@
     branches:
       - master
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/tempest
       - openstack/patrole
     irrelevant-files: *patrole-irrelevant-files
     vars:
       devstack_localrc:
-        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/patrole'"
+        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/opendev.org/openstack/patrole'"
       devstack_plugins:
-        patrole: git://git.openstack.org/openstack/patrole.git
+        patrole: git://opendev.org/openstack/patrole.git
       devstack_services:
         tempest: true
         neutron: true
@@ -162,9 +162,9 @@
       devstack_localrc:
         TEMPEST_PLUGINS: "'/opt/stack/patrole /opt/stack/neutron-tempest-plugin'"
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        patrole: git://git.openstack.org/openstack/patrole.git
-        neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+        neutron: git://opendev.org/openstack/neutron.git
+        patrole: git://opendev.org/openstack/patrole.git
+        neutron-tempest-plugin: git://opendev.org/openstack/neutron-tempest-plugin.git
       devstack_services:
         tempest: true
         neutron: true