diff --git a/.gitreview b/.gitreview
index 809427e..39cde17 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/ansible-role-diskimage-builder.git
+project=windmill/ansible-role-diskimage-builder.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 56919ae..60224ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
     pre-run: tests/playbooks/pre.yaml
     run: tests/playbooks/run.yaml
     roles:
-      - zuul: openstack/ansible-role-diskimage-builder
+      - zuul: windmill/ansible-role-diskimage-builder
 
 # Testing for diskimage_builder_install_method: pip
 - job:
diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml
index e761bc5..0a68112 100644
--- a/tests/playbooks/run.yaml
+++ b/tests/playbooks/run.yaml
@@ -22,7 +22,7 @@
   post_tasks:
     - name: Register diskimage_builder_git_dest_stat.
       stat:
-        path: /home/zuul/src/git.openstack.org/openstack/diskimage-builder
+        path: /home/zuul/src/opendev.org/openstack/diskimage-builder
       register: diskimage_builder_git_dest_stat
       when: diskimage_builder_install_method == 'git'