diff --git a/api-ref/source/v2/samples/metadef-namespaces-list-response.json b/api-ref/source/v2/samples/metadef-namespaces-list-response.json
index 517b1e3e06..ac27f30f06 100644
--- a/api-ref/source/v2/samples/metadef-namespaces-list-response.json
+++ b/api-ref/source/v2/samples/metadef-namespaces-list-response.json
@@ -3,7 +3,7 @@
     "namespaces": [
         {
             "created_at": "2014-08-28T17:13:06Z",
-            "description": "The libvirt compute driver options. These are properties specific to compute drivers.  For a list of all hypervisors, see here: https://wiki.openstack.org/wiki/HypervisorSupportMatrix.",
+            "description": "The libvirt compute driver options. These are properties specific to compute drivers.  For a list of all hypervisors, see here: https://docs.openstack.org/nova/latest/user/support-matrix.html",
             "display_name": "libvirt Driver Options",
             "namespace": "OS::Compute::Libvirt",
             "owner": "admin",
diff --git a/etc/metadefs/compute-libvirt-image.json b/etc/metadefs/compute-libvirt-image.json
index 1e7f8245f2..ab6a234668 100644
--- a/etc/metadefs/compute-libvirt-image.json
+++ b/etc/metadefs/compute-libvirt-image.json
@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::LibvirtImage",
     "display_name": "libvirt Driver Options for Images",
-    "description": "The libvirt Compute Driver Options for Glance Images.  \n\nThese are properties specific to compute drivers.  For a list of all hypervisors, see here: https://wiki.openstack.org/wiki/HypervisorSupportMatrix.",
+    "description": "The libvirt Compute Driver Options for Glance Images.  \n\nThese are properties specific to compute drivers.  For a list of all hypervisors, see here: https://docs.openstack.org/nova/latest/user/support-matrix.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [
diff --git a/etc/metadefs/compute-libvirt.json b/etc/metadefs/compute-libvirt.json
index 397d4399b8..3493be3885 100644
--- a/etc/metadefs/compute-libvirt.json
+++ b/etc/metadefs/compute-libvirt.json
@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::Libvirt",
     "display_name": "libvirt Driver Options",
-    "description": "The libvirt compute driver options.  \n\nThese are properties that affect the libvirt compute driver and may be specified on flavors and images.  For a list of all hypervisors, see here: https://wiki.openstack.org/wiki/HypervisorSupportMatrix.",
+    "description": "The libvirt compute driver options.  \n\nThese are properties that affect the libvirt compute driver and may be specified on flavors and images.  For a list of all hypervisors, see here: https://docs.openstack.org/nova/latest/user/support-matrix.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [
diff --git a/etc/metadefs/compute-vmware-quota-flavor.json b/etc/metadefs/compute-vmware-quota-flavor.json
index 7daec6979c..194e465fa0 100644
--- a/etc/metadefs/compute-vmware-quota-flavor.json
+++ b/etc/metadefs/compute-vmware-quota-flavor.json
@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::VMwareQuotaFlavor",
     "display_name": "VMware Quota for Flavors",
-    "description": "The VMware compute driver allows various compute quotas to be specified on flavors. When specified, the VMWare driver will ensure that the quota is enforced. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. For a list of hypervisors, see: https://wiki.openstack.org/wiki/HypervisorSupportMatrix. For flavor customization, see: http://docs.openstack.org/admin-guide/compute-flavors.html",
+    "description": "The VMware compute driver allows various compute quotas to be specified on flavors. When specified, the VMWare driver will ensure that the quota is enforced. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. For a list of hypervisors, see: https://docs.openstack.org/nova/latest/user/support-matrix.html. For flavor customization, see: http://docs.openstack.org/admin-guide/compute-flavors.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [
diff --git a/etc/metadefs/compute-vmware.json b/etc/metadefs/compute-vmware.json
index 7ea8c32876..c5cd8ff712 100644
--- a/etc/metadefs/compute-vmware.json
+++ b/etc/metadefs/compute-vmware.json
@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::VMware",
     "display_name": "VMware Driver Options",
-    "description": "The VMware compute driver options.  \n\nThese are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova.  For a list of all hypervisors, see here: https://wiki.openstack.org/wiki/HypervisorSupportMatrix.",
+    "description": "The VMware compute driver options.  \n\nThese are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova.  For a list of all hypervisors, see here: https://docs.openstack.org/nova/latest/user/support-matrix.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [
diff --git a/etc/metadefs/compute-xenapi.json b/etc/metadefs/compute-xenapi.json
index ae1827d8e2..97e290b3bd 100644
--- a/etc/metadefs/compute-xenapi.json
+++ b/etc/metadefs/compute-xenapi.json
@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::XenAPI",
     "display_name": "XenAPI Driver Options",
-    "description": "The XenAPI compute driver options.  \n\nThese are properties specific to compute drivers.  For a list of all hypervisors, see here: https://wiki.openstack.org/wiki/HypervisorSupportMatrix.",
+    "description": "The XenAPI compute driver options.  \n\nThese are properties specific to compute drivers.  For a list of all hypervisors, see here: https://docs.openstack.org/nova/latest/user/support-matrix.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [