diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc
index 2dfa9f5a5796..39daee49524b 100644
--- a/modules/persistent-storage-csi-drivers-supported.adoc
+++ b/modules/persistent-storage-csi-drivers-supported.adoc
@@ -44,30 +44,30 @@ In addition to the drivers listed in the following table, {product-title} functi
 endif::openshift-rosa,openshift-rosa-hcp,openshift-aro[]
 
 .Supported CSI drivers and features in {product-title}
-[cols=",^v,^v,^v,^v,^v,^v width="100%",options="header"]
+[cols=",^v,^v,^v,^v,^v,^v,^v width="100%",options="header"]
 |===
-|CSI driver |CSI volume snapshots  |CSI volume group snapshots ^[1]^ |CSI cloning  |CSI resize |Inline ephemeral volumes
-|AWS EBS | ✅ |  |  | ✅|
-|AWS EFS |  |  |  |  |
+|CSI driver |CSI volume snapshots  |CSI volume group snapshots ^[1]^ |CSI cloning  |CSI resize |Inline ephemeral volumes | User namespaces
+|AWS EBS | ✅ |  |  | ✅| |✅
+|AWS EFS |  |  |  |  | | 
 ifndef::openshift-rosa,openshift-rosa-hcp[]
-|Google Compute Platform (GCP) persistent disk (PD)|  ✅|  |✅^[2]^ | ✅|
-|GCP Filestore | ✅ |  | | ✅|
+|Google Compute Platform (GCP) persistent disk (PD)|  ✅|  |✅^[2]^ | ✅| ✅ |✅ 
+|GCP Filestore | ✅ |  | | ✅| |
 endif::openshift-rosa,openshift-rosa-hcp[]
 ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
-|{ibm-power-server-name} Block |   |  |   | ✅ |
-|{ibm-cloud-name} Block | ✅^[3]^ |  |   | ✅^[3]^|
+|{ibm-power-server-name} Block |   |  |   | ✅ | | ✅
+|{ibm-cloud-name} Block | ✅^[3]^ |  |   | ✅^[3]^| |✅
 endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
-|LVM Storage | ✅ |  | ✅ | ✅ |
+|LVM Storage | ✅ |  | ✅ | ✅ | |✅
 ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
-|Microsoft Azure Disk | ✅ |  | ✅ | ✅|
-|Microsoft Azure Stack Hub | ✅ |  | ✅ | ✅|
-|Microsoft Azure File | ✅^[4]^  |  | ✅^[4]^ | ✅| ✅
-|OpenStack Cinder | ✅ |  | ✅ | ✅|
-|OpenShift Data Foundation | ✅ | ✅ | ✅ | ✅|
-|OpenStack Manila | ✅ |  |   | ✅  |
-|Shared Resource |   |  |   |   | ✅
-|CIFS/SMB |   |  | ✅  |   |
-|VMware vSphere | ✅^[5]^ |  |   | ✅^[6]^|
+|Microsoft Azure Disk | ✅ |  | ✅ | ✅| |✅
+|Microsoft Azure Stack Hub | ✅ |  | ✅ | ✅| |✅
+|Microsoft Azure File | ✅^[4]^  |  | ✅^[4]^ | ✅| ✅ |
+|OpenStack Cinder | ✅ |  | ✅ | ✅| |✅
+|OpenShift Data Foundation | ✅ | ✅ | ✅ | ✅| |✅ ^[5]^
+|OpenStack Manila | ✅ |  |   | ✅  | |
+|Shared Resource |   |  |   |   | ✅ |
+|CIFS/SMB |   |  | ✅  |   | |
+|VMware vSphere | ✅^[6]^ |  |   | ✅^[7]^| |✅ 
 endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 |===
 ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
@@ -94,13 +94,17 @@ include::snippets/technology-preview.adoc[leveloffset=+1]
 :FeatureName: Azure File CSI cloning and snapshot
 include::snippets/technology-preview.adoc[leveloffset=+1]
 
-5.
+5. 
+
+RBD supports user namespaces; CephFS does not.
+
+6.
 
 * Requires vSphere version 8.0 Update 1 or later for both vCenter Server and ESXi.
 
 * Does not support fileshare volumes.
 
-6.
+7.
 
 * Online expansion is supported from vSphere version 8.0 Update 1 and later.
 --
diff --git a/nodes/pods/nodes-pods-user-namespaces.adoc b/nodes/pods/nodes-pods-user-namespaces.adoc
index 3fe6af052fc2..7699d9f3fd02 100644
--- a/nodes/pods/nodes-pods-user-namespaces.adoc
+++ b/nodes/pods/nodes-pods-user-namespaces.adoc
@@ -19,6 +19,8 @@ When running a pod in an isolated user namespace, the UID/GID inside a pod conta
 Not all file systems currently support ID-mapped mounts, such as Network File Systems (NFS) and other network/distributed file systems. Any pod that is using an NFS-backed persistent volume from a vendor that does not support ID-mapped mounts might experience access or permission issues when running in a user namespace. This behavior is not specific to {product-title}. It applies to all Kubernetes distributions from Kubernetes v1.33 and later.
 ====
 
+To check user namespaces support for storage options, see xref:../../storage/container_storage_interface/persistent-storage-csi.adoc#csi-drivers-supported_persistent-storage-csi[CSI drivers supported by {product-title}].
+
 // The following include statements pull in the module files that comprise
 // the assembly. Include any combination of concept, procedure, or reference
 // modules required to cover the user story. You can also include other
diff --git a/storage/persistent_storage/persistent-storage-nfs.adoc b/storage/persistent_storage/persistent-storage-nfs.adoc
index 7a89412dc5a5..8567fb62e87b 100644
--- a/storage/persistent_storage/persistent-storage-nfs.adoc
+++ b/storage/persistent_storage/persistent-storage-nfs.adoc
@@ -13,6 +13,11 @@ NFS-specific information contained in a PV definition could also be defined
 directly in a `Pod` definition, doing so does not create the volume as a
 distinct cluster resource, making the volume more susceptible to conflicts.
 
+[NOTE]
+====
+The in-tree NFS provisioner does not support user namespaces.
+====
+
 [role="_additional-resources"]
 .Additional resources