diff --git a/.gitreview b/.gitreview
index a69037f36..389e86008 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/openstack-helm-infra.git
diff --git a/playbooks/osh-infra-airship-divingbell-check.yaml b/playbooks/osh-infra-airship-divingbell-check.yaml
index e7bdb3b4d..1ba66df5c 100644
--- a/playbooks/osh-infra-airship-divingbell-check.yaml
+++ b/playbooks/osh-infra-airship-divingbell-check.yaml
@@ -16,7 +16,7 @@
   tasks:
     - name: clone and run divingbell override test
       shell: |
-        git clone https://github.com/openstack/airship-divingbell
+        git clone https://github.com/airship/divingbell
         cd airship-divingbell
         mkdir build
         ln -s ../openstack-helm-infra build/openstack-helm-infra
diff --git a/roles/disable-local-nameserver/tasks/main.yaml b/roles/disable-local-nameserver/tasks/main.yaml
index 4cbd9a7ee..d9f21ae6c 100644
--- a/roles/disable-local-nameserver/tasks/main.yaml
+++ b/roles/disable-local-nameserver/tasks/main.yaml
@@ -15,7 +15,7 @@
 # NOTE(portdirect): We disable the local nameserver as it interferes with the
 # k8s dns-service and other local resolvers used for development use.
 # See the following for the original config:
-# * https://github.com/openstack-infra/project-config/blob/0332c33dd134033e0620645c252f82b77e4c16f5/nodepool/elements/nodepool-base/finalise.d/89-unbound
+# * https://github.com/openstack/project-config/blob/0332c33dd134033e0620645c252f82b77e4c16f5/nodepool/elements/nodepool-base/finalise.d/89-unbound
 
 - name: Disable local nameserver
   when: ansible_distribution == 'Ubuntu'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9ee57694a..0dba3106f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -374,7 +374,7 @@
     nodeset: openstack-helm-single-node
     run: playbooks/osh-infra-airship-divingbell-check.yaml
     required-projects:
-      - openstack/airship-divingbell
+      - airship/divingbell
 
 - job:
     name: openstack-helm-infra-aio-podsecuritypolicy