diff --git a/calico-enterprise/_includes/components/InstallOpenshiftBeforeYouBegin.js b/calico-enterprise/_includes/components/InstallOpenshiftBeforeYouBegin.js
index 96afe779b3..c2e9706c54 100644
--- a/calico-enterprise/_includes/components/InstallOpenshiftBeforeYouBegin.js
+++ b/calico-enterprise/_includes/components/InstallOpenshiftBeforeYouBegin.js
@@ -20,7 +20,7 @@ export default function InstallOpenshiftBeforeYouBegin(props) {
       <ul>
         <li>
           <p>
-            A <Link href={`${baseUrl}/getting-started/compatibility#openshift`}>compatible OpenShift cluster</Link>
+            A <Link href={`${baseUrl}/getting-started/compatibility`}>compatible OpenShift cluster</Link>
           </p>
           <p>
             Your environment meets the {prodname}{' '}
diff --git a/calico-enterprise/getting-started/compatibility.mdx b/calico-enterprise/getting-started/compatibility.mdx
index eea3b5c943..f3e3ce7e55 100644
--- a/calico-enterprise/getting-started/compatibility.mdx
+++ b/calico-enterprise/getting-started/compatibility.mdx
@@ -2,133 +2,23 @@
 description: Lists versions of Calico Enterprise and Kubernetes for each platform.
 ---
 
+import PlatformMatrix from '@site/src/___new___/components/PlatformMatrix';
+
 # Support and compatibility
 
 ## Supported platforms
 
 The following list shows the platforms supported in this release. If you're working with a version older than these, consult the [documentation archive](https://docs.tigera.io/archive) or contact Support.
 
-- [AKS](#aks)
-- [EKS](#eks)
-- [GKE](#gke)
-- [kOps on AWS](#kops-on-aws)
-- [Kubernetes-kubeadm](#kubernetes-kubeadm)
-- [MKE 4k](#mke-4k)
-- [MKE](#mke)
-- [OpenShift](#openshift)
-- [RKE](#rke)
-- [RKE2](#rke2)
-- [TKG](#tkg)
-- [Charmed Kubernetes](#charmed-kubernetes)
-
 ### Supported $[prodname] features
 
 If your platform is listed below, the features in this release will work for your platform unless an individual feature topic explicitly calls out a vendor or $[prodname] limitation.
 
 Note that all Windows feature limitations are described in [Windows limitations](install-on-clusters/windows-calico/limitations.mdx), and are not called out in individual Linux topics.
 
-## AKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                                                                        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy<br />- Azure CNI with $[prodname] network policy <br />- Azure CNI with $[prodname] network policy |
-
-## EKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                   |
-| ----------------------- | -------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## GKE
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                       |
-| ----------------------- | ------------------------------------------ |
-| 3.21 to current release | - GKE CNI with $[prodname] network policy |
-
-## kOps on AWS
-
-| $[prodname] version | kOps and Kubernetes versions | $[prodname] support                                                                   |
-| -------------------- | ---------------------------- | -------------------------------------------------------------------------------------- |
-| 3.23                 | 1.33 - 1.34                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.22                 | 1.31 - 1.34                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.21                 | 1.31 - 1.32                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.20                 | 1.29 - 1.30                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## Kubernetes-kubeadm
-
-| $[prodname] version | Kubernetes/kubeadm versions | $[prodname] support                 |
-| -------------------- | --------------------------- | ------------------------------------ |
-| 3.23                 | 1.33 - 1.35                 | $[prodname] CNI with network policy |
-| 3.22                 | 1.31 - 1.34                 | $[prodname] CNI with network policy |
-| 3.21                 | 1.31 - 1.33                 | $[prodname] CNI with network policy |
-| 3.20                 | 1.29 - 1.31                 | $[prodname] CNI with network policy |
-
-## MKE 4k
-
-| $[prodname] version | MKE 4k version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | MKE 4k 4.1.2     | $[prodname] CNI with network policy | 1.32                |
-| 3.22                 | MKE 4k 4.1.2     | $[prodname] CNI with network policy | 1.32                |
-
-## MKE
-
-| $[prodname] version | MKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | MKE 3.9     | $[prodname] CNI with network policy | 1.34                |
-| 3.22                 | MKE 3.9     | $[prodname] CNI with network policy | 1.34                |
-| 3.22                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.21                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.20                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-
-## OpenShift
-
-| $[prodname] version | OpenShift versions for Kubernetes | $[prodname] support                 |
-| -------------------- | --------------------------------- | ------------------------------------ |
-| 3.23                 | 4.18 - 4.20                       | $[prodname] CNI with network policy |
-| 3.22                 | 4.17 - 4.20                       | $[prodname] CNI with network policy |
-| 3.21                 | 4.16 - 4.18                       | $[prodname] CNI with network policy |
-| 3.20                 | 4.15 - 4.17                       | $[prodname] CNI with network policy |
-
-## RKE
-
-| $[prodname] version | RKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.22                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.21                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.20                 | 1.7         | $[prodname] CNI with network policy | 1.31                |
-
-## RKE2
-
-| $[prodname] version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ------------------------------------ | ------------------- |
-| 3.23                 | $[prodname] CNI with network policy | 1.33 - 1.34         |
-| 3.22                 | $[prodname] CNI with network policy | 1.31 - 1.34         |
-| 3.21                 | $[prodname] CNI with network policy | 1.31 - 1.33         |
-| 3.20                 | $[prodname] CNI with network policy | 1.29 - 1.31         |
-
-## TKG
-
-| $[prodname] version | TKG version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.22                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.21                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.20                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-
-## Charmed Kubernetes
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
+## Supported Kubernetes versions by platform
 
-| $[prodname] version    | $[prodname] support                                                                      |
-| ----------------------- | ----------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy |
+<PlatformMatrix />
 
 ## Supported browsers
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/aks.mdx b/calico-enterprise/getting-started/install-on-clusters/aks.mdx
index ce3d792eff..a8d1d37e4c 100644
--- a/calico-enterprise/getting-started/install-on-clusters/aks.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/aks.mdx
@@ -49,7 +49,7 @@ Install $[prodname] on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](../compatibility.mdx#aks)
+- A [compatible AKS cluster](../compatibility.mdx)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
diff --git a/calico-enterprise/getting-started/install-on-clusters/aws.mdx b/calico-enterprise/getting-started/install-on-clusters/aws.mdx
index d4306fdb40..642da4ccf4 100644
--- a/calico-enterprise/getting-started/install-on-clusters/aws.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/aws.mdx
@@ -32,7 +32,7 @@ Install $[prodname] with a self-managed Kubernetes cluster using Kubernetes Oper
 
 **Required**
 
-- A [compatible kOps cluster](../compatibility.mdx#kops-on-aws)
+- A [compatible kOps cluster](../compatibility.mdx)
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - Cluster meets [system requirements](requirements.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
diff --git a/calico-enterprise/getting-started/install-on-clusters/charmed-k8s.mdx b/calico-enterprise/getting-started/install-on-clusters/charmed-k8s.mdx
index 6257f23596..ee983a33b6 100644
--- a/calico-enterprise/getting-started/install-on-clusters/charmed-k8s.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/charmed-k8s.mdx
@@ -26,7 +26,7 @@ This guide describes how to install $[prodname] on a Charmed Kubernetes cluster.
 **Required**
 
 - Your cluster meets the [system requirements](requirements.mdx)
-- A [compatible Charmed Kubernetes cluster](../compatibility.mdx#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](../compatibility.mdx)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
diff --git a/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx
index b5876d9c8d..8dc0223897 100644
--- a/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](../compatibility.mdx#mke) with:
+- A [compatible MKE 3 cluster](../compatibility.mdx) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default $[prodname] networking plugin
diff --git a/calico-enterprise/getting-started/install-on-clusters/eks.mdx b/calico-enterprise/getting-started/install-on-clusters/eks.mdx
index 0c368d2d54..b198ea3b0b 100644
--- a/calico-enterprise/getting-started/install-on-clusters/eks.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/eks.mdx
@@ -34,7 +34,7 @@ Install $[prodname] on an EKS managed Kubernetes cluster.
 
 **Required**
 
-* You have a [compatible EKS cluster](../compatibility.mdx#eks).
+* You have a [compatible EKS cluster](../compatibility.mdx).
 * Your cluster meets the [system requirements](requirements.mdx).
 * You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 * You have a [Tigera license key and credentials](calico-enterprise.mdx).
diff --git a/calico-enterprise/getting-started/install-on-clusters/gke.mdx b/calico-enterprise/getting-started/install-on-clusters/gke.mdx
index 41f9795714..98154d0588 100644
--- a/calico-enterprise/getting-started/install-on-clusters/gke.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/gke.mdx
@@ -27,7 +27,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](../compatibility.mdx#gke)
+- A [compatible GKE cluster](../compatibility.mdx)
 
 - Cluster has these Networking settings:
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/kubernetes/generic-install.mdx b/calico-enterprise/getting-started/install-on-clusters/kubernetes/generic-install.mdx
index fc6df08e4c..5df4074cf6 100644
--- a/calico-enterprise/getting-started/install-on-clusters/kubernetes/generic-install.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/kubernetes/generic-install.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](../../compatibility.mdx#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](../../compatibility.mdx)
 - Cluster meets [system requirements](../requirements.mdx)
 - A [Tigera license key and credentials](../calico-enterprise.mdx)
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx
index 0c26597196..da7e87312a 100644
--- a/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx
@@ -44,7 +44,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx).
 
    :::note
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise/getting-started/install-on-clusters/rancher.mdx
index 12d9dce3b2..c340b9c2f2 100644
--- a/calico-enterprise/getting-started/install-on-clusters/rancher.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/rancher.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](../compatibility.mdx#rke)
+- A [compatible RKE cluster](../compatibility.mdx)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](rke2.mdx).
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise/getting-started/install-on-clusters/rke2.mdx
index c00c061dfa..10ff4479a2 100644
--- a/calico-enterprise/getting-started/install-on-clusters/rke2.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/rke2.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](../compatibility.mdx#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](../compatibility.mdx) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/tkg.mdx b/calico-enterprise/getting-started/install-on-clusters/tkg.mdx
index da91beca2b..d4832b848b 100644
--- a/calico-enterprise/getting-started/install-on-clusters/tkg.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/tkg.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](../compatibility.mdx#tkg)
+- A [compatible TKG cluster](../compatibility.mdx)
 - Configure your cluster for $[prodname] CNI
   The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until $[prodname] is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
diff --git a/calico-enterprise/getting-started/install-on-clusters/windows-calico/rancher.mdx b/calico-enterprise/getting-started/install-on-clusters/windows-calico/rancher.mdx
index aba3c3afc5..1dc23738f0 100644
--- a/calico-enterprise/getting-started/install-on-clusters/windows-calico/rancher.mdx
+++ b/calico-enterprise/getting-started/install-on-clusters/windows-calico/rancher.mdx
@@ -17,7 +17,7 @@ Install $[prodnameWindows] on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](../../compatibility.mdx#rke)
+- A [compatible RKE cluster](../../compatibility.mdx)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
diff --git a/calico-enterprise/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx b/calico-enterprise/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
index ab25afbf4f..ae84708ed3 100644
--- a/calico-enterprise/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
+++ b/calico-enterprise/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
@@ -27,7 +27,7 @@ Always check the [Release Notes](../../../release-notes/index.mdx) for exception
 
 ## Prerequisites
 
-Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx#openshift), and the $[prodname] operator version is v1.2.4 or greater.
+Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx), and the $[prodname] operator version is v1.2.4 or greater.
 
 :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenshiftBeforeYouBegin.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
index 96afe779b3..c2e9706c54 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
+++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
@@ -20,7 +20,7 @@ export default function InstallOpenshiftBeforeYouBegin(props) {
       <ul>
         <li>
           <p>
-            A <Link href={`${baseUrl}/getting-started/compatibility#openshift`}>compatible OpenShift cluster</Link>
+            A <Link href={`${baseUrl}/getting-started/compatibility`}>compatible OpenShift cluster</Link>
           </p>
           <p>
             Your environment meets the {prodname}{' '}
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/compatibility.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/compatibility.mdx
index f3016c42fc..f3e3ce7e55 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/compatibility.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/compatibility.mdx
@@ -2,117 +2,23 @@
 description: Lists versions of Calico Enterprise and Kubernetes for each platform.
 ---
 
+import PlatformMatrix from '@site/src/___new___/components/PlatformMatrix';
+
 # Support and compatibility
 
 ## Supported platforms
 
 The following list shows the platforms supported in this release. If you're working with a version older than these, consult the [documentation archive](https://docs.tigera.io/archive) or contact Support.
 
-- [AKS](#aks)
-- [EKS](#eks)
-- [GKE](#gke)
-- [kOps on AWS](#kops-on-aws)
-- [Kubernetes-kubeadm](#kubernetes-kubeadm)
-- [MKE](#mke)
-- [OpenShift](#openshift)
-- [RKE](#rke)
-- [RKE2](#rke2)
-- [TKG](#tkg)
-- [Charmed Kubernetes](#charmed-kubernetes)
-
 ### Supported $[prodname] features
 
 If your platform is listed below, the features in this release will work for your platform unless an individual feature topic explicitly calls out a vendor or $[prodname] limitation.
 
 Note that all Windows feature limitations are described in [Windows limitations](install-on-clusters/windows-calico/limitations.mdx), and are not called out in individual Linux topics.
 
-## AKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                                                                        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| 3.18 to current release | - $[prodname] CNI with network policy<br />- Azure CNI with $[prodname] network policy <br />- Azure CNI with $[prodname] network policy |
-
-## EKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                   |
-| ----------------------- | -------------------------------------------------------------------------------------- |
-| 3.18 to current release | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## GKE
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                       |
-| ----------------------- | ------------------------------------------ |
-| 3.18 to current release | - GKE CNI with $[prodname] network policy |
-
-## kOps on AWS
-
-| $[prodname] version | kOps and Kubernetes versions | $[prodname] support                                                                   |
-| -------------------- | ---------------------------- | -------------------------------------------------------------------------------------- |
-| 3.20                 | 1.29 - 1.31                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.19                 | 1.28 - 1.29                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.18                 | 1.26 - 1.28                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## Kubernetes-kubeadm
-
-| $[prodname] version | Kubernetes/kubeadm versions | $[prodname] support                 |
-| -------------------- | --------------------------- | ------------------------------------ |
-| 3.20                 | 1.29 - 1.31                 | $[prodname] CNI with network policy |
-| 3.19                 | 1.28 - 1.30                 | $[prodname] CNI with network policy |
-| 3.18                 | 1.26 - 1.28                 | $[prodname] CNI with network policy |
-
-## MKE
-
-| $[prodname] version | MKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.20                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.19                 | MKE 3.7     | $[prodname] CNI with network policy | 1.27                |
-| 3.18                 | MKE 3.7     | $[prodname] CNI with network policy | 1.27                |
-
-## OpenShift
-
-| $[prodname] version | OpenShift versions for Kubernetes | $[prodname] support                 |
-| -------------------- | --------------------------------- | ------------------------------------ |
-| 3.20                 | 4.15 - 4.17                       | $[prodname] CNI with network policy |
-| 3.19                 | 4.14 - 4.16                       | $[prodname] CNI with network policy |
-| 3.18                 | 4.12 - 4.14                       | $[prodname] CNI with network policy |
-
-## RKE
-
-| $[prodname] version | RKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.20                 | 1.7         | $[prodname] CNI with network policy | 1.31                |
-| 3.19                 | 1.5         | $[prodname] CNI with network policy | 1.28                |
-| 3.18                 | 1.4         | $[prodname] CNI with network policy | 1.26                |
-
-## RKE2
-
-| $[prodname] version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ------------------------------------ | ------------------- |
-| 3.20                 | $[prodname] CNI with network policy | 1.29 - 1.31         |
-| 3.19                 | $[prodname] CNI with network policy | 1.28 - 1.30         |
-| 3.18                 | $[prodname] CNI with network policy | 1.26 - 1.28         |
-
-## TKG
-
-| $[prodname] version | TKG version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.20                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.19                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.18                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-
-## Charmed Kubernetes
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
+## Supported Kubernetes versions by platform
 
-| $[prodname] version    | $[prodname] support                                                                      |
-| ----------------------- | ----------------------------------------------------------------------------------------- |
-| 3.20 to current release | - $[prodname] CNI with network policy |
+<PlatformMatrix />
 
 ## Supported browsers
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aks.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aks.mdx
index c110015430..cb5d32f7fd 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aks.mdx
@@ -49,7 +49,7 @@ Install $[prodname] on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](../compatibility.mdx#aks)
+- A [compatible AKS cluster](../compatibility.mdx)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aws.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aws.mdx
index d4306fdb40..642da4ccf4 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aws.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/aws.mdx
@@ -32,7 +32,7 @@ Install $[prodname] with a self-managed Kubernetes cluster using Kubernetes Oper
 
 **Required**
 
-- A [compatible kOps cluster](../compatibility.mdx#kops-on-aws)
+- A [compatible kOps cluster](../compatibility.mdx)
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - Cluster meets [system requirements](requirements.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/charmed-k8s.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/charmed-k8s.mdx
index 648c990aff..1402802e35 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/charmed-k8s.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/charmed-k8s.mdx
@@ -26,7 +26,7 @@ This guide describes how to install $[prodname] on a Charmed Kubernetes cluster.
 **Required**
 
 - Your cluster meets the [system requirements](requirements.mdx)
-- A [compatible Charmed Kubernetes cluster](../compatibility.mdx#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](../compatibility.mdx)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx
index c9b65e1bda..6fb8d066a2 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](../compatibility.mdx#mke) with:
+- A [compatible MKE 3 cluster](../compatibility.mdx) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default $[prodname] networking plugin
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/eks.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/eks.mdx
index 0ba523ba2a..97a6aff353 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/eks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/eks.mdx
@@ -34,7 +34,7 @@ Install $[prodname] on an EKS managed Kubernetes cluster.
 
 **Required**
 
-* You have a [compatible EKS cluster](../compatibility.mdx#eks).
+* You have a [compatible EKS cluster](../compatibility.mdx).
 * Your cluster meets the [system requirements](requirements.mdx).
 * You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 * You have a [Tigera license key and credentials](calico-enterprise.mdx).
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/gke.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/gke.mdx
index fcac41f8ea..3860dd9317 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/gke.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/gke.mdx
@@ -27,7 +27,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](../compatibility.mdx#gke)
+- A [compatible GKE cluster](../compatibility.mdx)
 
 - Cluster has these Networking settings:
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
index 574a014eeb..33288b5b32 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](../../compatibility.mdx#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](../../compatibility.mdx)
 - Cluster meets [system requirements](../requirements.mdx)
 - A [Tigera license key and credentials](../calico-enterprise.mdx)
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
index c9ab5c70ed..4fda27bdcc 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
@@ -44,7 +44,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx).
 
    :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx
index c4fa4047cf..4e0900e520 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](../compatibility.mdx#rke)
+- A [compatible RKE cluster](../compatibility.mdx)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](rke2.mdx).
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx
index bc24244e1c..2f703f9e4d 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](../compatibility.mdx#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](../compatibility.mdx) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/tkg.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/tkg.mdx
index 5eedfeffe0..3764fc0adb 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/tkg.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/tkg.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](../compatibility.mdx#tkg)
+- A [compatible TKG cluster](../compatibility.mdx)
 - Configure your cluster for $[prodname] CNI
   The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until $[prodname] is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/windows-calico/rancher.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
index eafd5bec5b..87be594229 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
@@ -17,7 +17,7 @@ Install $[prodnameWindows] on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](../../compatibility.mdx#rke)
+- A [compatible RKE cluster](../../compatibility.mdx)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
index 69a9e08218..9eb044f11a 100644
--- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
+++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
@@ -27,7 +27,7 @@ Always check the [Release Notes](../../../release-notes/index.mdx) for exception
 
 ## Prerequisites
 
-Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx#openshift), and the $[prodname] operator version is v1.2.4 or greater.
+Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx), and the $[prodname] operator version is v1.2.4 or greater.
 
 :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallOpenshiftBeforeYouBegin.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
index 96afe779b3..c2e9706c54 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
+++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
@@ -20,7 +20,7 @@ export default function InstallOpenshiftBeforeYouBegin(props) {
       <ul>
         <li>
           <p>
-            A <Link href={`${baseUrl}/getting-started/compatibility#openshift`}>compatible OpenShift cluster</Link>
+            A <Link href={`${baseUrl}/getting-started/compatibility`}>compatible OpenShift cluster</Link>
           </p>
           <p>
             Your environment meets the {prodname}{' '}
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/compatibility.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/compatibility.mdx
index 1ab07ad08d..f3e3ce7e55 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/compatibility.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/compatibility.mdx
@@ -2,117 +2,23 @@
 description: Lists versions of Calico Enterprise and Kubernetes for each platform.
 ---
 
+import PlatformMatrix from '@site/src/___new___/components/PlatformMatrix';
+
 # Support and compatibility
 
 ## Supported platforms
 
 The following list shows the platforms supported in this release. If you're working with a version older than these, consult the [documentation archive](https://docs.tigera.io/archive) or contact Support.
 
-- [AKS](#aks)
-- [EKS](#eks)
-- [GKE](#gke)
-- [kOps on AWS](#kops-on-aws)
-- [Kubernetes-kubeadm](#kubernetes-kubeadm)
-- [MKE](#mke)
-- [OpenShift](#openshift)
-- [RKE](#rke)
-- [RKE2](#rke2)
-- [TKG](#tkg)
-- [Charmed Kubernetes](#charmed-kubernetes)
-
 ### Supported $[prodname] features
 
 If your platform is listed below, the features in this release will work for your platform unless an individual feature topic explicitly calls out a vendor or $[prodname] limitation.
 
 Note that all Windows feature limitations are described in [Windows limitations](install-on-clusters/windows-calico/limitations.mdx), and are not called out in individual Linux topics.
 
-## AKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                                                                        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| 3.19 to current release | - $[prodname] CNI with network policy<br />- Azure CNI with $[prodname] network policy <br />- Azure CNI with $[prodname] network policy |
-
-## EKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                   |
-| ----------------------- | -------------------------------------------------------------------------------------- |
-| 3.19 to current release | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## GKE
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                       |
-| ----------------------- | ------------------------------------------ |
-| 3.19 to current release | - GKE CNI with $[prodname] network policy |
-
-## kOps on AWS
-
-| $[prodname] version | kOps and Kubernetes versions | $[prodname] support                                                                   |
-| -------------------- | ---------------------------- | -------------------------------------------------------------------------------------- |
-| 3.21                 | 1.31 - 1.32                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.20                 | 1.29 - 1.30                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.19                 | 1.28 - 1.29                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## Kubernetes-kubeadm
-
-| $[prodname] version | Kubernetes/kubeadm versions | $[prodname] support                 |
-| -------------------- | --------------------------- | ------------------------------------ |
-| 3.21                 | 1.31 - 1.33                 | $[prodname] CNI with network policy |
-| 3.20                 | 1.29 - 1.31                 | $[prodname] CNI with network policy |
-| 3.19                 | 1.28 - 1.30                 | $[prodname] CNI with network policy |
-
-## MKE
-
-| $[prodname] version | MKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.21                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.20                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.19                 | MKE 3.7     | $[prodname] CNI with network policy | 1.27                |
-
-## OpenShift
-
-| $[prodname] version | OpenShift versions for Kubernetes | $[prodname] support                 |
-| -------------------- | --------------------------------- | ------------------------------------ |
-| 3.21                 | 4.16 - 4.18                       | $[prodname] CNI with network policy |
-| 3.20                 | 4.15 - 4.17                       | $[prodname] CNI with network policy |
-| 3.19                 | 4.14 - 4.16                       | $[prodname] CNI with network policy |
-
-## RKE
-
-| $[prodname] version | RKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.21                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.20                 | 1.7         | $[prodname] CNI with network policy | 1.31                |
-| 3.19                 | 1.5         | $[prodname] CNI with network policy | 1.28                |
-
-## RKE2
-
-| $[prodname] version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ------------------------------------ | ------------------- |
-| 3.21                 | $[prodname] CNI with network policy | 1.31 - 1.33         |
-| 3.20                 | $[prodname] CNI with network policy | 1.29 - 1.31         |
-| 3.19                 | $[prodname] CNI with network policy | 1.28 - 1.30         |
-
-## TKG
-
-| $[prodname] version | TKG version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.21                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.20                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.19                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-
-## Charmed Kubernetes
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
+## Supported Kubernetes versions by platform
 
-| $[prodname] version    | $[prodname] support                                                                      |
-| ----------------------- | ----------------------------------------------------------------------------------------- |
-| 3.20 to current release | - $[prodname] CNI with network policy |
+<PlatformMatrix />
 
 ## Supported browsers
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aks.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aks.mdx
index a610129445..c9c8dd2b4f 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aks.mdx
@@ -49,7 +49,7 @@ Install $[prodname] on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](../compatibility.mdx#aks)
+- A [compatible AKS cluster](../compatibility.mdx)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aws.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aws.mdx
index d4306fdb40..642da4ccf4 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aws.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/aws.mdx
@@ -32,7 +32,7 @@ Install $[prodname] with a self-managed Kubernetes cluster using Kubernetes Oper
 
 **Required**
 
-- A [compatible kOps cluster](../compatibility.mdx#kops-on-aws)
+- A [compatible kOps cluster](../compatibility.mdx)
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - Cluster meets [system requirements](requirements.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/charmed-k8s.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/charmed-k8s.mdx
index f259c50a69..28b7e4c70c 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/charmed-k8s.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/charmed-k8s.mdx
@@ -26,7 +26,7 @@ This guide describes how to install $[prodname] on a Charmed Kubernetes cluster.
 **Required**
 
 - Your cluster meets the [system requirements](requirements.mdx)
-- A [compatible Charmed Kubernetes cluster](../compatibility.mdx#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](../compatibility.mdx)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx
index 16e959837c..72e8482bbb 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](../compatibility.mdx#mke) with:
+- A [compatible MKE 3 cluster](../compatibility.mdx) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default $[prodname] networking plugin
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/eks.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/eks.mdx
index 1f116d2dac..da9c43428a 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/eks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/eks.mdx
@@ -34,7 +34,7 @@ Install $[prodname] on an EKS managed Kubernetes cluster.
 
 **Required**
 
-* You have a [compatible EKS cluster](../compatibility.mdx#eks).
+* You have a [compatible EKS cluster](../compatibility.mdx).
 * Your cluster meets the [system requirements](requirements.mdx).
 * You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 * You have a [Tigera license key and credentials](calico-enterprise.mdx).
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/gke.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/gke.mdx
index 0d1686c939..e0e136d30e 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/gke.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/gke.mdx
@@ -27,7 +27,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](../compatibility.mdx#gke)
+- A [compatible GKE cluster](../compatibility.mdx)
 
 - Cluster has these Networking settings:
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
index d50547eb85..8c832b25ac 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](../../compatibility.mdx#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](../../compatibility.mdx)
 - Cluster meets [system requirements](../requirements.mdx)
 - A [Tigera license key and credentials](../calico-enterprise.mdx)
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
index 34fab5ea93..657307b529 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
@@ -44,7 +44,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx).
 
    :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx
index 12d9dce3b2..c340b9c2f2 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](../compatibility.mdx#rke)
+- A [compatible RKE cluster](../compatibility.mdx)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](rke2.mdx).
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx
index c00c061dfa..10ff4479a2 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](../compatibility.mdx#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](../compatibility.mdx) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/tkg.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/tkg.mdx
index db7b0c01fc..e3bbf68145 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/tkg.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/tkg.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](../compatibility.mdx#tkg)
+- A [compatible TKG cluster](../compatibility.mdx)
 - Configure your cluster for $[prodname] CNI
   The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until $[prodname] is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/windows-calico/rancher.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
index aba3c3afc5..1dc23738f0 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
@@ -17,7 +17,7 @@ Install $[prodnameWindows] on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](../../compatibility.mdx#rke)
+- A [compatible RKE cluster](../../compatibility.mdx)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
index b04d220594..e57883279c 100644
--- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
+++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
@@ -27,7 +27,7 @@ Always check the [Release Notes](../../../release-notes/index.mdx) for exception
 
 ## Prerequisites
 
-Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx#openshift), and the $[prodname] operator version is v1.2.4 or greater.
+Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx), and the $[prodname] operator version is v1.2.4 or greater.
 
 :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallOpenshiftBeforeYouBegin.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
index 96afe779b3..c2e9706c54 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
+++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallOpenshiftBeforeYouBegin.js
@@ -20,7 +20,7 @@ export default function InstallOpenshiftBeforeYouBegin(props) {
       <ul>
         <li>
           <p>
-            A <Link href={`${baseUrl}/getting-started/compatibility#openshift`}>compatible OpenShift cluster</Link>
+            A <Link href={`${baseUrl}/getting-started/compatibility`}>compatible OpenShift cluster</Link>
           </p>
           <p>
             Your environment meets the {prodname}{' '}
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/compatibility.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/compatibility.mdx
index 5ed27d9d75..f3e3ce7e55 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/compatibility.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/compatibility.mdx
@@ -2,125 +2,23 @@
 description: Lists versions of Calico Enterprise and Kubernetes for each platform.
 ---
 
+import PlatformMatrix from '@site/src/___new___/components/PlatformMatrix';
+
 # Support and compatibility
 
 ## Supported platforms
 
 The following list shows the platforms supported in this release. If you're working with a version older than these, consult the [documentation archive](https://docs.tigera.io/archive) or contact Support.
 
-- [AKS](#aks)
-- [EKS](#eks)
-- [GKE](#gke)
-- [kOps on AWS](#kops-on-aws)
-- [Kubernetes-kubeadm](#kubernetes-kubeadm)
-- [MKE 4k](#mke-4k)
-- [MKE](#mke)
-- [OpenShift](#openshift)
-- [RKE](#rke)
-- [RKE2](#rke2)
-- [TKG](#tkg)
-- [Charmed Kubernetes](#charmed-kubernetes)
-
 ### Supported $[prodname] features
 
 If your platform is listed below, the features in this release will work for your platform unless an individual feature topic explicitly calls out a vendor or $[prodname] limitation.
 
 Note that all Windows feature limitations are described in [Windows limitations](install-on-clusters/windows-calico/limitations.mdx), and are not called out in individual Linux topics.
 
-## AKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                                                                        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| 3.20 to current release | - $[prodname] CNI with network policy<br />- Azure CNI with $[prodname] network policy <br />- Azure CNI with $[prodname] network policy |
-
-## EKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                   |
-| ----------------------- | -------------------------------------------------------------------------------------- |
-| 3.20 to current release | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## GKE
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                       |
-| ----------------------- | ------------------------------------------ |
-| 3.20 to current release | - GKE CNI with $[prodname] network policy |
-
-## kOps on AWS
-
-| $[prodname] version | kOps and Kubernetes versions | $[prodname] support                                                                   |
-| -------------------- | ---------------------------- | -------------------------------------------------------------------------------------- |
-| 3.22                 | 1.31 - 1.34                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.21                 | 1.31 - 1.32                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.20                 | 1.29 - 1.30                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## Kubernetes-kubeadm
-
-| $[prodname] version | Kubernetes/kubeadm versions | $[prodname] support                 |
-| -------------------- | --------------------------- | ------------------------------------ |
-| 3.22                 | 1.31 - 1.34                 | $[prodname] CNI with network policy |
-| 3.21                 | 1.31 - 1.33                 | $[prodname] CNI with network policy |
-| 3.20                 | 1.29 - 1.31                 | $[prodname] CNI with network policy |
-
-## MKE 4k
-
-| $[prodname] version | MKE 4k version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.22                 | MKE 4k 4.1.2     | $[prodname] CNI with network policy | 1.32                |
-
-## MKE
-
-| $[prodname] version | MKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.22                 | MKE 3.9     | $[prodname] CNI with network policy | 1.34                |
-| 3.22                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.21                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.20                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-
-## OpenShift
-
-| $[prodname] version | OpenShift versions for Kubernetes | $[prodname] support                 |
-| -------------------- | --------------------------------- | ------------------------------------ |
-| 3.22                 | 4.17 - 4.20                       | $[prodname] CNI with network policy |
-| 3.21                 | 4.16 - 4.18                       | $[prodname] CNI with network policy |
-| 3.20                 | 4.15 - 4.17                       | $[prodname] CNI with network policy |
-
-## RKE
-
-| $[prodname] version | RKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.22                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.21                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.20                 | 1.7         | $[prodname] CNI with network policy | 1.31                |
-
-## RKE2
-
-| $[prodname] version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ------------------------------------ | ------------------- |
-| 3.22                 | $[prodname] CNI with network policy | 1.31 - 1.34         |
-| 3.21                 | $[prodname] CNI with network policy | 1.31 - 1.33         |
-| 3.20                 | $[prodname] CNI with network policy | 1.29 - 1.31         |
-
-## TKG
-
-| $[prodname] version | TKG version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.22                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.21                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.20                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-
-## Charmed Kubernetes
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
+## Supported Kubernetes versions by platform
 
-| $[prodname] version    | $[prodname] support                                                                      |
-| ----------------------- | ----------------------------------------------------------------------------------------- |
-| 3.20 to current release | - $[prodname] CNI with network policy |
+<PlatformMatrix />
 
 ## Supported browsers
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aks.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aks.mdx
index 01eb3b6b3c..5a121ce099 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aks.mdx
@@ -49,7 +49,7 @@ Install $[prodname] on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](../compatibility.mdx#aks)
+- A [compatible AKS cluster](../compatibility.mdx)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aws.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aws.mdx
index d4306fdb40..642da4ccf4 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aws.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/aws.mdx
@@ -32,7 +32,7 @@ Install $[prodname] with a self-managed Kubernetes cluster using Kubernetes Oper
 
 **Required**
 
-- A [compatible kOps cluster](../compatibility.mdx#kops-on-aws)
+- A [compatible kOps cluster](../compatibility.mdx)
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - Cluster meets [system requirements](requirements.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/charmed-k8s.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/charmed-k8s.mdx
index 5b16c6172f..ad5fd9f476 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/charmed-k8s.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/charmed-k8s.mdx
@@ -26,7 +26,7 @@ This guide describes how to install $[prodname] on a Charmed Kubernetes cluster.
 **Required**
 
 - Your cluster meets the [system requirements](requirements.mdx)
-- A [compatible Charmed Kubernetes cluster](../compatibility.mdx#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](../compatibility.mdx)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx
index 16e959837c..72e8482bbb 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](../compatibility.mdx#mke) with:
+- A [compatible MKE 3 cluster](../compatibility.mdx) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default $[prodname] networking plugin
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/eks.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/eks.mdx
index 16117d9b8f..3acaf5aae6 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/eks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/eks.mdx
@@ -34,7 +34,7 @@ Install $[prodname] on an EKS managed Kubernetes cluster.
 
 **Required**
 
-* You have a [compatible EKS cluster](../compatibility.mdx#eks).
+* You have a [compatible EKS cluster](../compatibility.mdx).
 * Your cluster meets the [system requirements](requirements.mdx).
 * You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 * You have a [Tigera license key and credentials](calico-enterprise.mdx).
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/gke.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/gke.mdx
index c2bcf9e72e..82b81b2d4f 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/gke.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/gke.mdx
@@ -27,7 +27,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](../compatibility.mdx#gke)
+- A [compatible GKE cluster](../compatibility.mdx)
 
 - Cluster has these Networking settings:
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
index b12b39fa78..0e8813de1c 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/generic-install.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](../../compatibility.mdx#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](../../compatibility.mdx)
 - Cluster meets [system requirements](../requirements.mdx)
 - A [Tigera license key and credentials](../calico-enterprise.mdx)
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
index 34fab5ea93..657307b529 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx
@@ -44,7 +44,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx).
 
    :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx
index 12d9dce3b2..c340b9c2f2 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](../compatibility.mdx#rke)
+- A [compatible RKE cluster](../compatibility.mdx)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](rke2.mdx).
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx
index c00c061dfa..10ff4479a2 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](../compatibility.mdx#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](../compatibility.mdx) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/tkg.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/tkg.mdx
index 6d00e7b2f5..4fa90e18f7 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/tkg.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/tkg.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](../compatibility.mdx#tkg)
+- A [compatible TKG cluster](../compatibility.mdx)
 - Configure your cluster for $[prodname] CNI
   The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until $[prodname] is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/windows-calico/rancher.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
index aba3c3afc5..1dc23738f0 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/windows-calico/rancher.mdx
@@ -17,7 +17,7 @@ Install $[prodnameWindows] on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](../../compatibility.mdx#rke)
+- A [compatible RKE cluster](../../compatibility.mdx)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
index a9ec468223..00027ca2c3 100644
--- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
+++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
@@ -27,7 +27,7 @@ Always check the [Release Notes](../../../release-notes/index.mdx) for exception
 
 ## Prerequisites
 
-Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx#openshift), and the $[prodname] operator version is v1.2.4 or greater.
+Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx), and the $[prodname] operator version is v1.2.4 or greater.
 
 :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/_includes/components/InstallOpenshiftBeforeYouBegin.js b/calico-enterprise_versioned_docs/version-3.23-1/_includes/components/InstallOpenshiftBeforeYouBegin.js
index 96afe779b3..c2e9706c54 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/_includes/components/InstallOpenshiftBeforeYouBegin.js
+++ b/calico-enterprise_versioned_docs/version-3.23-1/_includes/components/InstallOpenshiftBeforeYouBegin.js
@@ -20,7 +20,7 @@ export default function InstallOpenshiftBeforeYouBegin(props) {
       <ul>
         <li>
           <p>
-            A <Link href={`${baseUrl}/getting-started/compatibility#openshift`}>compatible OpenShift cluster</Link>
+            A <Link href={`${baseUrl}/getting-started/compatibility`}>compatible OpenShift cluster</Link>
           </p>
           <p>
             Your environment meets the {prodname}{' '}
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/compatibility.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/compatibility.mdx
index d8014f3888..f3e3ce7e55 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/compatibility.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/compatibility.mdx
@@ -2,133 +2,23 @@
 description: Lists versions of Calico Enterprise and Kubernetes for each platform.
 ---
 
+import PlatformMatrix from '@site/src/___new___/components/PlatformMatrix';
+
 # Support and compatibility
 
 ## Supported platforms
 
 The following list shows the platforms supported in this release. If you're working with a version older than these, consult the [documentation archive](https://docs.tigera.io/archive) or contact Support.
 
-- [AKS](#aks)
-- [EKS](#eks)
-- [GKE](#gke)
-- [kOps on AWS](#kops-on-aws)
-- [Kubernetes-kubeadm](#kubernetes-kubeadm)
-- [MKE 4k](#mke-4k)
-- [MKE](#mke)
-- [OpenShift](#openshift)
-- [RKE](#rke)
-- [RKE2](#rke2)
-- [TKG](#tkg)
-- [Charmed Kubernetes](#charmed-kubernetes)
-
 ### Supported $[prodname] features
 
 If your platform is listed below, the features in this release will work for your platform unless an individual feature topic explicitly calls out a vendor or $[prodname] limitation.
 
 Note that all Windows feature limitations are described in [Windows limitations](install-on-clusters/windows-calico/limitations.mdx), and are not called out in individual Linux topics.
 
-## AKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                                                                        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy<br />- Azure CNI with $[prodname] network policy <br />- Azure CNI with $[prodname] network policy |
-
-## EKS
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                                                                   |
-| ----------------------- | -------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## GKE
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
-
-| $[prodname] version    | $[prodname] support                       |
-| ----------------------- | ------------------------------------------ |
-| 3.21 to current release | - GKE CNI with $[prodname] network policy |
-
-## kOps on AWS
-
-| $[prodname] version | kOps and Kubernetes versions | $[prodname] support                                                                   |
-| -------------------- | ---------------------------- | -------------------------------------------------------------------------------------- |
-| 3.23                 | 1.33 - 1.34                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.22                 | 1.31 - 1.34                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.21                 | 1.31 - 1.32                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-| 3.20                 | 1.29 - 1.30                  | - $[prodname] CNI with network policy<br />- AWS CNI with $[prodname] network policy |
-
-## Kubernetes-kubeadm
-
-| $[prodname] version | Kubernetes/kubeadm versions | $[prodname] support                 |
-| -------------------- | --------------------------- | ------------------------------------ |
-| 3.23                 | 1.33 - 1.35                 | $[prodname] CNI with network policy |
-| 3.22                 | 1.31 - 1.34                 | $[prodname] CNI with network policy |
-| 3.21                 | 1.31 - 1.33                 | $[prodname] CNI with network policy |
-| 3.20                 | 1.29 - 1.31                 | $[prodname] CNI with network policy |
-
-## MKE 4k
-
-| $[prodname] version | MKE 4k version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | MKE 4k 4.1.2     | $[prodname] CNI with network policy | 1.32                |
-| 3.22                 | MKE 4k 4.1.2     | $[prodname] CNI with network policy | 1.32                |
-
-## MKE
-
-| $[prodname] version | MKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.22                 | MKE 3.9     | $[prodname] CNI with network policy | 1.34                |
-| 3.22                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.21                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-| 3.20                 | MKE 3.8     | $[prodname] CNI with network policy | 1.31                |
-
-## OpenShift
-
-| $[prodname] version | OpenShift versions for Kubernetes | $[prodname] support                 |
-| -------------------- | --------------------------------- | ------------------------------------ |
-| 3.23                 | 4.18 - 4.20                       | $[prodname] CNI with network policy |
-| 3.22                 | 4.17 - 4.20                       | $[prodname] CNI with network policy |
-| 3.21                 | 4.16 - 4.18                       | $[prodname] CNI with network policy |
-| 3.20                 | 4.15 - 4.17                       | $[prodname] CNI with network policy |
-
-## RKE
-
-| $[prodname] version | RKE version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.22                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.21                 | 1.8         | $[prodname] CNI with network policy | 1.32                |
-| 3.20                 | 1.7         | $[prodname] CNI with network policy | 1.31                |
-
-## RKE2
-
-| $[prodname] version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ------------------------------------ | ------------------- |
-| 3.23                 | $[prodname] CNI with network policy | 1.33 - 1.34         |
-| 3.22                 | $[prodname] CNI with network policy | 1.31 - 1.34         |
-| 3.21                 | $[prodname] CNI with network policy | 1.31 - 1.33         |
-| 3.20                 | $[prodname] CNI with network policy | 1.29 - 1.31         |
-
-## TKG
-
-| $[prodname] version | TKG version | $[prodname] support                 | Kubernetes versions |
-| -------------------- | ----------- | ------------------------------------ | ------------------- |
-| 3.23                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.22                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.21                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-| 3.20                 | 2.4         | $[prodname] CNI with network policy | 1.27                |
-
-## Charmed Kubernetes
-
-Kubernetes version support aligns with [upstream Kubernetes](#kubernetes-kubeadm) to the latest version if available.
+## Supported Kubernetes versions by platform
 
-| $[prodname] version    | $[prodname] support                                                                      |
-| ----------------------- | ----------------------------------------------------------------------------------------- |
-| 3.21 to current release | - $[prodname] CNI with network policy |
+<PlatformMatrix />
 
 ## Supported browsers
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aks.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aks.mdx
index 59c9d15dfb..1395ea2585 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aks.mdx
@@ -49,7 +49,7 @@ Install $[prodname] on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](../compatibility.mdx#aks)
+- A [compatible AKS cluster](../compatibility.mdx)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aws.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aws.mdx
index d4306fdb40..642da4ccf4 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aws.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/aws.mdx
@@ -32,7 +32,7 @@ Install $[prodname] with a self-managed Kubernetes cluster using Kubernetes Oper
 
 **Required**
 
-- A [compatible kOps cluster](../compatibility.mdx#kops-on-aws)
+- A [compatible kOps cluster](../compatibility.mdx)
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - Cluster meets [system requirements](requirements.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/charmed-k8s.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/charmed-k8s.mdx
index 5c2c0ea848..f57ff5db22 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/charmed-k8s.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/charmed-k8s.mdx
@@ -26,7 +26,7 @@ This guide describes how to install $[prodname] on a Charmed Kubernetes cluster.
 **Required**
 
 - Your cluster meets the [system requirements](requirements.mdx)
-- A [compatible Charmed Kubernetes cluster](../compatibility.mdx#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](../compatibility.mdx)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](calico-enterprise.mdx)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/docker-enterprise.mdx
index b5876d9c8d..8dc0223897 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/docker-enterprise.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/docker-enterprise.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](../compatibility.mdx#mke) with:
+- A [compatible MKE 3 cluster](../compatibility.mdx) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default $[prodname] networking plugin
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/eks.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/eks.mdx
index efd0f2471d..2beced167b 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/eks.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/eks.mdx
@@ -34,7 +34,7 @@ Install $[prodname] on an EKS managed Kubernetes cluster.
 
 **Required**
 
-* You have a [compatible EKS cluster](../compatibility.mdx#eks).
+* You have a [compatible EKS cluster](../compatibility.mdx).
 * Your cluster meets the [system requirements](requirements.mdx).
 * You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 * You have a [Tigera license key and credentials](calico-enterprise.mdx).
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/gke.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/gke.mdx
index 91db5bc2d8..c7f8a6f70c 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/gke.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/gke.mdx
@@ -27,7 +27,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](../compatibility.mdx#gke)
+- A [compatible GKE cluster](../compatibility.mdx)
 
 - Cluster has these Networking settings:
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/generic-install.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/generic-install.mdx
index 090749fce1..baae6f2dec 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/generic-install.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/generic-install.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](../../compatibility.mdx#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](../../compatibility.mdx)
 - Cluster meets [system requirements](../requirements.mdx)
 - A [Tigera license key and credentials](../calico-enterprise.mdx)
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx
index 0c26597196..da7e87312a 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx
@@ -44,7 +44,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](../../compatibility.mdx).
 
    :::note
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rancher.mdx
index 12d9dce3b2..c340b9c2f2 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rancher.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](../compatibility.mdx#rke)
+- A [compatible RKE cluster](../compatibility.mdx)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](rke2.mdx).
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rke2.mdx
index c00c061dfa..10ff4479a2 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rke2.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/rke2.mdx
@@ -23,7 +23,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](../compatibility.mdx#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](../compatibility.mdx) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/tkg.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/tkg.mdx
index a3dced4139..fa0e2c3d5c 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/tkg.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/tkg.mdx
@@ -25,7 +25,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](../compatibility.mdx#tkg)
+- A [compatible TKG cluster](../compatibility.mdx)
 - Configure your cluster for $[prodname] CNI
   The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until $[prodname] is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/windows-calico/rancher.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/windows-calico/rancher.mdx
index aba3c3afc5..1dc23738f0 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/windows-calico/rancher.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/install-on-clusters/windows-calico/rancher.mdx
@@ -17,7 +17,7 @@ Install $[prodnameWindows] on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](../../compatibility.mdx#rke)
+- A [compatible RKE cluster](../../compatibility.mdx)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
diff --git a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
index 0c086af89f..dbff499a2d 100644
--- a/calico-enterprise_versioned_docs/version-3.23-1/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
+++ b/calico-enterprise_versioned_docs/version-3.23-1/getting-started/upgrading/upgrading-enterprise/openshift-upgrade.mdx
@@ -27,7 +27,7 @@ Always check the [Release Notes](../../../release-notes/index.mdx) for exception
 
 ## Prerequisites
 
-Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx#openshift), and the $[prodname] operator version is v1.2.4 or greater.
+Ensure that your $[prodname] OpenShift cluster is running a supported version of [OpenShift Container Platform](../../compatibility.mdx), and the $[prodname] operator version is v1.2.4 or greater.
 
 :::note
 
diff --git a/src/___new___/components/PlatformMatrix/index.js b/src/___new___/components/PlatformMatrix/index.js
new file mode 100644
index 0000000000..39683593cb
--- /dev/null
+++ b/src/___new___/components/PlatformMatrix/index.js
@@ -0,0 +1,87 @@
+import React from 'react';
+import Link from '@docusaurus/Link';
+import {
+  CE_VERSIONS,
+  VISIBLE_COLUMN_COUNT,
+  PLATFORMS,
+  getEntries,
+} from '../../data/platformMatrixData';
+
+function Entry({ entry }) {
+  const { platformVersion, k8sVersions } = entry;
+  if (platformVersion && k8sVersions) {
+    return (
+      <>
+        {platformVersion}
+        <br />
+        <span style={{ fontSize: '0.9em', opacity: 0.75 }}>k8s {k8sVersions}</span>
+      </>
+    );
+  }
+  return <>{platformVersion ?? k8sVersions ?? '—'}</>;
+}
+
+function Cell({ platform, version }) {
+  const entries = getEntries(platform, version);
+  if (entries.length === 0) return '—';
+  return (
+    <>
+      {entries.map((e, i) => (
+        <div key={i} style={{ marginTop: i === 0 ? 0 : '0.5em' }}>
+          <Entry entry={e} />
+        </div>
+      ))}
+    </>
+  );
+}
+
+export default function PlatformMatrix() {
+  const columns = CE_VERSIONS.slice(-VISIBLE_COLUMN_COUNT).reverse();
+  const noted = PLATFORMS.filter((p) => p.notes);
+
+  return (
+    <>
+      <table>
+        <thead>
+          <tr>
+            <th>Platform</th>
+            {columns.map((v) => (
+              <th key={v}>CE {v}</th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {PLATFORMS.map((platform) => (
+            <tr key={platform.id}>
+              <td>
+                {platform.installPath ? (
+                  <Link to={platform.installPath}>
+                    <strong>{platform.label}</strong>
+                  </Link>
+                ) : (
+                  <strong>{platform.label}</strong>
+                )}
+                {platform.notes && <sup>*</sup>}
+              </td>
+              {columns.map((v) => (
+                <td key={v}>
+                  <Cell platform={platform} version={v} />
+                </td>
+              ))}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+      {noted.length > 0 && (
+        <p style={{ fontSize: '0.9em' }}>
+          {noted.map((p) => (
+            <span key={p.id}>
+              * {p.notes}
+              <br />
+            </span>
+          ))}
+        </p>
+      )}
+    </>
+  );
+}
diff --git a/src/___new___/data/platformMatrixData.js b/src/___new___/data/platformMatrixData.js
new file mode 100644
index 0000000000..3f92d73f43
--- /dev/null
+++ b/src/___new___/data/platformMatrixData.js
@@ -0,0 +1,168 @@
+/**
+ * Platform compatibility data for Calico Enterprise.
+ *
+ * Single source of truth for the matrix on the compatibility page and
+ * (eventually) for platform-specific snippets on the per-platform install pages.
+ *
+ * Per-platform fields:
+ *   id            unique key.
+ *   label         display name in the row header.
+ *   installPath   link target wrapped around the row label.
+ *   cni           supported CNI options for this platform.
+ *   notes         footnote rendered under the table; row label gets a *.
+ *   alignedWith   id of another platform whose `versions` data this platform
+ *                 inherits — used for AKS/EKS/GKE/Charmed which align with
+ *                 kubeadm's k8s ranges. Update kubeadm and they all follow.
+ *   versions      { [ceVersion]: SupportEntry[] }. Required unless alignedWith.
+ *
+ * Each cell holds 0+ SupportEntry items: { k8sVersions?, platformVersion? }.
+ *   - 0 entries  → cell renders "—".
+ *   - 1 entry    → single line, platformVersion above k8s sub-line.
+ *   - 2+ entries → stacked (e.g. MKE on CE 3.22 has both 3.9 and 3.8).
+ */
+
+export const CE_VERSIONS = ['3.20', '3.21', '3.22', '3.23'];
+export const VISIBLE_COLUMN_COUNT = 3;
+
+const CALICO_CNI = '$[prodname] CNI with network policy';
+
+export const PLATFORMS = [
+  {
+    id: 'aks',
+    label: 'AKS',
+    installPath: 'install-on-clusters/aks',
+    cni: [CALICO_CNI, 'Azure CNI with $[prodname] network policy'],
+    alignedWith: 'kubeadm',
+  },
+  {
+    id: 'eks',
+    label: 'EKS',
+    installPath: 'install-on-clusters/eks',
+    cni: [CALICO_CNI, 'AWS CNI with $[prodname] network policy'],
+    alignedWith: 'kubeadm',
+  },
+  {
+    id: 'gke',
+    label: 'GKE',
+    installPath: 'install-on-clusters/gke',
+    cni: ['GKE CNI with $[prodname] network policy'],
+    alignedWith: 'kubeadm',
+  },
+  {
+    id: 'charmed',
+    label: 'Charmed Kubernetes',
+    installPath: 'install-on-clusters/charmed-k8s',
+    cni: [CALICO_CNI],
+    alignedWith: 'kubeadm',
+  },
+  {
+    id: 'kubeadm',
+    label: 'Kubernetes (kubeadm)',
+    installPath: 'install-on-clusters/kubernetes',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ k8sVersions: '1.33 - 1.35' }],
+      '3.22': [{ k8sVersions: '1.31 - 1.34' }],
+      '3.21': [{ k8sVersions: '1.31 - 1.33' }],
+      '3.20': [{ k8sVersions: '1.29 - 1.31' }],
+    },
+  },
+  {
+    id: 'kops',
+    label: 'kOps on AWS',
+    installPath: 'install-on-clusters/aws',
+    cni: [CALICO_CNI, 'AWS CNI with $[prodname] network policy'],
+    versions: {
+      '3.23': [{ k8sVersions: '1.33 - 1.34' }],
+      '3.22': [{ k8sVersions: '1.31 - 1.34' }],
+      '3.21': [{ k8sVersions: '1.31 - 1.32' }],
+      '3.20': [{ k8sVersions: '1.29 - 1.30' }],
+    },
+  },
+  {
+    id: 'mke',
+    label: 'MKE',
+    installPath: 'install-on-clusters/docker-enterprise',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ platformVersion: 'MKE 3.9', k8sVersions: '1.34' }],
+      '3.22': [
+        { platformVersion: 'MKE 3.9', k8sVersions: '1.34' },
+        { platformVersion: 'MKE 3.8', k8sVersions: '1.31' },
+      ],
+      '3.21': [{ platformVersion: 'MKE 3.8', k8sVersions: '1.31' }],
+      '3.20': [{ platformVersion: 'MKE 3.8', k8sVersions: '1.31' }],
+    },
+  },
+  {
+    id: 'mke4k',
+    label: 'MKE 4k',
+    installPath: 'install-on-clusters/docker-enterprise',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ platformVersion: 'MKE 4k 4.1.2', k8sVersions: '1.32' }],
+      '3.22': [{ platformVersion: 'MKE 4k 4.1.2', k8sVersions: '1.32' }],
+    },
+  },
+  {
+    id: 'openshift',
+    label: 'OpenShift',
+    installPath: 'install-on-clusters/openshift/installation',
+    cni: [CALICO_CNI],
+    notes: 'OpenShift cells show OpenShift releases, not Kubernetes versions.',
+    versions: {
+      '3.23': [{ platformVersion: '4.18 - 4.20' }],
+      '3.22': [{ platformVersion: '4.17 - 4.20' }],
+      '3.21': [{ platformVersion: '4.16 - 4.18' }],
+      '3.20': [{ platformVersion: '4.15 - 4.17' }],
+    },
+  },
+  {
+    id: 'rke',
+    label: 'RKE',
+    installPath: 'install-on-clusters/rancher',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ platformVersion: 'RKE 1.8', k8sVersions: '1.32' }],
+      '3.22': [{ platformVersion: 'RKE 1.8', k8sVersions: '1.32' }],
+      '3.21': [{ platformVersion: 'RKE 1.8', k8sVersions: '1.32' }],
+      '3.20': [{ platformVersion: 'RKE 1.7', k8sVersions: '1.31' }],
+    },
+  },
+  {
+    id: 'rke2',
+    label: 'RKE2',
+    installPath: 'install-on-clusters/rke2',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ k8sVersions: '1.33 - 1.34' }],
+      '3.22': [{ k8sVersions: '1.31 - 1.34' }],
+      '3.21': [{ k8sVersions: '1.31 - 1.33' }],
+      '3.20': [{ k8sVersions: '1.29 - 1.31' }],
+    },
+  },
+  {
+    id: 'tkg',
+    label: 'TKG',
+    installPath: 'install-on-clusters/tkg',
+    cni: [CALICO_CNI],
+    versions: {
+      '3.23': [{ platformVersion: 'TKG 2.4', k8sVersions: '1.27' }],
+      '3.22': [{ platformVersion: 'TKG 2.4', k8sVersions: '1.27' }],
+      '3.21': [{ platformVersion: 'TKG 2.4', k8sVersions: '1.27' }],
+      '3.20': [{ platformVersion: 'TKG 2.4', k8sVersions: '1.27' }],
+    },
+  },
+];
+
+export function getPlatform(id) {
+  return PLATFORMS.find((p) => p.id === id);
+}
+
+export function getEntries(platform, ceVersion) {
+  if (!platform) return [];
+  if (platform.alignedWith) {
+    return getEntries(getPlatform(platform.alignedWith), ceVersion);
+  }
+  return platform.versions?.[ceVersion] ?? [];
+}
diff --git a/static/calico-enterprise/llms-full.txt b/static/calico-enterprise/llms-full.txt
index 332ea2b771..4d2e8554ff 100644
--- a/static/calico-enterprise/llms-full.txt
+++ b/static/calico-enterprise/llms-full.txt
@@ -831,7 +831,7 @@ A Linux host that meets the following requirements.
 
 ### Install Kubernetes[​](#install-kubernetes)
 
-1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#kubernetes-kubeadm).
+1. [Follow the Kubernetes instructions to install kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/). For a compatible version for this release, see [Support and compatibility](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility).
 
    > **SECONDARY:** After installing kubeadm, do not power down or restart the host. Instead, continue directly to the next step.
 
@@ -1121,7 +1121,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible Kubernetes cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#kubernetes-kubeadm)
+- A [compatible Kubernetes cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 - Cluster meets [system requirements](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/requirements)
 - A [Tigera license key and credentials](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/calico-enterprise)
 
@@ -1541,7 +1541,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible OpenShift cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#openshift)
+- A [compatible OpenShift cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
   Your environment meets the <!-- -->Calico Enterprise<!-- --> [system requirements](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/openshift/requirements)
 
@@ -2341,7 +2341,7 @@ Install Calico Enterprise on an AKS managed Kubernetes cluster.
 
 **Required**
 
-- A [compatible AKS cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#aks)
+- A [compatible AKS cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
   - To use the Calico CNI, you must configure the AKS cluster with [Bring your own CNI](https://docs.microsoft.com/en-us/azure/aks/use-byo-cni?tabs=azure-cli)
   - To use the Azure CNI, see [Azure CNI networking](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni)
@@ -2540,7 +2540,7 @@ Install Calico Enterprise on an EKS managed Kubernetes cluster.
 
 **Required**
 
-- You have a [compatible EKS cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#eks).
+- You have a [compatible EKS cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility).
 - Your cluster meets the [system requirements](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/requirements).
 - You [disabled network policy for the AWS VPC CNI](https://docs.aws.amazon.com/eks/latest/userguide/network-policy-disable.html).
 - You have a [Tigera license key and credentials](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/calico-enterprise).
@@ -2748,7 +2748,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible GKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#gke)
+- A [compatible GKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
 - Cluster has these Networking settings:
 
@@ -2890,7 +2890,7 @@ Install Calico Enterprise with a self-managed Kubernetes cluster using Kubernete
 
 **Required**
 
-- A [compatible kOps cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#kops-on-aws)
+- A [compatible kOps cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 - A [Tigera license key and credentials](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/calico-enterprise)
 - Cluster meets [system requirements](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/requirements)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
@@ -3030,7 +3030,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible MKE 3 cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#mke) with:
+- A [compatible MKE 3 cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility) with:
 
   - A minimum of three nodes for non-production deployments
   - CNI flag set to unmanaged, `--unmanaged-cni` so MKE 3 does not install the default Calico Enterprise networking plugin
@@ -3350,7 +3350,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#rke)
+- A [compatible RKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/). Note that RKE2 is a different Kubernetes distribution and [documented separately](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/rke2).
 
@@ -3474,7 +3474,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible RKE2 cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#rke2) with 2.6.5 or later
+- A [compatible RKE2 cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility) with 2.6.5 or later
 
   For help, see [Rancher Kubernetes Engine cluster](https://rancher.com/docs/rke/latest/en/).
 
@@ -3740,7 +3740,7 @@ The geeky details of what you get:
 
 **Required**
 
-- A [compatible TKG cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#tkg)
+- A [compatible TKG cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
 - Configure your cluster for Calico Enterprise CNI The workload cluster must be configured with `CNI: none`. When the workload cluster is bootstrapped, the nodes will be in a `NotReady` state until Calico Enterprise is installed. For more information, see [Tanzu networking](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-k8s-clusters-networking.html) and [Tanzu configuration file reference](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.4/vmware-tanzu-kubernetes-grid-14/GUID-tanzu-config-reference.html).
 
@@ -3883,7 +3883,7 @@ This guide describes how to install Calico Enterprise on a Charmed Kubernetes cl
 **Required**
 
 - Your cluster meets the [system requirements](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/requirements)
-- A [compatible Charmed Kubernetes cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#charmed-kubernetes)
+- A [compatible Charmed Kubernetes cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 - A [compatible Charmed Kubernetes bundle](https://github.com/charmed-kubernetes/bundle/tree/main/releases) configured without a CNI
 - A [Tigera license key and credentials](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/calico-enterprise)
 - [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
@@ -5286,7 +5286,7 @@ Install Calico Enterprise for Windows on Rancher Kubernetes Engine (RKE).
 
 **Required**
 
-- A [compatible RKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#rke)
+- A [compatible RKE cluster](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility)
 
 - An RKE cluster provisioned with [no network plugin](https://rancher.com/docs/rke/latest/en/config-options/add-ons/network-plugins#disabling-deployment-of-a-network-plug-in)
 
@@ -8588,7 +8588,7 @@ If you are several versions behind where you want to be, you must go through eac
 
 ## Prerequisites[​](#prerequisites)
 
-Ensure that your Calico Enterprise OpenShift cluster is running a supported version of [OpenShift Container Platform](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility#openshift), and the Calico Enterprise operator version is v1.2.4 or greater.
+Ensure that your Calico Enterprise OpenShift cluster is running a supported version of [OpenShift Container Platform](https://docs.tigera.io/calico-enterprise/latest/getting-started/compatibility), and the Calico Enterprise operator version is v1.2.4 or greater.
 
 > **SECONDARY:** You can check if you are running the operator by checking for the existence of the operator namespace with `oc get ns tigera-operator` or issuing `oc get tigerastatus`; a successful return means your installation is using the operator.