diff --git a/.gitreview b/.gitreview
index d744935a7..47ebc1321 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/watcher.git
 defaultbranch=stable/queens
diff --git a/.zuul.yaml b/.zuul.yaml
index 625cf2789..cce818994 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,7 +18,7 @@
     post-run: playbooks/legacy/watcher-tempest-base-multinode/post.yaml
     timeout: 4200
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/python-openstackclient
       - openstack/python-watcherclient
       - openstack/watcher
@@ -38,8 +38,8 @@
     post-run: playbooks/legacy/watcherclient-tempest-functional/post.yaml
     timeout: 4200
     required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
+      - openstack/devstack
+      - openstack/devstack-gate
       - openstack/python-openstackclient
       - openstack/python-watcherclient
       - openstack/watcher
diff --git a/playbooks/legacy/watcher-tempest-base-multinode/run.yaml b/playbooks/legacy/watcher-tempest-base-multinode/run.yaml
index 7117cd511..179f4ef3c 100644
--- a/playbooks/legacy/watcher-tempest-base-multinode/run.yaml
+++ b/playbooks/legacy/watcher-tempest-base-multinode/run.yaml
@@ -13,12 +13,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 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           TEMPEST_PLUGINS='/opt/stack/new/watcher-tempest-plugin'
-          enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
+          enable_plugin ceilometer https://opendev.org/openstack/ceilometer
           # Enable watcher devstack plugin.
-          enable_plugin watcher https://git.openstack.org/openstack/watcher
+          enable_plugin watcher https://opendev.org/openstack/watcher
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/watcherclient-tempest-functional/run.yaml b/playbooks/legacy/watcherclient-tempest-functional/run.yaml
index a4aeb88f0..a54167ea7 100644
--- a/playbooks/legacy/watcherclient-tempest-functional/run.yaml
+++ b/playbooks/legacy/watcherclient-tempest-functional/run.yaml
@@ -13,12 +13,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 }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin watcher https://git.openstack.org/openstack/watcher
+          enable_plugin watcher https://opendev.org/openstack/watcher
 
           EOF
         executable: /bin/bash