diff --git a/.gitreview b/.gitreview
index 70dec2b..d0d814f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=opendev/base-jobs.git
diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
index 3ec1a34..96f3618 100644
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@@ -37,4 +37,4 @@
       set_apt_mirrors_trusted: True
     - role: fetch-zuul-cloner
       destination: "/usr/zuul-env/bin/zuul-cloner"
-      repo_src_dir: "/home/zuul/src/git.openstack.org"
+      repo_src_dir: "/home/zuul/src/opendev.org"
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
index 3ec1a34..96f3618 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -37,4 +37,4 @@
       set_apt_mirrors_trusted: True
     - role: fetch-zuul-cloner
       destination: "/usr/zuul-env/bin/zuul-cloner"
-      repo_src_dir: "/home/zuul/src/git.openstack.org"
+      repo_src_dir: "/home/zuul/src/opendev.org"
diff --git a/zuul.yaml b/zuul.yaml
index 47d9922..4138407 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -141,7 +141,7 @@
       - playbooks/base/post.yaml
       - playbooks/base/post-logs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     vars:
       ara_report_type: database
       ara_report_path: ara-report
@@ -167,7 +167,7 @@
       - playbooks/base-test/post.yaml
       - playbooks/base-test/post-logs.yaml
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     timeout: 1800
     post-timeout: 1800
     vars:
@@ -431,12 +431,12 @@
       jobs:
         - opendev-tox-docs
         - tox-linters:
-            required-projects: openstack-infra/zuul-jobs
+            required-projects: zuul/zuul-jobs
     gate:
       jobs:
         - opendev-tox-docs
         - tox-linters:
-            required-projects: openstack-infra/zuul-jobs
+            required-projects: zuul/zuul-jobs
     promote:
       jobs:
         - opendev-promote-docs