diff --git a/_topic_maps/_topic_map_ms.yml b/_topic_maps/_topic_map_ms.yml
index 1fed148b62..7a553ef2ab 100644
--- a/_topic_maps/_topic_map_ms.yml
+++ b/_topic_maps/_topic_map_ms.yml
@@ -199,6 +199,8 @@ Name: Storage
 Dir: microshift_storage
 Distros: microshift
 Topics:
+- Name: Storage
+  File: index
 - Name: Using dynamic storage with the LVMS plugin
   File: microshift-storage-plugin-overview
 - Name: Using ephemeral storage
diff --git a/microshift_storage/index.adoc b/microshift_storage/index.adoc
index d76f547b5b..5ab1e363e2 100644
--- a/microshift_storage/index.adoc
+++ b/microshift_storage/index.adoc
@@ -4,26 +4,17 @@
 include::_attributes/attributes-microshift.adoc[]
 :context: storage-overview-microshift
 
-toc::[]
+[role="_abstract"]
+{microshift-short} supports dynamic, ephemeral, and persistent storage, both for on-premise and cloud providers. You can manage container storage for persistent and non-persistent data in a {microshift-short} node.
 
-{microshift-short} supports multiple types of storage, both for on-premise and cloud providers. You can manage container storage for persistent and non-persistent data in a {microshift-short} node.
+//microshift dynamic storage with the LVMS plugin
+include::modules/microshift-dynamic-storage-LVMS-plugin.adoc[leveloffset=+1]
 
-[id="microshift-storage-types"]
-== Storage types
+//microshift ephemeral storage
+include::modules/microshift-ephemeral-storage.adoc[leveloffset=+1]
 
-{microshift-short} storage is broadly classified into two categories, namely ephemeral storage and persistent storage.
+//microshift persistent storage
+include::modules/microshift-persistent-storage.adoc[leveloffset=+1]
 
-[id="microshift-ephemeral-storage"]
-=== Ephemeral storage
-
-Pods and containers are ephemeral or transient in nature and designed for stateless applications. Ephemeral storage allows administrators and developers to better manage the local storage for some of their operations. To read details about ephemeral storage, click xref:../microshift_storage/understanding-ephemeral-storage-microshift.adoc#understanding-ephemeral-storage-microshift[Understanding ephemeral storage].
-
-[id="microshift-persistent-storage"]
-=== Persistent storage
-
-Stateful applications deployed in containers require persistent storage. {microshift-short} uses a pre-provisioned storage framework called persistent volumes (PV) to allow node administrators to provision persistent storage. The data inside these volumes can exist beyond the lifecycle of an individual pod. Developers can use persistent volume claims (PVCs) to request storage requirements. For persistent storage details, read xref:../microshift_storage/understanding-persistent-storage-microshift.adoc#understanding-persistent-storage-microshift[Understanding persistent storage].
-
-[id="microshift-dynamic-provisioning-overview"]
-=== Dynamic storage provisioning
-
-Using dynamic provisioning allows you to create storage volumes on-demand, eliminating the need for pre-provisioned storage. For more information about how dynamic provisioning works in {product-title}, read xref:../microshift_storage/microshift-storage-plugin-overview.adoc#[Dynamic provisioning using the LVMS plugin].
+//microshift dynamic provisioning overview
+include::modules/microshift-dynamic-provisioning-overview.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/modules/microshift-dynamic-provisioning-overview.adoc b/modules/microshift-dynamic-provisioning-overview.adoc
new file mode 100644
index 0000000000..34962b4cb3
--- /dev/null
+++ b/modules/microshift-dynamic-provisioning-overview.adoc
@@ -0,0 +1,11 @@
+// Module included in the following assemblies:
+//
+// * microshift-storage/index.adoc
+
+:_mod-docs-content-type: CONCEPT
+
+[id="microshift-dynamic-provisioning-overview_{context}"]
+= Dynamic storage provisioning
+
+[role="_abstract"]
+Using dynamic provisioning allows you to create storage volumes on-demand, eliminating the need for pre-provisioned storage.
\ No newline at end of file
diff --git a/modules/microshift-dynamic-storage-LVMS-plugin.adoc b/modules/microshift-dynamic-storage-LVMS-plugin.adoc
new file mode 100644
index 0000000000..669c35b519
--- /dev/null
+++ b/modules/microshift-dynamic-storage-LVMS-plugin.adoc
@@ -0,0 +1,11 @@
+// Module included in the following assemblies:
+//
+// * microshift-storage/index.adoc
+
+:_mod-docs-content-type: CONCEPT
+
+[id="microshift-dynamic-storage-LVMS-plugin_{context}"]
+= Dynamic storage with the LVMS plugin
+
+[role="_abstract"]
+Using dynamic provisioning allows you to create storage volumes on-demand, eliminating the need for pre-provisioned storage. {microshift-short} enables dynamic storage provisioning that is ready for immediate use with the logical volume manager storage (LVMS) Container Storage Interface (CSI) provider.
\ No newline at end of file
diff --git a/modules/microshift-ephemeral-storage.adoc b/modules/microshift-ephemeral-storage.adoc
new file mode 100644
index 0000000000..65993c722b
--- /dev/null
+++ b/modules/microshift-ephemeral-storage.adoc
@@ -0,0 +1,11 @@
+// Module included in the following assemblies:
+//
+// * microshift-storage/index.adoc
+
+:_mod-docs-content-type: CONCEPT
+
+[id="microshift-ephemeral-storage_{context}"]
+= Ephemeral storage
+
+[role="_abstract"]
+Pods and containers are ephemeral or transient in nature and designed for stateless applications. Ephemeral storage allows administrators and developers to better manage the local storage for some of their operations.
\ No newline at end of file
diff --git a/modules/microshift-persistent-storage.adoc b/modules/microshift-persistent-storage.adoc
new file mode 100644
index 0000000000..1e462c007b
--- /dev/null
+++ b/modules/microshift-persistent-storage.adoc
@@ -0,0 +1,11 @@
+// Module included in the following assemblies:
+//
+// * microshift-storage/index.adoc
+
+:_mod-docs-content-type: CONCEPT
+
+[id="microshift-persistent-storage_{context}"]
+= Persistent storage
+
+[role="_abstract"]
+Persistent storage in {microshift-short} enables stateful applications to retain data beyond the lifecycle of individual pods. You can use persistent volumes (PVs) to provision storage and persistent volume claims (PVCs) to request storage for your applications.
\ No newline at end of file