diff --git a/doc/source/admin/telemetry-best-practices.rst b/doc/source/admin/telemetry-best-practices.rst
index 4c3dc3f792..4f0de3e629 100644
--- a/doc/source/admin/telemetry-best-practices.rst
+++ b/doc/source/admin/telemetry-best-practices.rst
@@ -26,4 +26,9 @@ Data collection
 #. If polling many resources or at a high frequency, you can add additional
    central and compute agents as necessary. The agents are designed to scale
    horizontally. For more information refer to the `high availability guide
-   <https://docs.openstack.org/ha-guide/controller-ha-telemetry.html>`_.
+   <https://docs.openstack.org/ha-guide/>`_.
+
+   .. note::
+
+      The High Availability Guide is a work in progress and is changing
+      rapidly while testing continues.
diff --git a/doc/source/admin/telemetry-system-architecture.rst b/doc/source/admin/telemetry-system-architecture.rst
index e3f1c0ae11..ab65264960 100644
--- a/doc/source/admin/telemetry-system-architecture.rst
+++ b/doc/source/admin/telemetry-system-architecture.rst
@@ -79,7 +79,7 @@ compute hosts.
 The following is a list of supported hypervisors.
 
 -  `Libvirt supported hypervisors <http://libvirt.org/>`__ such as KVM and QEMU
--  `Hyper-V <http://www.microsoft.com/en-us/server-cloud/hyper-v-server/default.aspx>`__
+-  `Hyper-V <https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/hyper-v-on-windows-server>`__
 -  `XEN <http://www.xenproject.org/help/documentation.html>`__
 -  `VMware vSphere <https://www.vmware.com/support/vsphere-hypervisor.html>`__