diff --git a/playbooks/group_vars/dns.yaml b/playbooks/group_vars/dns.yaml
index 9150b550a5..e331b5d7eb 100644
--- a/playbooks/group_vars/dns.yaml
+++ b/playbooks/group_vars/dns.yaml
@@ -1,8 +1,8 @@
 dns_repos:
   - name: zone-opendev.org
-    url: https://git.openstack.org/openstack-infra/zone-opendev.org
+    url: https://opendev.org/opendev/zone-opendev.org
   - name: zone-zuul-ci.org
-    url: https://git.openstack.org/openstack-infra/zone-zuul-ci.org
+    url: https://opendev.org/opendev/zone-zuul-ci.org
 dns_zones:
   - name: opendev.org
     source: zone-opendev.org/zones/opendev.org/
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index 9c981c74ec..bd4a45e964 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -18,7 +18,7 @@
   tasks:
     - name: Clone project-config repo
       git:
-        repo: https://git.openstack.org/openstack-infra/project-config
+        repo: https://opendev.org/openstack/project-config
         dest: /opt/project-config
         force: yes
       register: gitinfo
diff --git a/playbooks/sync-gitea-projects.yaml b/playbooks/sync-gitea-projects.yaml
index b12af45b08..484826c588 100644
--- a/playbooks/sync-gitea-projects.yaml
+++ b/playbooks/sync-gitea-projects.yaml
@@ -5,7 +5,7 @@
   tasks:
     - name: Clone project-config repo
       git:
-        repo: https://git.openstack.org/openstack-infra/project-config
+        repo: https://opendev.org/openstack/project-config
         dest: /opt/project-config
         force: yes
 
diff --git a/playbooks/update-system-config.yaml b/playbooks/update-system-config.yaml
index 6f1f333243..ea1a563624 100644
--- a/playbooks/update-system-config.yaml
+++ b/playbooks/update-system-config.yaml
@@ -5,7 +5,7 @@
   tasks:
     - name: Make sure system-config repo is up to date
       git:
-        repo: https://git.openstack.org/openstack-infra/system-config
+        repo: https://opendev.org/opendev/system-config
         dest: /opt/system-config
         force: yes
 
diff --git a/playbooks/update_puppet_version.yaml b/playbooks/update_puppet_version.yaml
index bc455d04d0..0082dded7a 100644
--- a/playbooks/update_puppet_version.yaml
+++ b/playbooks/update_puppet_version.yaml
@@ -8,7 +8,7 @@
     register: puppet4_bin_path
   - name: "Get puppet installation script"
     get_url:
-      url: http://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh
+      url: https://opendev.org/opendev/system-config/raw/branch/master/install_puppet.sh
       dest: /tmp/install_puppet.sh
       mode: 0755
       checksum: sha256:741b8cfdc039e817bd598511dd7203da16701f213775e639994e8bb278a68239
diff --git a/roles.yaml b/roles.yaml
index 6786249e1d..7e6cd676d8 100644
--- a/roles.yaml
+++ b/roles.yaml
@@ -1,7 +1,7 @@
 ---
-- src: git+https://git.openstack.org/openstack-infra/ansible-role-puppet.git
+- src: git+https://opendev.org/opendev/ansible-role-puppet.git
   version: HEAD
   name: puppet
-- src: git+https://git.openstack.org/openstack/ansible-role-cloud-launcher.git
+- src: git+https://opendev.org/opendev/ansible-role-cloud-launcher.git
   version: HEAD
   name: cloud-launcher
diff --git a/roles/puppet-install/README.rst b/roles/puppet-install/README.rst
index d19343cd13..94ad450e1a 100644
--- a/roles/puppet-install/README.rst
+++ b/roles/puppet-install/README.rst
@@ -17,7 +17,7 @@ This roles installs puppet on a host
    :default: yes
 
    If we should clone and run `install_modules.sh
-   <https://git.openstack.org/cgit/openstack-infra/system-config/tree/install_modules.sh>`__
-   from OpenStack Infra ``system-config`` repository to populate
+   <https://opendev.org/opendev/system-config/src/branch/master/install_modules.sh>`__
+   from OpenDev ``system-config`` repository to populate
    required puppet modules on the host.
 
diff --git a/tools/puppetmaster_bootstrap.sh b/tools/puppetmaster_bootstrap.sh
index f53d029782..93ffe6b9fa 100755
--- a/tools/puppetmaster_bootstrap.sh
+++ b/tools/puppetmaster_bootstrap.sh
@@ -5,7 +5,7 @@ set -x
 
 apt-get update
 apt-get install git
-git clone https://git.openstack.org/openstack-infra/system-config
+git clone https://opendev.org/opendev/system-config
 
 cd system-config