diff --git a/HACKING.rst b/HACKING.rst
index 442a927b0..e8df4788e 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -14,7 +14,7 @@ We use OpenStack's Gerrit for the code contributions:
 
 `<https://review.openstack.org/#/q/status:open+project:openstack/tuskar-ui,n,z>`__
 
-and we follow the `OpenStack Gerrit Workflow <https://wiki.openstack.org/wiki/Gerrit_Workflow>`__.
+and we follow the `OpenStack Gerrit Workflow <http://docs.openstack.org/infra/manual/developers.html#development-workflow>`__.
 
 If you're interested in the code, here are some key places to start:
 
diff --git a/doc/source/devstack_baremetal.rst b/doc/source/devstack_baremetal.rst
index b9ce5df2b..44ea85e89 100644
--- a/doc/source/devstack_baremetal.rst
+++ b/doc/source/devstack_baremetal.rst
@@ -14,4 +14,4 @@ To enable Bare Metal driver in DevStack you need to:
     + BM_DNSMASQ_FROM_NOVA_NETWORK=`trueorfalse True $BM_DNSMASQ_FROM_NOVA_NETWORK`
 
 See `Bare Metal DevStack documentation <http://devstack.org/lib/baremetal.html>`_
-or `baremetal file itself <https://github.com/openstack-dev/devstack/blob/master/lib/baremetal>`_
+or `baremetal file itself <https://git.openstack.org/cgit/openstack-dev/devstack/blob/master/lib/baremetal>`_