diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index a7265d7d13..14622951a9 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -7,8 +7,8 @@ Gerrit
 
 Gerrit is the code review system used by the OpenStack project.  For a
 full description of how the system fits into the OpenStack workflow,
-see `the GerritJenkinsGit wiki article
-<https://wiki.openstack.org/wiki/GerritJenkinsGit>`_.
+see `the development workflow guide
+<http://docs.openstack.org/infra/manual/developers.html#development-workflow>`_.
 
 This section describes how Gerrit is configured for use in the
 OpenStack project and the tools used to manage that configuration.
diff --git a/modules/elastic_recheck/files/recheckwatchbot.yaml b/modules/elastic_recheck/files/recheckwatchbot.yaml
index f8cca1d86d..4561648474 100644
--- a/modules/elastic_recheck/files/recheckwatchbot.yaml
+++ b/modules/elastic_recheck/files/recheckwatchbot.yaml
@@ -24,4 +24,4 @@ messages:
     http://status.openstack.org/elastic-recheck/
   no_bugs_found: >-
     I noticed jenkins failed, refer to:
-    https://wiki.openstack.org/wiki/GerritJenkinsGithub#Test_Failures
+    http://docs.openstack.org/infra/manual/developers.html#automated-testing
diff --git a/modules/openstack_project/files/gerrit/system-cla.html b/modules/openstack_project/files/gerrit/system-cla.html
index 1c2737f6ae..b6c0f3b050 100644
--- a/modules/openstack_project/files/gerrit/system-cla.html
+++ b/modules/openstack_project/files/gerrit/system-cla.html
@@ -6,8 +6,9 @@ Gerrit System Role Accounts Proxy CLA
 
 <p>
 This is not a real CLA and cannot be signed. See <a
-href="https://wiki.openstack.org/wiki/HowToContribute">https://wiki.openstack.org/wiki/HowToContribute</a>
-for more information on OpenStack Contributor License Agreements.
+href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the
+account setup instructions</a> for more information on OpenStack Contributor
+License Agreements.
 </p>
 
 </div></body></html>
diff --git a/modules/openstack_project/files/gerrit/usg-cla.html b/modules/openstack_project/files/gerrit/usg-cla.html
index 362b91efe1..f5f4ddf29e 100644
--- a/modules/openstack_project/files/gerrit/usg-cla.html
+++ b/modules/openstack_project/files/gerrit/usg-cla.html
@@ -8,8 +8,9 @@ OpenStack Project U.S. Government Contributor License Agreement
 This agreement is not managed through Gerrit. If you need to sign the U.S.
 Government Contributor License Agreement, please contact the OpenStack
 Foundation to initiate the process. See <a
-href="https://wiki.openstack.org/wiki/HowToContribute">https://wiki.openstack.org/wiki/HowToContribute</a>
-for more information.
+href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the
+account setup instructions</a> for more information on OpenStack Contributor
+License Agreements.
 </p>
 
 </div></body></html>