diff --git a/doc/source/user/glanceapi.rst b/doc/source/user/glanceapi.rst
index c3b3a30ae6..ea231c4031 100644
--- a/doc/source/user/glanceapi.rst
+++ b/doc/source/user/glanceapi.rst
@@ -37,13 +37,13 @@ independent, the OpenStack Images APIs are intimately associated with Glance.
 
 **References**
 
-* `Designated sections (definition) <http://git.openstack.org/cgit/openstack/defcore/tree/doc/source/process/Lexicon.rst#n54>`_
+* `Designated sections (definition) <https://github.com/openstack/interop/blob/master/doc/source/process/Lexicon.rst>`_
 
 * `2014-04-02 DefCore Designated Sections Guidelines <https://governance.openstack.org/resolutions/20140402-defcore-designated-sections-guidelines.html>`_
 
-* `OpenStack Core Definition <https://github.com/openstack/defcore/blob/master/doc/source/process/CoreDefinition.rst>`_
+* `OpenStack Core Definition <https://github.com/openstack/interop/blob/master/doc/source/process/CoreDefinition.rst>`_
 
-* `DefCore Guidelines Repository <https://github.com/openstack/defcore>`_
+* `DefCore Guidelines Repository <https://github.com/openstack/interop>`_
 
 Glance and the Images APIs: Past, Present, and Future
 -----------------------------------------------------
diff --git a/doc/source/user/metadefs-concepts.rst b/doc/source/user/metadefs-concepts.rst
index a2a79b459d..9ce721bf27 100644
--- a/doc/source/user/metadefs-concepts.rst
+++ b/doc/source/user/metadefs-concepts.rst
@@ -150,7 +150,7 @@ objects, properties, and tags may be used for images, snapshots, volumes, and
 flavors. Or a namespace may only apply to images.
 
 Resource types should be aligned with Heat resource types whenever possible.
-http://docs.openstack.org/developer/heat/template_guide/openstack.html
+https://docs.openstack.org/heat/latest/template_guide/openstack.html
 
 It is important to note that the same base property key can require different
 prefixes depending on the target resource type. The API provides a way to