diff --git a/elements/cinder/source-repository-cinder b/elements/cinder/source-repository-cinder
index adc68bff5..8a90e44a5 100644
--- a/elements/cinder/source-repository-cinder
+++ b/elements/cinder/source-repository-cinder
@@ -1 +1 @@
-cinder git /opt/stack/cinder https://github.com/openstack/cinder.git
+cinder git /opt/stack/cinder https://git.openstack.org/openstack/cinder.git
diff --git a/elements/devstack/source-repository-devstack b/elements/devstack/source-repository-devstack
index aa5f5eab8..aa2f49eee 100644
--- a/elements/devstack/source-repository-devstack
+++ b/elements/devstack/source-repository-devstack
@@ -1 +1 @@
-devstack git /home/stack/devstack https://github.com/openstack-dev/devstack.git
+devstack git /home/stack/devstack https://git.openstack.org/openstack-dev/devstack.git
diff --git a/elements/glance/source-repository-glance b/elements/glance/source-repository-glance
index bf438636f..73f754df3 100644
--- a/elements/glance/source-repository-glance
+++ b/elements/glance/source-repository-glance
@@ -1 +1 @@
-glance git /opt/stack/glance https://github.com/openstack/glance.git
+glance git /opt/stack/glance https://git.openstack.org/openstack/glance.git
diff --git a/elements/heat/source-repository-heat b/elements/heat/source-repository-heat
index 97c351bca..0c7090c97 100644
--- a/elements/heat/source-repository-heat
+++ b/elements/heat/source-repository-heat
@@ -1 +1 @@
-heat git /opt/stack/heat https://github.com/openstack/heat.git
+heat git /opt/stack/heat https://git.openstack.org/openstack/heat.git
diff --git a/elements/keystone/source-repository-keystone b/elements/keystone/source-repository-keystone
index 8c7ba35df..1276b4cd6 100644
--- a/elements/keystone/source-repository-keystone
+++ b/elements/keystone/source-repository-keystone
@@ -1 +1 @@
-keystone git /opt/stack/keystone https://github.com/openstack/keystone.git
+keystone git /opt/stack/keystone https://git.openstack.org/openstack/keystone.git
diff --git a/elements/neutron/source-repository-neutron b/elements/neutron/source-repository-neutron
index 0e2947249..3ac4c135b 100644
--- a/elements/neutron/source-repository-neutron
+++ b/elements/neutron/source-repository-neutron
@@ -1 +1 @@
-neutron git /opt/stack/neutron https://github.com/openstack/neutron.git
+neutron git /opt/stack/neutron https://git.openstack.org/openstack/neutron.git
diff --git a/elements/nova/source-repository-nova b/elements/nova/source-repository-nova
index 95b3698c5..60ce3d32b 100644
--- a/elements/nova/source-repository-nova
+++ b/elements/nova/source-repository-nova
@@ -1 +1 @@
-nova git /opt/stack/nova https://github.com/openstack/nova.git
+nova git /opt/stack/nova https://git.openstack.org/openstack/nova.git
diff --git a/elements/openstack-clients/source-repository-clients b/elements/openstack-clients/source-repository-clients
index 884ba5dd1..44a5f84bb 100644
--- a/elements/openstack-clients/source-repository-clients
+++ b/elements/openstack-clients/source-repository-clients
@@ -1,7 +1,7 @@
-python-glanceclient git /opt/stack/python-glanceclient https://github.com/openstack/python-glanceclient.git
-python-heatclient git /opt/stack/python-heatclient https://github.com/openstack/python-heatclient.git
-python-ironicclient git /opt/stack/python-ironicclient https://github.com/openstack/python-ironicclient.git
-python-keystoneclient git /opt/stack/python-keystoneclient https://github.com/openstack/python-keystoneclient.git
-python-neutronclient git /opt/stack/python-neutronclient https://github.com/openstack/python-neutronclient.git
-python-novaclient git /opt/stack/python-novaclient https://github.com/openstack/python-novaclient.git
-python-swiftclient git /opt/stack/python-swiftclient https://github.com/openstack/python-swiftclient.git
+python-glanceclient git /opt/stack/python-glanceclient https://git.openstack.org/openstack/python-glanceclient.git
+python-heatclient git /opt/stack/python-heatclient https://git.openstack.org/openstack/python-heatclient.git
+python-ironicclient git /opt/stack/python-ironicclient https://git.openstack.org/openstack/python-ironicclient.git
+python-keystoneclient git /opt/stack/python-keystoneclient https://git.openstack.org/openstack/python-keystoneclient.git
+python-neutronclient git /opt/stack/python-neutronclient https://git.openstack.org/openstack/python-neutronclient.git
+python-novaclient git /opt/stack/python-novaclient https://git.openstack.org/openstack/python-novaclient.git
+python-swiftclient git /opt/stack/python-swiftclient https://git.openstack.org/openstack/python-swiftclient.git
diff --git a/elements/openstack-db/source-repository-openstack b/elements/openstack-db/source-repository-openstack
index d4e392a7b..cdb92c42b 100644
--- a/elements/openstack-db/source-repository-openstack
+++ b/elements/openstack-db/source-repository-openstack
@@ -1,5 +1,5 @@
-keystone git /opt/stack/keystone https://github.com/openstack/keystone.git
-cinder git /opt/stack/cinder https://github.com/openstack/cinder.git
-nova git /opt/stack/nova https://github.com/openstack/nova.git
-glance git /opt/stack/glance https://github.com/openstack/glance.git
-neutron git /opt/stack/neutron https://github.com/openstack/neutron.git
+keystone git /opt/stack/keystone https://git.openstack.org/openstack/keystone.git
+cinder git /opt/stack/cinder https://git.openstack.org/openstack/cinder.git
+nova git /opt/stack/nova https://git.openstack.org/openstack/nova.git
+glance git /opt/stack/glance https://git.openstack.org/openstack/glance.git
+neutron git /opt/stack/neutron https://git.openstack.org/openstack/neutron.git
diff --git a/elements/os-collect-config/source-repository-os-collect-config b/elements/os-collect-config/source-repository-os-collect-config
index fd81c091c..bb2abf711 100644
--- a/elements/os-collect-config/source-repository-os-collect-config
+++ b/elements/os-collect-config/source-repository-os-collect-config
@@ -1 +1 @@
-os-collect-config git /opt/stack/os-collect-config https://github.com/openstack/os-collect-config.git
+os-collect-config git /opt/stack/os-collect-config https://git.openstack.org/openstack/os-collect-config.git
diff --git a/elements/os-refresh-config/source-repository-os-refresh-config b/elements/os-refresh-config/source-repository-os-refresh-config
index 9ae2d7ecd..c465aa67d 100644
--- a/elements/os-refresh-config/source-repository-os-refresh-config
+++ b/elements/os-refresh-config/source-repository-os-refresh-config
@@ -1 +1 @@
-os-refresh-config git /opt/stack/os-refresh-config https://github.com/openstack/os-refresh-config.git
+os-refresh-config git /opt/stack/os-refresh-config https://git.openstack.org/openstack/os-refresh-config.git