diff --git a/README.md b/README.md
index 5458717d..27718a25 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ IRC: #openstack-dns
 Installation: http://docs.openstack.org/developer/designate/getting-started.html
 
 # Development
-Designate follows the [OpenStack Gerrit Workflow](https://wiki.openstack.org/wiki/Gerrit_Workflow)
+Designate follows the [OpenStack Gerrit Workflow](http://docs.openstack.org/infra/manual/developers.html#development-workflow)
 
 ## Setup
 Setup a working environment:
diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst
index f1cf9622..292ab3c2 100644
--- a/doc/source/devstack.rst
+++ b/doc/source/devstack.rst
@@ -28,7 +28,7 @@ Instructions
 
 2. Clone Designate and DevStack inside the VM::
 
-   $ git clone https://github.com/openstack-dev/devstack.git
+   $ git clone https://git.openstack.org/cgit/openstack-dev/devstack.git
    $ git clone https://github.com/openstack/designate.git
 
 3. Install the Designate extension for DevStack::
diff --git a/doc/source/getting-involved.rst b/doc/source/getting-involved.rst
index c6e32510..76f2c086 100644
--- a/doc/source/getting-involved.rst
+++ b/doc/source/getting-involved.rst
@@ -49,6 +49,6 @@ You can use tox to check your code locally by running
   # For tests + flake8
   tox
   
-.. _Gerrit workflow: https://wiki.openstack.org/wiki/Gerrit_Workflow
+.. _Gerrit workflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 .. _blueprint: https://blueprints.launchpad.net/designate
 .. _bug: https://bugs.launchpad.net/designate