diff --git a/doc/source/install-guide/configure-ceilometer.rst b/doc/source/install-guide/configure-ceilometer.rst
index 2e31addd72..44cba96cad 100644
--- a/doc/source/install-guide/configure-ceilometer.rst
+++ b/doc/source/install-guide/configure-ceilometer.rst
@@ -190,7 +190,10 @@ setup-openstack.yml. The ceilometer playbooks will run as part of this playbook
 
 References
 ##########
-[1] `Ceilometer Admin Guide <http://docs.openstack.org/admin-guide-cloud/telemetry-data-collection.html>`
+[1] `Ceilometer Admin Guide`_
+
+.. _Ceilometer Admin Guide: http://docs.openstack.org/admin-guide/telemetry-data-collection.html
+
 
 --------------
 
diff --git a/doc/source/install-guide/configure-keystone.rst b/doc/source/install-guide/configure-keystone.rst
index b6b7c76dd6..5907dec617 100644
--- a/doc/source/install-guide/configure-keystone.rst
+++ b/doc/source/install-guide/configure-keystone.rst
@@ -107,7 +107,7 @@ be found in the `Keystone Developer Documentation`_ and the
 `OpenStack Admin Guide`_.
 
 .. _Keystone Developer Documentation: http://docs.openstack.org/developer/keystone/configuration.html#configuring-the-ldap-identity-provider
-.. _OpenStack Admin Guide: http://docs.openstack.org/admin-guide-cloud/keystone_integrate_identity_backend_ldap.html
+.. _OpenStack Administrator Guide: http://docs.openstack.org/admin-guide/keystone_integrate_identity_backend_ldap.html
 
 --------------
 
diff --git a/releasenotes/notes/neutron-fwaas-5c7c6508f2cc05c3.yaml b/releasenotes/notes/neutron-fwaas-5c7c6508f2cc05c3.yaml
index 3048dad9a6..a21013bebf 100644
--- a/releasenotes/notes/neutron-fwaas-5c7c6508f2cc05c3.yaml
+++ b/releasenotes/notes/neutron-fwaas-5c7c6508f2cc05c3.yaml
@@ -2,7 +2,7 @@
 features:
   - Neutron Firewall as a Service (FWaaS) can now optionally be deployed and
     configured. Please see the `FWaaS Configuration Reference
-    <http://docs.openstack.org/admin-guide-cloud/networking_introduction.html#firewall-as-a-service-fwaas-overview>`_
+    <http://docs.openstack.org/admin-guide/networking_introduction.html#firewall-as-a-service-fwaas-overview>`_
     for details about the what the service is and what it provides. See the
     `FWaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-fwaas.html>`_
     for implementation details.