diff --git a/doc/source/assets/css/local.css b/doc/source/assets/css/local.css
index 5c703af..c8667c4 100644
--- a/doc/source/assets/css/local.css
+++ b/doc/source/assets/css/local.css
@@ -71,7 +71,7 @@
 	margin-bottom: 14px;
 }
 
-li#github {
+li#git {
 	background-position: left -70px !important;
 	height: 61px;
 	padding: ;
@@ -119,4 +119,4 @@
 
 .wat {
 	margin-top: 33px;
-}
\ No newline at end of file
+}
diff --git a/doc/source/assets/images/quickstart.png b/doc/source/assets/images/quickstart.png
index 5400a6f..735617b 100644
--- a/doc/source/assets/images/quickstart.png
+++ b/doc/source/assets/images/quickstart.png
Binary files differ
diff --git a/doc/source/changes.html b/doc/source/changes.html
index 966b0c9..028e1cf 100644
--- a/doc/source/changes.html
+++ b/doc/source/changes.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/configuration.html b/doc/source/configuration.html
index 044bafc..88d7476 100644
--- a/doc/source/configuration.html
+++ b/doc/source/configuration.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/contributing.html b/doc/source/contributing.html
index f3d4b5a..9826fc7 100644
--- a/doc/source/contributing.html
+++ b/doc/source/contributing.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -52,7 +52,7 @@
           <h3>Things To Know</h3>
 
           <br /><strong>Where Things Are</strong>
-          <p>The official DevStack repository is located at <code>git://github.com/openstack-dev/devstack.git</code> and <code>git://git.openstack.org/openstack-dev/devstack.git</code>, both mirrors of the official repo maintained by Gerrit.</p>
+          <p>The official DevStack repository is located at <code>git://git.openstack.org/openstack-dev/devstack.git</code>, replicated from the repo maintained by Gerrit. GitHub also has a mirror at <code>git://github.com/openstack-dev/devstack.git</code>.</p>
           <p>The <a href="https://blueprints.launchpad.net/devstack">blueprint</a> and <a href="https://bugs.launchpad.net/devstack">bug trackers</a> are on Launchpad.  It should be noted that DevStack generally does not use these as strongly as other projects, but we're trying to change that.</p>
           <p>The <a href="https://review.openstack.org/#/q/project:openstack-dev/devstack,n,z">Gerrit review queue</a> is, however, used for all commits except for the text of this website.  That should also change in the near future.</p>
 
diff --git a/doc/source/eucarc.html b/doc/source/eucarc.html
index df52972..1dd8096 100644
--- a/doc/source/eucarc.html
+++ b/doc/source/eucarc.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/exerciserc.html b/doc/source/exerciserc.html
index 7e4dd54..313b0a1 100644
--- a/doc/source/exerciserc.html
+++ b/doc/source/exerciserc.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/faq.html b/doc/source/faq.html
index 2c74a66..7cbb9d2 100644
--- a/doc/source/faq.html
+++ b/doc/source/faq.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -73,7 +73,7 @@
             <dd>A: DevStack is optimized for documentation &amp; developers.  As some of us use <a href="https://github.com/dellcloudedge/crowbar">Crowbar</a> for production deployments, we hope developers documenting how they setup systems for new features supports projects like Crowbar.</dd>
 
             <dt>Q: I'd like to help!</dt>
-            <dd>A: That isn't a question, but please do!  The source for DevStack is <a href="http://github.com/openstack-dev/devstack">github</a> and bug reports go to <a href="http://bugs.launchpad.net/devstack/">LaunchPad</a>.  Contributions follow the usual process as described in the <a href="http://wiki.openstack.org/HowToContribute">OpenStack wiki</a> even though DevStack is not an official OpenStack project.  This site is housed in the CloudBuilder's <a href="http://github.com/cloudbuilders/devstack">github</a> in the gh-pages branch.</dd>
+            <dd>A: That isn't a question, but please do!  The source for DevStack is at <a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a> and bug reports go to <a href="http://bugs.launchpad.net/devstack/">LaunchPad</a>.  Contributions follow the usual process as described in the <a href="http://wiki.openstack.org/HowToContribute">OpenStack wiki</a> even though DevStack is not an official OpenStack project.  This site is housed in the CloudBuilder's <a href="http://github.com/cloudbuilders/devstack">github</a> in the gh-pages branch.</dd>
 
             <dt>Q: Why not use packages?</dt>
             <dd>A: Unlike packages, DevStack leaves your cloud ready to develop - checkouts of the code and services running in screen. However, many people are doing the hard work of packaging and recipes for production deployments.  We hope this script serves as a way to communicate configuration changes between developers and packagers.</dd>
diff --git a/doc/source/guides/multinode-lab.html b/doc/source/guides/multinode-lab.html
index 62232ef..6a5f98c 100644
--- a/doc/source/guides/multinode-lab.html
+++ b/doc/source/guides/multinode-lab.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -129,8 +129,8 @@
 echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyYjfgyPazTvGpd8OaAvtU2utL8W6gWC4JdRS1J95GhNNfQd657yO6s1AH5KYQWktcE6FO/xNUC2reEXSGC7ezy+sGO1kj9Limv5vrvNHvF1+wts0Cmyx61D2nQw35/Qz8BvpdJANL7VwP/cFI/p3yhvx2lsnjFE3hN8xRB2LtLUopUSVdBwACOVUmH2G+2BWMJDjVINd2DPqRIA4Zhy09KJ3O1Joabr0XpQL0yt/I9x8BVHdAx6l9U0tMg9dj5+tAjZvMAFfye3PJcYwwsfJoFxC8w/SLtqlFX7Ehw++8RtvomvuipLdmWCy+T9hIkl+gHYE4cS3OIqXH7f49jdJf jesse@spacey.local" > ~/.ssh/authorized_keys</pre>
 
         <h3>Download DevStack</h3>
-        <p>Grab the latest version of DevStack from github:</p>
-        <pre>git clone https://github.com/openstack-dev/devstack.git
+        <p>Grab the latest version of DevStack:</p>
+        <pre>git clone https://git.openstack.org/openstack-dev/devstack
 cd devstack</pre>
 
         <p>Up to this point all of the steps apply to each node in the cluster.  From here on
diff --git a/doc/source/guides/pxe-boot.html b/doc/source/guides/pxe-boot.html
index 4dc61a3..d52b25f 100644
--- a/doc/source/guides/pxe-boot.html
+++ b/doc/source/guides/pxe-boot.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/guides/ramdisk.html b/doc/source/guides/ramdisk.html
index eaef16e..23239e2 100644
--- a/doc/source/guides/ramdisk.html
+++ b/doc/source/guides/ramdisk.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -74,7 +74,7 @@
         <h3>Install DevStack</h3>
         <p>Grab the latest version of DevStack via https:</p>
 		<pre>sudo apt-get install git -y
-git clone https://github.com/openstack-dev/devstack.git
+git clone https://git.openstack.org/openstack-dev/devstack
 cd devstack</pre>
 
         <h3>Prepare the Boot RAMdisk</h3>
diff --git a/doc/source/guides/single-machine.html b/doc/source/guides/single-machine.html
index 9471972..06cc981 100644
--- a/doc/source/guides/single-machine.html
+++ b/doc/source/guides/single-machine.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -79,7 +79,7 @@
         <h3>Download DevStack</h3>
         <p>We'll grab the latest version of DevStack via https:</p>
         <pre>sudo apt-get install git -y || yum install -y git
-git clone https://github.com/openstack-dev/devstack.git
+git clone https://git.openstack.org/openstack-dev/devstack
 cd devstack</pre>
 
         <h3>Run DevStack</h3>
diff --git a/doc/source/guides/single-vm.html b/doc/source/guides/single-vm.html
index 2f1990a..d189319 100644
--- a/doc/source/guides/single-vm.html
+++ b/doc/source/guides/single-vm.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -96,7 +96,7 @@
         DEBIAN_FRONTEND=noninteractive sudo apt-get install -qqy git || sudo yum install -qy git
         sudo chown stack:stack /home/stack
         cd /home/stack
-        git clone https://github.com/openstack-dev/devstack.git
+        git clone https://git.openstack.org/openstack-dev/devstack
         cd devstack
         echo '[[local|localrc]]' > local.conf
         echo ADMIN_PASSWORD=password >> local.conf
diff --git a/doc/source/guides/usb-boot.html b/doc/source/guides/usb-boot.html
index 75adc6f..2a05f89 100644
--- a/doc/source/guides/usb-boot.html
+++ b/doc/source/guides/usb-boot.html
@@ -34,7 +34,7 @@
             <li><a href="../overview.html">Overview</a></li>
             <li><a href="../changes.html">Changes</a></li>
             <li><a href="../faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/index.html b/doc/source/index.html
index dada57d..5f1efd7 100644
--- a/doc/source/index.html
+++ b/doc/source/index.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
@@ -55,9 +55,9 @@
         <div class="pull-left">
           <ol id="getting_started">
             <li id="ubuntu">Setup a fresh supported Linux installation.</li>
-            <li id="github">
-              Clone devstack from devstack.
-              <pre>git clone https://github.com/openstack-dev/devstack.git</pre>
+            <li id="git">
+              Clone devstack from git.openstack.org.
+              <pre>git clone https://git.openstack.org/openstack-dev/devstack</pre>
             </li>
             <li id="install">
               Deploy your OpenStack Cloud
@@ -84,7 +84,7 @@
             </li>
             <li>
               <h3>Download DevStack</h3>
-              <pre>git clone https://github.com/openstack-dev/devstack.git</pre>
+              <pre>git clone https://git.openstack.org/openstack-dev/devstack</pre>
               <p>The <code>devstack</code> repo contains a script that installs OpenStack and templates for configuration files</p>
             </li>
             <li>
diff --git a/doc/source/local.conf.html b/doc/source/local.conf.html
index ed53adf..2635ac6 100644
--- a/doc/source/local.conf.html
+++ b/doc/source/local.conf.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/localrc.html b/doc/source/localrc.html
index 0f669bd..40a2004 100644
--- a/doc/source/localrc.html
+++ b/doc/source/localrc.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/openrc.html b/doc/source/openrc.html
index da6697f..94b253d 100644
--- a/doc/source/openrc.html
+++ b/doc/source/openrc.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/overview.html b/doc/source/overview.html
index baee400..9cee052 100644
--- a/doc/source/overview.html
+++ b/doc/source/overview.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/plugins.html b/doc/source/plugins.html
index 3327128..700a209 100644
--- a/doc/source/plugins.html
+++ b/doc/source/plugins.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>
diff --git a/doc/source/stackrc.html b/doc/source/stackrc.html
index d83fbc1..2df9d38 100644
--- a/doc/source/stackrc.html
+++ b/doc/source/stackrc.html
@@ -34,7 +34,7 @@
             <li><a href="overview.html">Overview</a></li>
             <li><a href="changes.html">Changes</a></li>
             <li><a href="faq.html">FAQ</a></li>
-            <li><a href="http://github.com/openstack-dev/devstack">GitHub</a></li>
+            <li><a href="https://git.openstack.org/cgit/openstack-dev/devstack">git.openstack.org</a></li>
             <li><a href="https://review.openstack.org/#/q/status:open+project:openstack-dev/devstack,n,z">Gerrit</a></li>
           </ul>
         </div>