diff --git a/README.md b/README.md
index 056f9e925..3a60d4855 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ umbrella project.
 Instructions
 ------------
 
-Checkout this source tree and also the diskimage builder
-(https://github.com/openstack/diskimage-builder), export an ELEMENTS\_PATH
-to add elements from this tree, and build any disk images you need.
+Checkout this source tree and also the diskimage builder, export an
+ELEMENTS\_PATH to add elements from this tree, and build any disk images you
+need.
 
 	git clone https://git.openstack.org/openstack/diskimage-builder.git
 	git clone https://git.openstack.org/openstack/tripleo-image-elements.git
diff --git a/elements/apache2/README.md b/elements/apache2/README.md
index ed75f72a9..262f85957 100644
--- a/elements/apache2/README.md
+++ b/elements/apache2/README.md
@@ -10,4 +10,4 @@ The Snakeoil SSL cert can be configured via Heat Metadata. For example:
         snakeoil_key: -----  BEGIN PlaceHolder...
 
 Sample usage shown in nagios3 template at:
-    https://github.com/openstack/tripleo-heat-templates
+    https://git.openstack.org/cgit/openstack/tripleo-heat-templates
diff --git a/elements/glance/os-config-applier/etc/glance/glance-api.conf b/elements/glance/os-config-applier/etc/glance/glance-api.conf
index 58595213c..134fc5522 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-api.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-api.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 {{#glance.verbose}}
diff --git a/elements/glance/os-config-applier/etc/glance/glance-cache.conf b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
index 0e51080f7..e0a86ba36 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-cache.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 {{#glance.verbose}}
diff --git a/elements/glance/os-config-applier/etc/glance/glance-registry.conf b/elements/glance/os-config-applier/etc/glance/glance-registry.conf
index 63a86c744..b2b6bd789 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-registry.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-registry.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 {{#glance.verbose}}
diff --git a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
index 07d0e7c68..0a961dc98 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 {{#glance.verbose}}
diff --git a/elements/nagios3/README.md b/elements/nagios3/README.md
index 75a93f816..6ae4baea0 100644
--- a/elements/nagios3/README.md
+++ b/elements/nagios3/README.md
@@ -20,4 +20,4 @@ can be provided via heat. For example:
         initial_network_split_key: ctlplane
 
 Sample heat template with defaults configured for a boot-stack vm located at:
-  https://github.com/openstack/tripleo-heat-templates
+  https://git.openstack.org/cgit/openstack/tripleo-heat-templates
diff --git a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini b/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
index 74e1640df..e8cc6024d 100644
--- a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
+++ b/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 [DEFAULT]
 state_path = /var/run/neutron
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
diff --git a/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini b/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini
index 9a21b630b..f950de6af 100644
--- a/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini
+++ b/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
diff --git a/elements/neutron/os-apply-config/etc/neutron/neutron.conf b/elements/neutron/os-apply-config/etc/neutron/neutron.conf
index 7d812579a..16be73b27 100644
--- a/elements/neutron/os-apply-config/etc/neutron/neutron.conf
+++ b/elements/neutron/os-apply-config/etc/neutron/neutron.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-##  https://github.com/openstack/diskimage-builder
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 [DEFAULT]
 
diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf
index 7173d69e8..1038d9a0a 100644
--- a/elements/nova/os-apply-config/etc/nova/nova.conf
+++ b/elements/nova/os-apply-config/etc/nova/nova.conf
@@ -2,7 +2,7 @@
 ## This config file was taken directly from the upstream repo, and tweaked just enough to work.
 ## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting.
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
-## https://github.com/openstack/tripleo-image-elements
+##  https://git.openstack.org/cgit/openstack/tripleo-image-elements
 
 
 [DEFAULT]
diff --git a/elements/os-svc-install/README.md b/elements/os-svc-install/README.md
index 5ab412420..a5309fdc7 100644
--- a/elements/os-svc-install/README.md
+++ b/elements/os-svc-install/README.md
@@ -22,8 +22,8 @@ service will not be started automatically nor can it be manually started.
 
 ## example usage
 ```bash
-# clone nova.git from github, and install it and its dependencies to /opt/stack/venvs/nova
-os-svc-install -u nova -r https://github.com/openstack/nova.git
+# clone nova, and install it and its dependencies to /opt/stack/venvs/nova
+os-svc-install -u nova -r git://git.openstack.org/openstack/nova.git
 
 # install a system-start script for nova-api
 os-svc-daemon -e 'foo=bar bar=baz' -n nova-api -u nova -c /opt/stack/venvs/nova/bin/nova-api -- --config-dir /etc/nova