diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index 28684f90ee..f754bb2d16 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -3734,13 +3734,20 @@ Distros: openshift-enterprise
 Topics:
 - Name: Release notes
   File: serverless-release-notes
+- Name: About Serverless
+  Dir: about
+  Topics:
+  - Name: Serverless overview
+    File: about-serverless
+  - Name: Knative Serving overview
+    File: about-knative-serving
+  - Name: Knative Eventing overview
+    File: about-knative-eventing
+  - Name: Serverless Functions overview
+    File: serverless-functions-about
 - Name: Discover
   Dir: discover
   Topics:
-  - Name: About OpenShift Serverless
-    File: about-serverless
-  - Name: About OpenShift Serverless Functions
-    File: serverless-functions-about
   - Name: Event sources
     File: knative-event-sources
   - Name: Brokers
diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml
index 919f81315a..c3c3021125 100644
--- a/_topic_maps/_topic_map_osd.yml
+++ b/_topic_maps/_topic_map_osd.yml
@@ -330,13 +330,20 @@ Distros: openshift-dedicated
 Topics:
 - Name: Release notes
   File: serverless-release-notes
+- Name: About Serverless
+  Dir: about
+  Topics:
+  - Name: Serverless overview
+    File: about-serverless
+  - Name: Knative Serving overview
+    File: about-knative-serving
+  - Name: Knative Eventing overview
+    File: about-knative-eventing
+  - Name: Serverless Functions overview
+    File: serverless-functions-about
 - Name: Discover
   Dir: discover
   Topics:
-  - Name: About OpenShift Serverless
-    File: about-serverless
-  - Name: About OpenShift Serverless Functions
-    File: serverless-functions-about
   - Name: Event sources
     File: knative-event-sources
   - Name: Brokers
diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
index 2996eae5c3..eb186d7df0 100644
--- a/_topic_maps/_topic_map_rosa.yml
+++ b/_topic_maps/_topic_map_rosa.yml
@@ -528,13 +528,20 @@ Distros: openshift-rosa
 Topics:
 - Name: Release notes
   File: serverless-release-notes
+- Name: About Serverless
+  Dir: about
+  Topics:
+  - Name: Serverless overview
+    File: about-serverless
+  - Name: Knative Serving overview
+    File: about-knative-serving
+  - Name: Knative Eventing overview
+    File: about-knative-eventing
+  - Name: Serverless Functions overview
+    File: serverless-functions-about
 - Name: Discover
   Dir: discover
   Topics:
-  - Name: About OpenShift Serverless
-    File: about-serverless
-  - Name: About OpenShift Serverless Functions
-    File: serverless-functions-about
   - Name: Event sources
     File: knative-event-sources
   - Name: Brokers
diff --git a/security/container_security/security-build.adoc b/security/container_security/security-build.adoc
index eeaa2c3af1..bc9ccd5549 100644
--- a/security/container_security/security-build.adoc
+++ b/security/container_security/security-build.adoc
@@ -35,6 +35,6 @@ include::modules/security-build-knative.adoc[leveloffset=+1]
 * xref:../../cicd/builds/creating-build-inputs.adoc#builds-input-secrets-configmaps_creating-build-inputs[Input secrets and config maps]
 ifndef::openshift-origin[]
 // **This section is being moved, update the link once content is in.* add link here[The CI/CD methodology and practice]
-* xref:../../serverless/discover/about-serverless.adoc#about-serverless[About OpenShift Serverless]
+* xref:../../serverless/about/about-serverless.adoc#about-serverless[About OpenShift Serverless]
 endif::[]
 * xref:../../applications/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing application composition using the Topology view]
diff --git a/serverless/about/_attributes b/serverless/about/_attributes
new file mode 120000
index 0000000000..20cc1dcb77
--- /dev/null
+++ b/serverless/about/_attributes
@@ -0,0 +1 @@
+../../_attributes/
\ No newline at end of file
diff --git a/modules/about-knative-eventing.adoc b/serverless/about/about-knative-eventing.adoc
similarity index 92%
rename from modules/about-knative-eventing.adoc
rename to serverless/about/about-knative-eventing.adoc
index 34ccb96296..033e5184ad 100644
--- a/modules/about-knative-eventing.adoc
+++ b/serverless/about/about-knative-eventing.adoc
@@ -1,10 +1,8 @@
-// Module included in the following assemblies
-//
-// * /serverless/about-serverless.adoc
-
-:_content-type: CONCEPT
-[id="about-knative-eventing_{context}"]
+:_content-type: ASSEMBLY
+[id="about-knative-eventing"]
 = Knative Eventing
+:context: about-knative-eventing
+include::_attributes/common-attributes.adoc[]
 
 Knative Eventing on {product-title} enables developers to use an link:https://www.redhat.com/en/topics/integration/what-is-event-driven-architecture[event-driven architecture] with serverless applications. An event-driven architecture is based on the concept of decoupled relationships between event producers and event consumers.
 
diff --git a/modules/about-knative-serving.adoc b/serverless/about/about-knative-serving.adoc
similarity index 91%
rename from modules/about-knative-serving.adoc
rename to serverless/about/about-knative-serving.adoc
index 3b96a6ce37..587ee362e7 100644
--- a/modules/about-knative-serving.adoc
+++ b/serverless/about/about-knative-serving.adoc
@@ -1,10 +1,9 @@
-// Module included in the following assemblies
-//
-// * /serverless/about-serverless.adoc
-
-:_content-type: CONCEPT
-[id="about-knative-serving_{context}"]
+:_content-type: ASSEMBLY
+[id="about-knative-serving"]
 = Knative Serving
+:context: about-knative-serving
+include::_attributes/common-attributes.adoc[]
+
 
 Knative Serving supports developers who want to create, deploy, and manage link:https://www.redhat.com/en/topics/cloud-native-apps[cloud-native applications]. It provides a set of objects as Kubernetes custom resource definitions (CRDs) that define and control the behavior of serverless workloads on an {product-title} cluster.
 
diff --git a/serverless/discover/about-serverless.adoc b/serverless/about/about-serverless.adoc
similarity index 74%
rename from serverless/discover/about-serverless.adoc
rename to serverless/about/about-serverless.adoc
index 766c0290f2..7e0feb26b6 100644
--- a/serverless/discover/about-serverless.adoc
+++ b/serverless/about/about-serverless.adoc
@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="about-serverless"]
-= About {ServerlessProductName}
+= {ServerlessProductName} overview
 :context: about-serverless
 include::_attributes/common-attributes.adoc[]
 
@@ -15,19 +15,9 @@ Because {ServerlessProductName} releases on a different cadence from {product-ti
 For additional information about the {ServerlessProductName} life cycle and supported platforms, refer to the link:https://access.redhat.com/support/policy/updates/openshift#ossrvless[Platform Life Cycle Policy].
 ====
 
-// Knative Serving
-include::modules/about-knative-serving.adoc[leveloffset=+1]
-
-// Knative Eventing
-include::modules/about-knative-eventing.adoc[leveloffset=+1]
-
-You can propagate an event from an xref:../../serverless/discover/knative-event-sources.adoc#knative-event-sources[event source] to multiple event sinks by using:
-
-* xref:../../serverless/discover/serverless-channels.adoc#serverless-channels[Channels and subscriptions], or
-* xref:../../serverless/develop/serverless-using-brokers.adoc#serverless-using-brokers[Brokers] and xref:../../serverless/develop/serverless-triggers.adoc#serverless-triggers[Triggers].
-
 // add something about CLI tools?
 
+
 [id="additional-resources_about-serverless"]
 [role="_additional-resources"]
 == Additional resources
diff --git a/serverless/about/images b/serverless/about/images
new file mode 120000
index 0000000000..847b03ed05
--- /dev/null
+++ b/serverless/about/images
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
diff --git a/serverless/about/modules b/serverless/about/modules
new file mode 120000
index 0000000000..36719b9de7
--- /dev/null
+++ b/serverless/about/modules
@@ -0,0 +1 @@
+../../modules/
\ No newline at end of file
diff --git a/serverless/discover/serverless-functions-about.adoc b/serverless/about/serverless-functions-about.adoc
similarity index 100%
rename from serverless/discover/serverless-functions-about.adoc
rename to serverless/about/serverless-functions-about.adoc
index 62997b2855..1bd87575f4 100644
--- a/serverless/discover/serverless-functions-about.adoc
+++ b/serverless/about/serverless-functions-about.adoc
@@ -14,8 +14,8 @@ toc::[]
 {FunctionsProductName} provides templates that can be used to create basic functions for the following runtimes:
 
 // add xref links to docs once added
-* xref:../../serverless/functions/serverless-developing-nodejs-functions.adoc#serverless-developing-nodejs-functions[Node.js]
 * xref:../../serverless/functions/serverless-developing-quarkus-functions.adoc#serverless-developing-quarkus-functions[Quarkus]
+* xref:../../serverless/functions/serverless-developing-nodejs-functions.adoc#serverless-developing-nodejs-functions[Node.js]
 * xref:../../serverless/functions/serverless-developing-typescript-functions.adoc#serverless-developing-typescript-functions[TypeScript]
 
 [id="next-steps_serverless-functions-about"]
diff --git a/serverless/about/snippets b/serverless/about/snippets
new file mode 120000
index 0000000000..5a3f5add14
--- /dev/null
+++ b/serverless/about/snippets
@@ -0,0 +1 @@
+../../snippets/
\ No newline at end of file
diff --git a/serverless/serverless-release-notes.adoc b/serverless/serverless-release-notes.adoc
index 539d5115ec..df567b8165 100644
--- a/serverless/serverless-release-notes.adoc
+++ b/serverless/serverless-release-notes.adoc
@@ -13,7 +13,7 @@ For additional information about the {ServerlessProductName} life cycle and supp
 
 Release notes contain information about new and deprecated features, breaking changes, and known issues. The following release notes apply for the most recent {ServerlessProductName} releases on {product-title}.
 
-For an overview of {ServerlessProductName} functionality, see xref:../serverless/discover/about-serverless.adoc#about-serverless[About {ServerlessProductName}].
+For an overview of {ServerlessProductName} functionality, see xref:../serverless/about/about-serverless.adoc#about-serverless[About {ServerlessProductName}].
 
 [NOTE]
 ====