diff --git a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2 b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
index 5528cf7c4..bb081ee02 100644
--- a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
+++ b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'barbican-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/barbican-tempest-plugin/barbican-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/barbican-tempest-plugin/barbican-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/barbican/barbican.spec.j2 b/openstack/barbican/barbican.spec.j2
index 311cb4278..a5f158dba 100644
--- a/openstack/barbican/barbican.spec.j2
+++ b/openstack/barbican/barbican.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'barbican' %}
-{% set source = fetch_source('https://tarballs.openstack.org/barbican/barbican-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/barbican/barbican-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2 b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
index 968a4235b..47deb7807 100644
--- a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
+++ b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'cinder-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/cinder-tempest-plugin/cinder-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/cinder-tempest-plugin/cinder-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/cinder/cinder.spec.j2 b/openstack/cinder/cinder.spec.j2
index 362cc0693..f61b024fa 100644
--- a/openstack/cinder/cinder.spec.j2
+++ b/openstack/cinder/cinder.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'cinder' %}
-{% set source = fetch_source('https://tarballs.openstack.org/cinder/cinder-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/cinder/cinder-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/cyborg/cyborg.spec.j2 b/openstack/cyborg/cyborg.spec.j2
index 29e716524..f4ca26903 100644
--- a/openstack/cyborg/cyborg.spec.j2
+++ b/openstack/cyborg/cyborg.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'cyborg' %}
-{% set source = fetch_source('https://tarballs.openstack.org/cyborg/cyborg-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/cyborg/cyborg-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2 b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
index 533d6626a..061e43069 100644
--- a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
+++ b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
@@ -1,6 +1,6 @@
 {% set pypi_name = 'designate-tempest-plugin' %}
 {% set rpm_release = '1' %}
-{% set source = fetch_source('https://tarballs.openstack.org/designate-tempest-plugin/designate-tempest-plugin-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/designate-tempest-plugin/designate-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 
 Name:          {{ py2name(py_versions='py3') }}
diff --git a/openstack/designate/designate.spec.j2 b/openstack/designate/designate.spec.j2
index eab9c4962..cad178efa 100644
--- a/openstack/designate/designate.spec.j2
+++ b/openstack/designate/designate.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'designate' %}
-{% set source = fetch_source('https://tarballs.openstack.org/designate/designate-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/designate/designate-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/freezer-api/freezer-api.spec.j2 b/openstack/freezer-api/freezer-api.spec.j2
index 6e08d6331..e82c57ffa 100644
--- a/openstack/freezer-api/freezer-api.spec.j2
+++ b/openstack/freezer-api/freezer-api.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'freezer-api' %}
-{% set source = fetch_source('https://tarballs.openstack.org/freezer-api/freezer-api-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/freezer-api/freezer-api-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 b/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
index 521798321..45c20bc2d 100644
--- a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
+++ b/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
@@ -1,6 +1,6 @@
 {% set pypi_name = 'freezer-tempest-plugin' %}
 {% set rpm_release = '1' %}
-{% set source=fetch_source('https://tarballs.openstack.org/freezer-tempest-plugin/freezer-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/freezer-tempest-plugin/freezer-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 
 %global sname freezer_tempest_plugin
diff --git a/openstack/freezer-web-ui/freezer-web-ui.spec.j2 b/openstack/freezer-web-ui/freezer-web-ui.spec.j2
index 4347e7b4e..52cd0ecf2 100644
--- a/openstack/freezer-web-ui/freezer-web-ui.spec.j2
+++ b/openstack/freezer-web-ui/freezer-web-ui.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'freezer-web-ui' %}
-{% set source = fetch_source('https://tarballs.openstack.org/freezer-web-ui/freezer-web-ui-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/freezer-web-ui/freezer-web-ui-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/freezer/freezer.spec.j2 b/openstack/freezer/freezer.spec.j2
index 14777c624..2ef94d0d3 100644
--- a/openstack/freezer/freezer.spec.j2
+++ b/openstack/freezer/freezer.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'freezer' %}
-{% set source = fetch_source('https://tarballs.openstack.org/freezer/freezer-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/freezer/freezer-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/openstack/glance/glance.spec.j2 b/openstack/glance/glance.spec.j2
index 83244aee9..5de803076 100644
--- a/openstack/glance/glance.spec.j2
+++ b/openstack/glance/glance.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'glance' %}
-{% set source = fetch_source('https://tarballs.openstack.org/glance/glance-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/glance/glance-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/heat-dashboard/heat-dashboard.spec.j2 b/openstack/heat-dashboard/heat-dashboard.spec.j2
index 604b612ae..58381aa9d 100644
--- a/openstack/heat-dashboard/heat-dashboard.spec.j2
+++ b/openstack/heat-dashboard/heat-dashboard.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'heat-dashboard' %}
-{% set source = fetch_source("https://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz") %}
+{% set source = fetch_source("https://tarballs.opendev.org/openstack/heat-dashboard/heat-dashboard-master.tar.gz") %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 b/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
index 30510ad4e..3fc7093fd 100644
--- a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
+++ b/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'heat-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/heat-tempest-plugin/heat-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/heat-tempest-plugin/heat-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/heat/heat.spec.j2 b/openstack/heat/heat.spec.j2
index 72d856b10..bd0267dbc 100644
--- a/openstack/heat/heat.spec.j2
+++ b/openstack/heat/heat.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'heat' %}
-{% set source = fetch_source('https://tarballs.openstack.org/heat/heat-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/heat/heat-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/horizon/horizon.spec.j2 b/openstack/horizon/horizon.spec.j2
index 9b17635f8..85aa7af8c 100644
--- a/openstack/horizon/horizon.spec.j2
+++ b/openstack/horizon/horizon.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'horizon' %}
-{% set source = fetch_source('https://tarballs.openstack.org/horizon/horizon-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/horizon/horizon-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/ironic-inspector/ironic-inspector.spec.j2 b/openstack/ironic-inspector/ironic-inspector.spec.j2
index 72d6095be..1711f0fe5 100644
--- a/openstack/ironic-inspector/ironic-inspector.spec.j2
+++ b/openstack/ironic-inspector/ironic-inspector.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'ironic-inspector' %}
-{% set source = fetch_source('https://tarballs.openstack.org/ironic-inspector/ironic-inspector-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/ironic-inspector/ironic-inspector-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/ironic-python-agent/ironic-python-agent.spec.j2 b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
index 3d1d374be..e71134ac3 100644
--- a/openstack/ironic-python-agent/ironic-python-agent.spec.j2
+++ b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'ironic-python-agent' %}
-{% set source = fetch_source('https://tarballs.openstack.org/ironic-python-agent/ironic-python-agent-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/ironic-python-agent/ironic-python-agent-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 b/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
index bb7771ede..2906c20ca 100644
--- a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
+++ b/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'ironic-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/ironic-tempest-plugin/ironic-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/ironic-tempest-plugin/ironic-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/ironic/ironic.spec.j2 b/openstack/ironic/ironic.spec.j2
index 3150e7582..9493ac512 100644
--- a/openstack/ironic/ironic.spec.j2
+++ b/openstack/ironic/ironic.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'ironic' %}
-{% set source = fetch_source('https://tarballs.openstack.org/ironic/ironic-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/ironic/ironic-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 b/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
index 9e2737047..35e7b1351 100644
--- a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
+++ b/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'keystone-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/keystone-tempest-plugin/keystone-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/keystone-tempest-plugin/keystone-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/keystone/keystone.spec.j2 b/openstack/keystone/keystone.spec.j2
index 0c2077de4..e6f2d82ab 100644
--- a/openstack/keystone/keystone.spec.j2
+++ b/openstack/keystone/keystone.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'keystone' %}
-{% set source = fetch_source('https://tarballs.openstack.org/keystone/keystone-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/keystone/keystone-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
index 1c6e27fc0..5a97b1368 100644
--- a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
+++ b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'magnum-tempest-plugin' %}
-{% set source = fetch_source('https://tarballs.openstack.org/magnum-tempest-plugin/magnum-tempest-plugin-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/magnum-tempest-plugin/magnum-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/magnum-ui/magnum-ui.spec.j2 b/openstack/magnum-ui/magnum-ui.spec.j2
index 9d6ca6d46..4ee4277e4 100644
--- a/openstack/magnum-ui/magnum-ui.spec.j2
+++ b/openstack/magnum-ui/magnum-ui.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'magnum-ui' %}
-{% set source = fetch_source('https://tarballs.openstack.org/magnum-ui/magnum-ui-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/magnum-ui/magnum-ui-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/magnum/magnum.spec.j2 b/openstack/magnum/magnum.spec.j2
index 8118b3db8..091872355 100644
--- a/openstack/magnum/magnum.spec.j2
+++ b/openstack/magnum/magnum.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'magnum' %}
-{% set source = fetch_source('https://tarballs.openstack.org/magnum/magnum-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/magnum/magnum-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 b/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
index 2a41133d0..50c1ed77c 100644
--- a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
+++ b/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2
@@ -1,6 +1,6 @@
 {% set pypi_name = 'manila-tempest-plugin' %}
 {% set rpm_release = '1' %}
-{% set source=fetch_source('https://tarballs.openstack.org/manila-tempest-plugin/manila-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/manila-tempest-plugin/manila-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 
 Name:          {{ py2name(py_versions='py3') }}
diff --git a/openstack/manila/manila.spec.j2 b/openstack/manila/manila.spec.j2
index 4fddbc81f..7fbd640f4 100644
--- a/openstack/manila/manila.spec.j2
+++ b/openstack/manila/manila.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'manila' %}
-{% set source = fetch_source('https://tarballs.openstack.org/manila/manila-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/manila/manila-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/masakari-monitors/masakari-monitors.spec.j2 b/openstack/masakari-monitors/masakari-monitors.spec.j2
index 64eeb977d..64675a66c 100644
--- a/openstack/masakari-monitors/masakari-monitors.spec.j2
+++ b/openstack/masakari-monitors/masakari-monitors.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'masakari-monitors' %}
-{% set source = fetch_source('https://tarballs.openstack.org/masakari-monitors/masakari-monitors-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/masakari-monitors/masakari-monitors-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/masakari/masakari.spec.j2 b/openstack/masakari/masakari.spec.j2
index ad65f4d7a..04dbb68c8 100644
--- a/openstack/masakari/masakari.spec.j2
+++ b/openstack/masakari/masakari.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'masakari' %}
-{% set source = fetch_source('https://tarballs.openstack.org/masakari/masakari-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/masakari/masakari-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/mistral/mistral.spec.j2 b/openstack/mistral/mistral.spec.j2
index 8f28867d4..6ca0477e2 100644
--- a/openstack/mistral/mistral.spec.j2
+++ b/openstack/mistral/mistral.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'mistral' %}
-{% set source = fetch_source('https://tarballs.openstack.org/mistral/mistral-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/mistral/mistral-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/openstack/monasca-agent/monasca-agent.spec.j2 b/openstack/monasca-agent/monasca-agent.spec.j2
index c2d3e6c5b..ca903d29f 100644
--- a/openstack/monasca-agent/monasca-agent.spec.j2
+++ b/openstack/monasca-agent/monasca-agent.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-agent' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-agent/monasca-agent-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-agent/monasca-agent-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-api/monasca-api.spec.j2 b/openstack/monasca-api/monasca-api.spec.j2
index 07e651168..5e3f39f26 100644
--- a/openstack/monasca-api/monasca-api.spec.j2
+++ b/openstack/monasca-api/monasca-api.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-api' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-api/monasca-api-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-api/monasca-api-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-common/monasca-common.spec.j2 b/openstack/monasca-common/monasca-common.spec.j2
index 2451a5a00..2f2f4099c 100644
--- a/openstack/monasca-common/monasca-common.spec.j2
+++ b/openstack/monasca-common/monasca-common.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-common' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-common/monasca-common-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-common/monasca-common-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-notification/monasca-notification.spec.j2 b/openstack/monasca-notification/monasca-notification.spec.j2
index 9b801a06c..8cc00180b 100644
--- a/openstack/monasca-notification/monasca-notification.spec.j2
+++ b/openstack/monasca-notification/monasca-notification.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-notification' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-notification/monasca-notification-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-notification/monasca-notification-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-persister/monasca-persister.spec.j2 b/openstack/monasca-persister/monasca-persister.spec.j2
index 75980e7e8..316a92793 100644
--- a/openstack/monasca-persister/monasca-persister.spec.j2
+++ b/openstack/monasca-persister/monasca-persister.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-persister' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-persister/monasca-persister-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-persister/monasca-persister-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 b/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
index 16bc929d4..dd3cc69d7 100644
--- a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
+++ b/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/monasca-tempest-plugin/monasca-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/monasca-tempest-plugin/monasca-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/monasca-ui/monasca-ui.spec.j2 b/openstack/monasca-ui/monasca-ui.spec.j2
index 577c46f53..74eb00994 100644
--- a/openstack/monasca-ui/monasca-ui.spec.j2
+++ b/openstack/monasca-ui/monasca-ui.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-ui' %}
-{% set source = fetch_source('https://tarballs.openstack.org/monasca-ui/monasca-ui-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/monasca-ui/monasca-ui-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/networking-generic-switch/networking-generic-switch.spec.j2 b/openstack/networking-generic-switch/networking-generic-switch.spec.j2
index 3a64df089..61be652c3 100644
--- a/openstack/networking-generic-switch/networking-generic-switch.spec.j2
+++ b/openstack/networking-generic-switch/networking-generic-switch.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'networking-generic-switch' %}
-{% set source = fetch_source('https://tarballs.openstack.org/networking-generic-switch/networking-generic-switch-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/networking-generic-switch/networking-generic-switch-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '0' %}
 Name:           {{ py2name(py_versions='py3') }}
diff --git a/openstack/neutron-dynamic-routing/neutron-dynamic-routing.spec.j2 b/openstack/neutron-dynamic-routing/neutron-dynamic-routing.spec.j2
index b8ad3d34b..9dd5d7ff6 100644
--- a/openstack/neutron-dynamic-routing/neutron-dynamic-routing.spec.j2
+++ b/openstack/neutron-dynamic-routing/neutron-dynamic-routing.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'neutron-dynamic-routing' %}
-{% set source = fetch_source('https://tarballs.openstack.org/neutron-dynamic-routing/neutron-dynamic-routing-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/neutron-dynamic-routing/neutron-dynamic-routing-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 Name:           {{ py2name() }}
diff --git a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 b/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
index 98c124a3a..4f4981e0a 100644
--- a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
+++ b/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'neutron-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/neutron-tempest-plugin/neutron-tempest-plugin-master.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/neutron-tempest-plugin/neutron-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2
index 4ae417c70..c0d66f97a 100644
--- a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2
+++ b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'neutron-vpnaas-dashboard' %}
-{% set source = fetch_source('https://tarballs.openstack.org/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 b/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2
index 0d7952e8e..3e338d6b4 100644
--- a/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2
+++ b/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'neutron-vpnaas' %}
-{% set source = fetch_source('https://tarballs.openstack.org/neutron-vpnaas/neutron-vpnaas-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/neutron-vpnaas/neutron-vpnaas-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 Name:           {{ py2name() }}
diff --git a/openstack/neutron/neutron.spec.j2 b/openstack/neutron/neutron.spec.j2
index 64a1b4e6f..5b84229d0 100644
--- a/openstack/neutron/neutron.spec.j2
+++ b/openstack/neutron/neutron.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'neutron' %}
-{% set source = fetch_source('https://tarballs.openstack.org/neutron/neutron-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/neutron/neutron-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2
index 8590ce033..fe7f26700 100644
--- a/openstack/nova/nova.spec.j2
+++ b/openstack/nova/nova.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'nova' %}
-{% set source = fetch_source('https://tarballs.openstack.org/nova/nova-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/nova/nova-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1
diff --git a/openstack/octavia-dashboard/octavia-dashboard.spec.j2 b/openstack/octavia-dashboard/octavia-dashboard.spec.j2
index 9efdf7778..be01d8bc4 100644
--- a/openstack/octavia-dashboard/octavia-dashboard.spec.j2
+++ b/openstack/octavia-dashboard/octavia-dashboard.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'octavia-dashboard' %}
-{% set source = fetch_source("https://tarballs.openstack.org/octavia-dashboard/octavia-dashboard-master.tar.gz") %}
+{% set source = fetch_source("https://tarballs.opendev.org/openstack/octavia-dashboard/octavia-dashboard-master.tar.gz") %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 b/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2
index afabc423c..537e3d4c2 100644
--- a/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2
+++ b/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'octavia-tempest-plugin' %}
-{% set source=fetch_source('https://tarballs.openstack.org/octavia-tempest-plugin/octavia-tempest-plugin-2.1.0.tar.gz') %}
+{% set source=fetch_source('https://tarballs.opendev.org/openstack/octavia-tempest-plugin/octavia-tempest-plugin-2.1.0.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/octavia/octavia.spec.j2 b/openstack/octavia/octavia.spec.j2
index 9a683fdd7..3e8eea4af 100644
--- a/openstack/octavia/octavia.spec.j2
+++ b/openstack/octavia/octavia.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'octavia' %}
-{% set source = fetch_source('https://tarballs.openstack.org/octavia/octavia-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/octavia/octavia-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/openstack/openstack-placement/openstack-placement.spec.j2 b/openstack/openstack-placement/openstack-placement.spec.j2
index 912de889f..49db81cdb 100644
--- a/openstack/openstack-placement/openstack-placement.spec.j2
+++ b/openstack/openstack-placement/openstack-placement.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'placement' %}
-{% set source = fetch_source('https://tarballs.openstack.org/placement/placement-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/placement/placement-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set pypi_name = 'openstack-placement' %}
 {% set rpm_release = '1' %}
diff --git a/openstack/stackviz/stackviz.spec.j2 b/openstack/stackviz/stackviz.spec.j2
index 3d5b250d2..8931555cb 100644
--- a/openstack/stackviz/stackviz.spec.j2
+++ b/openstack/stackviz/stackviz.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'stackviz' %}
-{% set source = fetch_source('https://tarballs.openstack.org/stackviz/stackviz-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/stackviz/stackviz-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global common_desc \
diff --git a/openstack/swift/swift.spec.j2 b/openstack/swift/swift.spec.j2
index 616f4344a..4848a2c0b 100644
--- a/openstack/swift/swift.spec.j2
+++ b/openstack/swift/swift.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'swift' %}
-{% set source = fetch_source('https://tarballs.openstack.org/swift/swift-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/swift/swift-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %define groupname {{ pypi_name }}
diff --git a/openstack/telemetry-tempest-plugin/telemetry-tempest-plugin.spec.j2 b/openstack/telemetry-tempest-plugin/telemetry-tempest-plugin.spec.j2
index cbdc39693..4c7c7c84a 100644
--- a/openstack/telemetry-tempest-plugin/telemetry-tempest-plugin.spec.j2
+++ b/openstack/telemetry-tempest-plugin/telemetry-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'telemetry_tempest_plugin' %}
-{% set source = fetch_source('https://tarballs.openstack.org/telemetry-tempest-plugin/telemetry_tempest_plugin-1.1.0.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/telemetry-tempest-plugin/telemetry_tempest_plugin-1.1.0.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/watcher/watcher.spec.j2 b/openstack/watcher/watcher.spec.j2
index 4921507ed..4457e3fdd 100644
--- a/openstack/watcher/watcher.spec.j2
+++ b/openstack/watcher/watcher.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'watcher' %}
-{% set source = fetch_source("https://tarballs.openstack.org/watcher/watcher-master.tar.gz") %}
+{% set source = fetch_source("https://tarballs.opendev.org/openstack/watcher/watcher-master.tar.gz") %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2 b/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
index bd697de20..8e9691fd6 100644
--- a/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
+++ b/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'zaqar-tempest-plugin' %}
-{% set source = fetch_source('https://tarballs.openstack.org/zaqar-tempest-plugin/zaqar-tempest-plugin-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/zaqar-tempest-plugin/zaqar-tempest-plugin-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 
diff --git a/openstack/zaqar/zaqar.spec.j2 b/openstack/zaqar/zaqar.spec.j2
index 35654a0af..d841bbb99 100644
--- a/openstack/zaqar/zaqar.spec.j2
+++ b/openstack/zaqar/zaqar.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'zaqar' %}
-{% set source = fetch_source('https://tarballs.openstack.org/zaqar/zaqar-master.tar.gz') %}
+{% set source = fetch_source('https://tarballs.opendev.org/openstack/zaqar/zaqar-master.tar.gz') %}
 {% set upstream_version = upstream_version() %}
 {% set rpm_release = '1' %}
 %global with_doc 1