diff --git a/kubernetes/gitea/sync-repos.yaml b/kubernetes/gitea/sync-repos.yaml
index 22ccaa63e6..836c5666e3 100644
--- a/kubernetes/gitea/sync-repos.yaml
+++ b/kubernetes/gitea/sync-repos.yaml
@@ -6,7 +6,7 @@
   tasks:
     - name: Clone project-config
       git:
-        repo: https://git.openstack.org/openstack-infra/project-config
+        repo: https://opendev.org/openstack/project-config
         dest: "{{ project_config_dest }}"
         version: "{{ project_config_ref }}"
     - name: Get Gerrit project list
diff --git a/modules/openstack_project/files/puppetmaster/zuul_ca.cnf b/modules/openstack_project/files/puppetmaster/zuul_ca.cnf
index 87290fdbdd..bdeaa19ff4 100644
--- a/modules/openstack_project/files/puppetmaster/zuul_ca.cnf
+++ b/modules/openstack_project/files/puppetmaster/zuul_ca.cnf
@@ -1,5 +1,5 @@
 # This file is managed by puppet.
-# https://git.openstack.org/cgit/openstack-infra/system-config
+# https://opendev.org/opendev/system-config
 
 [ca]
 default_ca = CA_default
diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index 34953a88ed..a42e9ce624 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -122,7 +122,7 @@ class openstack_project::ask (
     ensure  => present,
     path    => '/srv/askbot-site/themes',
     branch  => 'master',
-    origin  => 'https://git.openstack.org/openstack-infra/askbot-theme',
+    origin  => 'https://opendev.org/opendev/askbot-theme',
     latest  => true,
     require => [
       File['/srv/askbot-site'], Package['git']
diff --git a/modules/openstack_project/manifests/ask_staging.pp b/modules/openstack_project/manifests/ask_staging.pp
index 389ab7e229..68d8c8824b 100644
--- a/modules/openstack_project/manifests/ask_staging.pp
+++ b/modules/openstack_project/manifests/ask_staging.pp
@@ -114,7 +114,7 @@ class openstack_project::ask_staging (
     ensure  => present,
     path    => '/srv/askbot-site/themes',
     branch  => 'feature/development',
-    origin  => 'https://git.openstack.org/openstack-infra/askbot-theme',
+    origin  => 'https://opendev.org/opendev/askbot-theme',
     latest  => true,
     require => [
       File['/srv/askbot-site'], Package['git']
diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
index 818a28d949..fcdf758e9f 100644
--- a/modules/openstack_project/manifests/groups.pp
+++ b/modules/openstack_project/manifests/groups.pp
@@ -32,7 +32,7 @@ class openstack_project::groups (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/groups-static-pages',
+    source   => 'https://opendev.org/osf/groups-static-pages',
   }
 
   class { 'drupal':
diff --git a/modules/openstack_project/manifests/groups_dev.pp b/modules/openstack_project/manifests/groups_dev.pp
index e1029e0598..c513cfa718 100644
--- a/modules/openstack_project/manifests/groups_dev.pp
+++ b/modules/openstack_project/manifests/groups_dev.pp
@@ -31,7 +31,7 @@ class openstack_project::groups_dev (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/groups-static-pages',
+    source   => 'https://opendev.org/osf/groups-static-pages',
   }
 
   class { 'drupal':
diff --git a/modules/openstack_project/manifests/logstash_worker.pp b/modules/openstack_project/manifests/logstash_worker.pp
index 4377417205..7c7d353ea7 100644
--- a/modules/openstack_project/manifests/logstash_worker.pp
+++ b/modules/openstack_project/manifests/logstash_worker.pp
@@ -17,7 +17,7 @@
 class openstack_project::logstash_worker (
   $discover_node = 'elasticsearch01.openstack.org',
   $filter_rev    = 'master',
-  $filter_source = 'https://git.openstack.org/openstack/logstash-filters',
+  $filter_source = 'https://opendev.org/openstack/logstash-filters',
   $enable_mqtt = true,
   $mqtt_hostname = 'firehose.openstack.org',
   $mqtt_port = 8883,
diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index 45c7d4d79e..d4a30d565c 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -545,7 +545,7 @@ class openstack_project::mirror_update (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/afsmon',
+    source   => 'https://opendev.org/opendev/afsmon',
   }
 
   python::virtualenv { '/usr/afsmon-env':
diff --git a/modules/openstack_project/manifests/planet.pp b/modules/openstack_project/manifests/planet.pp
index 5aa1dd4d41..6766eea147 100644
--- a/modules/openstack_project/manifests/planet.pp
+++ b/modules/openstack_project/manifests/planet.pp
@@ -6,6 +6,6 @@ class openstack_project::planet (
   include ::planet
 
   planet::site { 'openstack':
-    git_url => 'https://git.openstack.org/openstack/openstack-planet',
+    git_url => 'https://opendev.org/openstack/openstack-planet',
   }
 }
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 097b22ca31..4a71481261 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -221,7 +221,7 @@ class openstack_project::static (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/devstack-gate',
+    source   => 'https://opendev.org/openstack/devstack-gate',
   }
 
   file { '/srv/static/logs/help':
@@ -252,7 +252,7 @@ class openstack_project::static (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/tripleo-ci',
+    source   => 'https://opendev.org/openstack/tripleo-ci',
   }
   file { '/srv/static/logs/help/tripleo-quickstart-logs.html':
     ensure  => present,
@@ -450,7 +450,7 @@ class openstack_project::static (
     ensure   => latest,
     provider => git,
     revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/trystack-site',
+    source   => 'https://opendev.org/x/trystack-site',
   }
 
   ###########################################################
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index f619a5a04f..1572bb79c1 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -170,7 +170,7 @@ class openstack_project::status (
   include reviewday
 
   reviewday::site { 'reviewday':
-    git_url                       => 'https://git.openstack.org/openstack-infra/reviewday',
+    git_url                       => 'https://opendev.org/openstack/reviewday',
     serveradmin                   => 'webmaster@openstack.org',
     httproot                      => '/srv/static/reviewday',
     gerrit_url                    => 'review.openstack.org',
@@ -187,7 +187,7 @@ class openstack_project::status (
   include bugdaystats
 
   bugdaystats::site { 'bugdaystats':
-    git_url     => 'https://git.openstack.org/openstack-infra/bugdaystats',
+    git_url     => 'https://opendev.org/openstack/bugdaystats',
     serveradmin => 'webmaster@openstack.org',
     httproot    => '/srv/static/bugdaystats',
     configfile  => '/var/lib/bugdaystats/config.js',
diff --git a/modules/openstack_project/metadata.json b/modules/openstack_project/metadata.json
index 00ebe3a99b..0bd5b3c2c6 100644
--- a/modules/openstack_project/metadata.json
+++ b/modules/openstack_project/metadata.json
@@ -4,7 +4,7 @@
   "author": "Openstack CI",
   "summary": "Puppet module for openstack_project",
   "license": "Apache 2.0",
-  "source": "https://git.openstack.org/openstack-infra/system-config.git",
+  "source": "https://opendev.org/opendev/system-config.git",
   "project_page": "http://docs.openstack.org/infra/system-config/",
   "issues_url": "https://storyboard.openstack.org/#!/project/778",
   "dependencies": []