diff --git a/.gitreview b/.gitreview
index 7663a9b7a9..20b67176ec 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack-infra/system-config.git
+project=opendev/system-config.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 0b6b6e0749..ce2df731fb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -414,13 +414,13 @@
       - name: github.com/ansible/ansible
         override-checkout: devel
       - name: openstack/openstacksdk
-      - name: openstack/ara
+      - name: recordsansible/ara
     vars:
       bridge_ansible_name: '{{ ansible_user_dir}}/src/github.com/ansible/ansible'
       bridge_ansible_version: null
-      bridge_openstacksdk_name: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/openstacksdk'
+      bridge_openstacksdk_name: '{{ ansible_user_dir }}/src/opendev.org/openstack/openstacksdk'
       bridge_openstacksdk_version: null
-      bridge_ara_name: '{{ ansible_user_dir}}/src/git.openstack.org/openstack/ara'
+      bridge_ara_name: '{{ ansible_user_dir}}/src/opendev.org/recordsansible/ara'
       bridge_ara_version: null
 
 - job:
diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index 372f5c9be5..0e4fc485dc 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -15,7 +15,7 @@
           - ansible_user
     - name: Set up /opt/system-config repo
       git:
-        repo: /home/zuul/src/git.openstack.org/openstack-infra/system-config
+        repo: /home/zuul/src/opendev.org/opendev/system-config
         dest: /opt/system-config
         force: yes
     - name: Add groups config for test nodes
@@ -33,7 +33,7 @@
         path: /etc/ansible/ansible.cfg
         section: defaults
         option: inventory_plugins
-        value: /home/zuul/src/git.openstack.org/openstack-infra/system-config/playbooks/roles/install-ansible/files/inventory_plugins
+        value: /home/zuul/src/opendev.org/opendev/system-config/playbooks/roles/install-ansible/files/inventory_plugins
     - name: Update ansible.cfg to configure inventory plugins
       ini_file:
         path: /etc/ansible/ansible.cfg
@@ -72,10 +72,10 @@
     - name: Display group membership
       command: ansible localhost -m debug -a 'var=groups'
     - name: Run base.yaml
-      command: ansible-playbook -v /home/zuul/src/git.openstack.org/openstack-infra/system-config/playbooks/base.yaml
+      command: ansible-playbook -v /home/zuul/src/opendev.org/opendev/system-config/playbooks/base.yaml
     - name: Run test playbook
       when: run_base_test_playbook is defined
-      shell: "ANSIBLE_ROLES_PATH=/home/zuul/src/git.openstack.org/openstack-infra/system-config/playbooks/roles ansible-playbook -v /home/zuul/src/git.openstack.org/openstack-infra/system-config/{{ run_base_test_playbook }}"
+      shell: "ANSIBLE_ROLES_PATH=/home/zuul/src/opendev.org/opendev/system-config/playbooks/roles ansible-playbook -v /home/zuul/src/opendev.org/opendev/system-config/{{ run_base_test_playbook }}"
     - name: Run testinfra to validate configuration
       include_role:
         name: tox
diff --git a/roles/openafs-client/tasks/openafs-client/CentOS.yaml b/roles/openafs-client/tasks/openafs-client/CentOS.yaml
index 92e0f07fb9..759bd877f6 100644
--- a/roles/openafs-client/tasks/openafs-client/CentOS.yaml
+++ b/roles/openafs-client/tasks/openafs-client/CentOS.yaml
@@ -18,7 +18,7 @@
 
 # Note there is no official AFS builds for CentOS.  This uses a
 # repository built by the project-config-build-openafs-centos job, see
-#  https://git.openstack.org/cgit/openstack-infra/openstack-zuul-jobs/tree/zuul.d/jobs.yaml
+#  https://opendev.org/cgit/openstack/openstack-zuul-jobs/tree/zuul.d/jobs.yaml
 
 - name: Add AFS repo
   yum_repository: