diff --git a/.gitreview b/.gitreview
index 98d9444..0ad2cf3 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/collectd-openstack-plugins.git
+project=x/collectd-openstack-plugins.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 4109d04..1861a58 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,10 +13,10 @@
     post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
-      - openstack/collectd-openstack-plugins
+      - x/collectd-openstack-plugins
 
 - job:
     name: collectd-openstack-plugins-bin-centos-7
@@ -26,10 +26,10 @@
     timeout: 7800
     nodeset: legacy-centos-7
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
-      - openstack/collectd-openstack-plugins
+      - x/collectd-openstack-plugins
 
 - job:
     name: collectd-openstack-plugins-src
@@ -38,10 +38,10 @@
     post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
-      - openstack/collectd-openstack-plugins
+      - x/collectd-openstack-plugins
 
 - job:
     name: collectd-openstack-plugins-src-centos-7
@@ -51,10 +51,10 @@
     timeout: 7800
     nodeset: legacy-centos-7
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
-      - openstack/collectd-openstack-plugins
+      - x/collectd-openstack-plugins
 
 
 
diff --git a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml
index b43752a..c246526 100644
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml
+++ b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,9 +30,9 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
           enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin https://git.openstack.org/openstack/collectd-ceilometer-plugin
+          enable_plugin collectd-ceilometer-plugin https://opendev.org/openstack/collectd-ceilometer-plugin
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml
index e1e7114..186891a 100644
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml
+++ b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,9 +30,9 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
           enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin https://git.openstack.org/openstack/collectd-ceilometer-plugin
+          enable_plugin collectd-ceilometer-plugin https://opendev.org/openstack/collectd-ceilometer-plugin
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml
index 1aafbbb..26b1576 100644
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml
+++ b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,9 +30,9 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
           enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin https://git.openstack.org/openstack/collectd-ceilometer-plugin
+          enable_plugin collectd-ceilometer-plugin https://opendev.org/openstack/collectd-ceilometer-plugin
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml
index b173361..9f727a9 100644
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml
+++ b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,9 +30,9 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin aodh https://git.openstack.org/openstack/aodh
+          enable_plugin aodh https://opendev.org/openstack/aodh
           enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin https://git.openstack.org/openstack/collectd-ceilometer-plugin
+          enable_plugin collectd-ceilometer-plugin https://opendev.org/openstack/collectd-ceilometer-plugin
 
           EOF
         executable: /bin/bash