diff --git a/.gitreview b/.gitreview
index 425471af5..975ab6dbf 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/puppet-openstack-integration.git
diff --git a/playbooks/prepare-node-beaker.yaml b/playbooks/prepare-node-beaker.yaml
index f1ac052d3..fe45e61c2 100644
--- a/playbooks/prepare-node-beaker.yaml
+++ b/playbooks/prepare-node-beaker.yaml
@@ -26,7 +26,7 @@
               dest: openstack/puppet-openstack-integration
           EOF
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://git.openstack.org $ZUUL_PROJECT openstack/puppet-openstack-integration
+              https://opendev.org $ZUUL_PROJECT openstack/puppet-openstack-integration
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index 1ea9323a9..d756db9c1 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -25,7 +25,7 @@
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
               --cache-dir /opt/git \
               --zuul-branch $ZUUL_BRANCH_REAL \
-              https://git.openstack.org openstack/puppet-openstack-integration
+              https://opendev.org openstack/puppet-openstack-integration
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -33,7 +33,7 @@
     - include_role:
         name: bindep
       vars:
-        bindep_dir: "src/git.openstack.org/openstack/puppet-openstack-integration"
+        bindep_dir: "src/opendev.org/openstack/puppet-openstack-integration"
 
     - name: Create folder for gems
       file:
diff --git a/playbooks/prepare-node-unit.yaml b/playbooks/prepare-node-unit.yaml
index 3898f11e9..d6ba3e13a 100644
--- a/playbooks/prepare-node-unit.yaml
+++ b/playbooks/prepare-node-unit.yaml
@@ -24,7 +24,7 @@
               dest: .
           EOF
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://git.openstack.org $ZUUL_PROJECT
+              https://opendev.org $ZUUL_PROJECT
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 9bbaf273e..29336871d 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -22,7 +22,7 @@
       - openstack/puppet-manila
       - openstack/puppet-mistral
       - openstack/puppet-monasca
-      - openstack/puppet-modulesync-configs
+      - x/puppet-modulesync-configs
       - openstack/puppet-murano
       - openstack/puppet-neutron
       - openstack/puppet-nova
@@ -70,7 +70,7 @@
       - ^setup.cfg$
       - ^setup.py$
     roles:
-      - zuul: openstack-infra/zuul-jobs
+      - zuul: zuul/zuul-jobs
     # NOTE(tobasco): The ceph variable must be provided with a default here
     # or zuul will complain when it tries to render the run-integration-tests template.
     vars: