diff --git a/doc/source/improve_rally.rst b/doc/source/improve_rally.rst
index 980864a775..bd93af9657 100644
--- a/doc/source/improve_rally.rst
+++ b/doc/source/improve_rally.rst
@@ -47,7 +47,7 @@ How to contribute
 
 1. You need a `Launchpad <https://launchpad.net/>`_ account and need to be joined to the `Openstack team <https://launchpad.net/openstack>`_. You can also join the `Rally team <https://launchpad.net/rally>`_ if you want to. Make sure Launchpad has your SSH key, Gerrit (the code review system) uses this.
 
-2. Sign the CLA as outlined in section 3 of the `How To Contribute wiki page <https://wiki.openstack.org/wiki/HowToContribute#If_you.27re_a_developer>`_.
+2. Sign the CLA as outlined in the `account setup <http://docs.openstack.org/infra/manual/developers.html#development-workflow>`_ section of the developer guide.
 
 3. Tell git your details:
 
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index bc68d854b7..8c6a0b55b2 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -66,7 +66,7 @@ To install Rally with DevStack, you should first clone the corresponding reposit
 
 .. code-block:: none
 
-   git clone https://github.com/openstack-dev/devstack
+   git clone https://git.openstack.org/cgit/openstack-dev/devstack
    git clone https://github.com/stackforge/rally
 
 To configure DevStack to run Rally:
diff --git a/rally/deploy/engines/devstack.py b/rally/deploy/engines/devstack.py
index a19bad05ec..67b79255a8 100644
--- a/rally/deploy/engines/devstack.py
+++ b/rally/deploy/engines/devstack.py
@@ -25,7 +25,7 @@ from rally import utils
 
 
 LOG = logging.getLogger(__name__)
-DEVSTACK_REPO = 'https://github.com/openstack-dev/devstack.git'
+DEVSTACK_REPO = 'https://git.openstack.org/cgit/openstack-dev/devstack.git'
 DEVSTACK_BRANCH = 'master'
 DEVSTACK_USER = 'rally'
 
diff --git a/tests/unit/deploy/engines/test_devstack.py b/tests/unit/deploy/engines/test_devstack.py
index 21ecf76524..764000041a 100644
--- a/tests/unit/deploy/engines/test_devstack.py
+++ b/tests/unit/deploy/engines/test_devstack.py
@@ -31,7 +31,7 @@ SAMPLE_CONFIG = {
     },
 }
 
-DEVSTACK_REPO = 'https://github.com/openstack-dev/devstack.git'
+DEVSTACK_REPO = 'https://git.openstack.org/cgit/openstack-dev/devstack.git'
 
 
 class DevstackEngineTestCase(test.TestCase):
@@ -93,7 +93,7 @@ class DevstackEngineTestCase(test.TestCase):
                                     info='fake_credentials',
                                     provider_name='DevstackEngine',
                                     type='credentials')
-        repo = 'https://github.com/openstack-dev/devstack.git'
+        repo = 'https://git.openstack.org/cgit/openstack-dev/devstack.git'
         cmd = '/bin/sh -e -s %s master' % repo
         server.ssh.run.assert_called_once_with(cmd, stdin='fake_script')
         ds_calls = [