diff --git a/elements/ceilometer/source-repository-ceilometer b/elements/ceilometer/source-repository-ceilometer
index 398f0caa6..8264c9497 100644
--- a/elements/ceilometer/source-repository-ceilometer
+++ b/elements/ceilometer/source-repository-ceilometer
@@ -1 +1 @@
-ceilometer git /opt/stack/ceilometer https://git.openstack.org/cgit/openstack/ceilometer
+ceilometer git /opt/stack/ceilometer https://git.openstack.org/openstack/ceilometer
diff --git a/elements/horizon/source-repository-horizon b/elements/horizon/source-repository-horizon
index ec4bb840f..6b974d23b 100644
--- a/elements/horizon/source-repository-horizon
+++ b/elements/horizon/source-repository-horizon
@@ -1 +1 @@
-horizon git /opt/stack/horizon https://git.openstack.org/cgit/openstack/horizon
+horizon git /opt/stack/horizon https://git.openstack.org/openstack/horizon
diff --git a/elements/ironic/source-repository-ironic b/elements/ironic/source-repository-ironic
index cad0d9405..75b8f9c33 100644
--- a/elements/ironic/source-repository-ironic
+++ b/elements/ironic/source-repository-ironic
@@ -1 +1 @@
-ironic git /opt/stack/ironic https://git.openstack.org/cgit/openstack/ironic
+ironic git /opt/stack/ironic https://git.openstack.org/openstack/ironic
diff --git a/elements/pypi-mirror/source-repository-pypi-mirror b/elements/pypi-mirror/source-repository-pypi-mirror
index 7185370d4..bf1aac41f 100644
--- a/elements/pypi-mirror/source-repository-pypi-mirror
+++ b/elements/pypi-mirror/source-repository-pypi-mirror
@@ -1 +1 @@
-pypi-mirror git /opt/stack/pypi-mirror https://git.openstack.org/cgit/openstack-infra/pypi-mirror
+pypi-mirror git /opt/stack/pypi-mirror https://git.openstack.org/openstack-infra/pypi-mirror
diff --git a/elements/swift/source-repository-swift b/elements/swift/source-repository-swift
index 6ff606fe7..913510def 100644
--- a/elements/swift/source-repository-swift
+++ b/elements/swift/source-repository-swift
@@ -1 +1 @@
-swift git /opt/stack/swift https://git.openstack.org/cgit/openstack/swift
+swift git /opt/stack/swift https://git.openstack.org/openstack/swift
diff --git a/elements/tempest/source-repository-tempest b/elements/tempest/source-repository-tempest
index ce34d522f..06c03445f 100644
--- a/elements/tempest/source-repository-tempest
+++ b/elements/tempest/source-repository-tempest
@@ -1 +1 @@
-tempest git /opt/stack/tempest https://git.openstack.org/cgit/openstack/tempest
+tempest git /opt/stack/tempest https://git.openstack.org/openstack/tempest
diff --git a/elements/tripleo-heat-templates/source-repository-tripleo-heat-templates b/elements/tripleo-heat-templates/source-repository-tripleo-heat-templates
index 6129020cf..ea2982d40 100644
--- a/elements/tripleo-heat-templates/source-repository-tripleo-heat-templates
+++ b/elements/tripleo-heat-templates/source-repository-tripleo-heat-templates
@@ -1 +1 @@
-tripleo-heat-templates git /opt/stack/tripleo-heat-templates https://git.openstack.org/cgit/openstack/tripleo-heat-templates
+tripleo-heat-templates git /opt/stack/tripleo-heat-templates https://git.openstack.org/openstack/tripleo-heat-templates
diff --git a/elements/tuskar/source-repository-tuskar b/elements/tuskar/source-repository-tuskar
index 5c1465762..1347cf485 100644
--- a/elements/tuskar/source-repository-tuskar
+++ b/elements/tuskar/source-repository-tuskar
@@ -1,2 +1,2 @@
-tuskar git /opt/stack/tuskar https://git.openstack.org/cgit/openstack/tuskar
-tuskar-templates git /opt/stack/tuskar/etc/tuskar/tripleo-heat-templates https://git.openstack.org/cgit/openstack/tripleo-heat-templates
+tuskar git /opt/stack/tuskar https://git.openstack.org/openstack/tuskar
+tuskar-templates git /opt/stack/tuskar/etc/tuskar/tripleo-heat-templates https://git.openstack.org/openstack/tripleo-heat-templates