diff --git a/doc/openstack-ops/ch_arch_provision.xml b/doc/openstack-ops/ch_arch_provision.xml
index ccbbb02c..6309baf4 100644
--- a/doc/openstack-ops/ch_arch_provision.xml
+++ b/doc/openstack-ops/ch_arch_provision.xml
@@ -282,7 +282,7 @@
     xlink:href="https://wiki.openstack.org/wiki/Puppet">Puppet OpenStack
     </link>. Chef configuration management is provided within <link
     role="orm:hideurl:ital"
-    xlink:href="https://github.com/openstack/openstack-chef-repo"></link>.
+    xlink:href="https://git.openstack.org/cgit/openstack/openstack-chef-repo"></link>.
     Additional configuration management systems include Juju, Ansible, and
     Salt. Also, PackStack is a command-line utility for Red Hat Enterprise
     Linux and derivatives that uses Puppet modules to support rapid deployment
diff --git a/doc/openstack-ops/ch_ops_customize.xml b/doc/openstack-ops/ch_ops_customize.xml
index 8e92d805..0877f609 100644
--- a/doc/openstack-ops/ch_ops_customize.xml
+++ b/doc/openstack-ops/ch_ops_customize.xml
@@ -712,7 +712,7 @@ proxy-server IP my.local.ip.address denied access to Account=AUTH_... \
     the same functionality. They can use your code, provide feedback, and
     possibly contribute. If enough support exists for it, perhaps you can
     propose that it be added to the official swift <link
-    xlink:href="https://github.com/openstack/swift/tree/master/swift/common/middleware">middleware</link>.</para>
+    xlink:href="https://git.openstack.org/cgit/openstack/swift/tree/swift/common/middleware">middleware</link>.</para>
   </section>
 
   <section xml:id="nova_scheduler_example">
@@ -1127,7 +1127,7 @@ _schedule /opt/stack/nova/nova/scheduler/ip_scheduler.py:76</computeroutput></sc
     the same functionality. They can use your code, provide feedback, and
     possibly contribute. If enough support exists for it, perhaps you can
     propose that it be added to the official Compute <link
-    xlink:href="https://github.com/openstack/nova/tree/master/nova/scheduler">schedulers</link>.</para>
+    xlink:href="https://git.openstack.org/cgit/openstack/nova/tree/nova/scheduler">schedulers</link>.</para>
   </section>
 
   <section xml:id="ops_dashboard">
diff --git a/doc/openstack-ops/ch_ops_lay_of_land.xml b/doc/openstack-ops/ch_ops_lay_of_land.xml
index 79f8c728..e044c75b 100644
--- a/doc/openstack-ops/ch_ops_lay_of_land.xml
+++ b/doc/openstack-ops/ch_ops_lay_of_land.xml
@@ -140,7 +140,7 @@
       example:</para>
 
       <programlisting><?db-font-size 60%?># pip install -e \
-  git+https://github.com/openstack/python-novaclient.git#egg=python-novaclient</programlisting>
+  git+https://git.openstack.org/openstack/python-novaclient#egg=python-novaclient</programlisting>
 
       <para>If you support the EC2 API on your cloud, you should also install
       the euca2ools package or some other EC2 API tool so that you can get the
diff --git a/doc/openstack-ops/ch_ops_log_monitor.xml b/doc/openstack-ops/ch_ops_log_monitor.xml
index 6228b78f..ead6b046 100644
--- a/doc/openstack-ops/ch_ops_log_monitor.xml
+++ b/doc/openstack-ops/ch_ops_log_monitor.xml
@@ -652,7 +652,7 @@ notification_driver=messagingv2</programlisting>
       <para>Once <code>nova</code> is sending notifications, install and
       configure StackTach. Since StackTach is relatively new and constantly
       changing, installation instructions would quickly become outdated. Please
-      refer to the <link xlink:href="https://github.com/openstack/stacktach">StackTach GitHub
+      refer to the <link xlink:href="https://git.openstack.org/cgit//openstack/stacktach">StackTach Git
       repo</link> for instructions as well as a demo video. Additional details on the latest
       developments can be discovered at the
       <link xlink:href="http://stacktach.com/">official page</link></para>
diff --git a/doc/openstack-ops/ch_ops_upstream.xml b/doc/openstack-ops/ch_ops_upstream.xml
index 5faaaa9f..90018412 100644
--- a/doc/openstack-ops/ch_ops_upstream.xml
+++ b/doc/openstack-ops/ch_ops_upstream.xml
@@ -420,10 +420,10 @@
 
     <para>Just like the code, <link
     xlink:href="http://docs.openstack.org"></link> is updated constantly using
-    the Gerrit review system, with source stored in GitHub in the <link
-    xlink:href="https://github.com/openstack/openstack-manuals/">openstack-manuals repository</link>
-    and the <link xlink:href="https://github.com/openstack/api-site/">api-site
-    repository</link>, in DocBook format.</para>
+    the Gerrit review system, with source stored in git.openstack.org in the <link
+    xlink:href="https://git.openstack.org/cgit/openstack/openstack-manuals/">openstack-manuals repository</link>
+    and the <link xlink:href="https://git.openstack.org/cgit/openstack/api-site/">api-site
+    repository</link>.</para>
 
     <para>To review the documentation before it's published, go to the
     OpenStack Gerrit server at&#160;<link