diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst
index f94735ffd0..d94b880a80 100644
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -60,7 +60,7 @@
      retrieve instance-specific data. See `Metadata
      service (OpenStack Cloud Admin Guide)`_.
 
-     .. _Metadata service (OpenStack Cloud Admin Guide): http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
+     .. _Metadata service (OpenStack Cloud Admin Guide): http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service
 
    Multi-region
      A feature of Heat that supports deployment to multiple regions.
diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst
index cf0f5b724a..7c35a374d0 100644
--- a/doc/source/template_guide/software_deployment.rst
+++ b/doc/source/template_guide/software_deployment.rst
@@ -790,7 +790,7 @@ contents of the file ``example-puppet-manifest.pp``, containing:
 .. _`AWS::CloudFormation::Init`: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-init.html
 .. _diskimage-builder: https://github.com/openstack/diskimage-builder
 .. _imagefactory: http://imgfac.org/
-.. _`Metadata service`: http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
+.. _`Metadata service`: http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service
 .. _Cloud-init: http://cloudinit.readthedocs.org/en/latest/
 .. _curl: http://curl.haxx.se/
 .. _`Orchestration API`: http://developer.openstack.org/api-ref-orchestration-v1.html