diff --git a/.gitreview b/.gitreview
index 4ad06ec..7afa350 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-dev/bashate.git
+project=openstack/bashate.git
diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 6bfa521..c0345f7 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -17,6 +17,6 @@
     timeout: 3600
     required-projects:
       - openstack/requirements
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
+      - openstack/devstack
+      - openstack/devstack-gate
 
diff --git a/playbooks/legacy/bashate-devstack/run.yaml b/playbooks/legacy/bashate-devstack/run.yaml
index 77ebbac..27c2ee5 100644
--- a/playbooks/legacy/bashate-devstack/run.yaml
+++ b/playbooks/legacy/bashate-devstack/run.yaml
@@ -18,18 +18,18 @@
           cd $WORKSPACE
 
           /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://git.openstack.org \
-            openstack-dev/bashate \
-            openstack-dev/devstack \
-            openstack-infra/devstack-gate
+            https://opendev.org \
+            openstack/bashate \
+            openstack/devstack \
+            openstack/devstack-gate
 
-          export BASHATE_INSTALL_PATH=$WORKSPACE/openstack-dev/bashate
+          export BASHATE_INSTALL_PATH=$WORKSPACE/openstack/bashate
 
-          pushd openstack-dev/devstack
+          pushd openstack/devstack
           tox -e bashate
           popd
 
-          pushd openstack-infra/devstack-gate
+          pushd openstack/devstack-gate
           tox -e bashate
           popd
         executable: /bin/bash