diff --git a/.gitreview b/.gitreview
index 4101676..998337d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/ansible-role-zuul.git
+project=windmill/ansible-role-zuul.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 04a9afa..9d5156a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
     run: tests/playbooks/run.yaml
     post-run: tests/collect-logs.yaml
     roles:
-      - zuul: openstack/ansible-role-zuul
+      - zuul: windmill/ansible-role-zuul
 
 # Testing for zuul_install_method: pip
 - job:
@@ -27,7 +27,7 @@
     name: ansible-role-zuul-src
     parent: ansible-role-zuul-base
     required-projects:
-      - name: openstack-infra/zuul
+      - name: zuul/zuul
     vars:
       zuul_git_update: false
       zuul_install_method: git
diff --git a/tests/collect-logs.yaml b/tests/collect-logs.yaml
index ba5d6a1..b38b3d8 100644
--- a/tests/collect-logs.yaml
+++ b/tests/collect-logs.yaml
@@ -35,7 +35,7 @@
         - /var/log/zuul
 
     # TODO: Migrate to fetch-zuul-logs when
-    # https://review.openstack.org/#/c/583346/ is merged.
+    # https://review.opendev.org/#/c/583346/ is merged.
     - name: Collect log output
       synchronize:
         dest: "{{ zuul.executor.log_root }}/"
diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml
index bc49ac2..ad93c64 100644
--- a/tests/playbooks/run.yaml
+++ b/tests/playbooks/run.yaml
@@ -88,7 +88,7 @@
 
     - name: Register zuul_git_dest_stat.
       stat:
-        path: /home/zuul/src/git.openstack.org/openstack-infra/zuul
+        path: /home/zuul/src/opendev.org/zuul/zuul
       register: zuul_git_dest_stat
       when: zuul_install_method == 'git'