diff --git a/distr_tracing/distr_tracing_config/serverless-jaeger-integration.adoc b/distr_tracing/distr_tracing_config/serverless-jaeger-integration.adoc
deleted file mode 100644
index f42999dcfc..0000000000
--- a/distr_tracing/distr_tracing_config/serverless-jaeger-integration.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-:_content-type: ASSEMBLY
-[id="serverless-jaeger-integration"]
-= Integrating distributed tracing with serverless applications using OpenShift Serverless
-:context: serverless-jaeger-integration
-include::modules/common-attributes.adoc[]
-include::modules/serverless-document-attributes.adoc[]
-
-toc::[]
-
-You can enable distributed tracing with xref:../../serverless/serverless-getting-started.adoc#serverless-getting-started[{ServerlessProductName}] for your serverless applications on {product-title}.
-
-include::modules/serverless-jaeger-config.adoc[leveloffset=+1]
diff --git a/jaeger/jaeger_config/serverless-jaeger-integration.adoc b/jaeger/jaeger_config/serverless-jaeger-integration.adoc
deleted file mode 100644
index 03b57c3b7b..0000000000
--- a/jaeger/jaeger_config/serverless-jaeger-integration.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-:_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
-[id="serverless-jaeger-integration"]
-= Integrating Jaeger with serverless applications using OpenShift Serverless
-:context: serverless-jaeger-integration
-include::modules/common-attributes.adoc[]
-
-toc::[]
-
-Using Jaeger with xref:../../serverless/discover/about-serverless.adoc#about-serverless[{ServerlessProductName}] allows you to enable distributed tracing for your serverless applications on {product-title}.
-
-include::modules/serverless-jaeger-config.adoc[leveloffset=+1]
diff --git a/modules/knative-service-cluster-local.adoc b/modules/knative-service-cluster-local.adoc
index e13d83e5fd..3061e36654 100644
--- a/modules/knative-service-cluster-local.adoc
+++ b/modules/knative-service-cluster-local.adoc
@@ -1,3 +1,7 @@
+// Module included in the following assemblies:
+//
+// * serverless/develop/serverless-configuring-routes.adoc
+
 :_content-type: PROCEDURE
 [id="knative-service-cluster-local_{context}"]
 = Setting cluster availability to cluster local
@@ -15,6 +19,12 @@ Developers can label individual services in the cluster with the `networking.kna
 ====
 For {ServerlessProductName} 1.15.0 and newer versions, the `serving.knative.dev/visibility` label is no longer available. You must update existing services to use the `networking.knative.dev/visibility` label instead.
 ====
+// remove note for 4.10, OSD
+
+.Prerequisites
+
+* The {ServerlessOperatorName} and Knative Serving are installed on the cluster.
+* You have created a Knative service.
 
 .Procedure
 
diff --git a/modules/serverless-autoscaling-developer-maxscale.adoc b/modules/serverless-autoscaling-developer-maxscale.adoc
index dd549932ab..b29d0e5bcd 100644
--- a/modules/serverless-autoscaling-developer-maxscale.adoc
+++ b/modules/serverless-autoscaling-developer-maxscale.adoc
@@ -3,7 +3,7 @@
 // * serverless/develop/serverless-autoscaling-developer.adoc
 
 :_content-type: REFERENCE
-[id="serverless-autoscaling-developer-maxscale_context"]
+[id="serverless-autoscaling-developer-maxscale_{context}"]
 = Maximum scale bounds
 
 The maximum number of replicas that can serve an application is determined by the `maxScale` annotation. If the `maxScale` annotation is not set, there is no upper limit for the number of replicas created.
diff --git a/modules/serverless-connect-sink-source-odc.adoc b/modules/serverless-connect-sink-source-odc.adoc
index 49b25f3572..8e6226d220 100644
--- a/modules/serverless-connect-sink-source-odc.adoc
+++ b/modules/serverless-connect-sink-source-odc.adoc
@@ -1,3 +1,7 @@
+// Module included in the following assemblies:
+//
+// * serverless/develop/serverless-event-sinks.adoc
+
 :_content-type: PROCEDURE
 [id="serverless-connect-sink-source-odc_{context}"]
 = Connect an event source to a sink using the Developer perspective
diff --git a/modules/serverless-connect-trigger-sink.adoc b/modules/serverless-connect-trigger-sink.adoc
index b10455f356..cc3aac9b1e 100644
--- a/modules/serverless-connect-trigger-sink.adoc
+++ b/modules/serverless-connect-trigger-sink.adoc
@@ -1,3 +1,8 @@
+// Module included in the following assemblies:
+//
+// * serverless/develop/serverless-event-sinks.adoc
+
+:_content-type: REFERENCE
 [id="serverless-connect-trigger-sink_{context}"]
 = Connecting a trigger to a sink
 
diff --git a/modules/serverless-event-delivery-component-behaviors.adoc b/modules/serverless-event-delivery-component-behaviors.adoc
index 95b8e8acb9..4fab2e9f5e 100644
--- a/modules/serverless-event-delivery-component-behaviors.adoc
+++ b/modules/serverless-event-delivery-component-behaviors.adoc
@@ -2,6 +2,7 @@
 //
 // serverless/develop/serverless-event-delivery.adoc
 
+:_content-type: CONCEPT
 [id="serverless-event-delivery-component-behaviors_{context}"]
 = Event delivery behavior for Knative Eventing channels
 
diff --git a/modules/serverless-event-delivery-parameters.adoc b/modules/serverless-event-delivery-parameters.adoc
new file mode 100644
index 0000000000..200e0b90c6
--- /dev/null
+++ b/modules/serverless-event-delivery-parameters.adoc
@@ -0,0 +1,17 @@
+// Module included in the following assemblies:
+//
+// serverless/develop/serverless-event-delivery.adoc
+
+:_content-type: CONCEPT
+[id="serverless-event-delivery-parameters_{context}"]
+= Configurable event delivery parameters
+
+The following parameters can be configured for event delivery.
+
+Dead letter sink:: You can configure the `deadLetterSink` delivery parameter so that if an event fails to be delivered it is sent to the specified event sink.
+
+Retries:: You can set a minimum number of times that the delivery must be retried before the event is sent to the dead letter sink, by configuring the `retry` delivery parameter with an integer value.
+
+Back off delay:: You can set the `backoffDelay` delivery parameter to specify the time delay before an event delivery retry is attempted after a failure. The duration of the `backoffDelay` parameter is specified using the https://en.wikipedia.org/wiki/ISO_8601#Durations[ISO 8601] format.
+
+Back off policy:: The `backoffPolicy` delivery parameter can be used to specify the retry back off policy. The policy can be specified as either `linear` or `exponential`. When using the `linear` back off policy, the back off delay is the time interval specified between retries. When using the `exponential` backoff policy, the back off delay is equal to `backoffDelay*2^<numberOfRetries>`.
diff --git a/modules/serverless-openshift-routes.adoc b/modules/serverless-openshift-routes.adoc
index 2707783623..21add7a82b 100644
--- a/modules/serverless-openshift-routes.adoc
+++ b/modules/serverless-openshift-routes.adoc
@@ -1,3 +1,7 @@
+// Module included in the following assemblies:
+//
+// * serverless/develop/serverless-configuring-routes.adoc
+
 :_content-type: PROCEDURE
 [id="serverless-openshift-routes_{context}"]
 = Configuring {product-title} routes for Knative services
@@ -13,11 +17,6 @@ When you complete the following procedure, the default {product-title} route in
 
 * The {ServerlessOperatorName} and Knative Serving component must be installed on your {product-title} cluster.
 
-[NOTE]
-====
-You must modify the replaceable values in the example commands for the following procedure.
-====
-
 .Procedure
 
 . Create a Knative service that includes the `serving.knative.openshift.io/disableRoute=true` annotation:
diff --git a/modules/serverless-subscription-event-delivery-config.adoc b/modules/serverless-subscription-event-delivery-config.adoc
index 3bc20f8e67..d15debd0b0 100644
--- a/modules/serverless-subscription-event-delivery-config.adoc
+++ b/modules/serverless-subscription-event-delivery-config.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// serverless/knative_eventing/serverless-event-delivery.adoc
+// serverless/develop/serverless-event-delivery.adoc
 
+:_content-type: REFERENCE
 [id="serverless-subscription-event-delivery-config_{context}"]
 = Configuring event delivery failure parameters using subscriptions
 
diff --git a/modules/specifying-sink-flag-kn.adoc b/modules/specifying-sink-flag-kn.adoc
index cb5b9e06bf..d359ce454a 100644
--- a/modules/specifying-sink-flag-kn.adoc
+++ b/modules/specifying-sink-flag-kn.adoc
@@ -1,3 +1,8 @@
+// Module included in the following assemblies:
+//
+// * serverless/develop/serverless-event-sinks.adoc
+
+:_content-type: REFERENCE
 [id="specifying-sink-flag-kn_{context}"]
 = Knative CLI --sink flag
 
diff --git a/serverless/admin_guide/serverless-admin-metrics.adoc b/serverless/admin_guide/serverless-admin-metrics.adoc
index 6e0c59e6a9..05d26ba233 100644
--- a/serverless/admin_guide/serverless-admin-metrics.adoc
+++ b/serverless/admin_guide/serverless-admin-metrics.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-admin-metrics"]
 = Metrics
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-admin-metrics
 
 toc::[]
diff --git a/serverless/admin_guide/serverless-admin-monitoring.adoc b/serverless/admin_guide/serverless-admin-monitoring.adoc
index 22588231d1..286044129a 100644
--- a/serverless/admin_guide/serverless-admin-monitoring.adoc
+++ b/serverless/admin_guide/serverless-admin-monitoring.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-admin-monitoring"]
 = Monitoring serverless components
 :context: serverless-admin-monitoring
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/admin_guide/serverless-configuration.adoc b/serverless/admin_guide/serverless-configuration.adoc
index 1f496345aa..948290a5fc 100644
--- a/serverless/admin_guide/serverless-configuration.adoc
+++ b/serverless/admin_guide/serverless-configuration.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-[id="serverless-configuration"]
-= Configuring {ServerlessProductName}
 include::modules/common-attributes.adoc[]
 include::modules/serverless-document-attributes.adoc[]
+[id="serverless-configuration"]
+= Configuring {ServerlessProductName}
 :context: serverless-configuration
 
 toc::[]
diff --git a/serverless/admin_guide/serverless-ha.adoc b/serverless/admin_guide/serverless-ha.adoc
index 44e2df83bb..659f74ede6 100644
--- a/serverless/admin_guide/serverless-ha.adoc
+++ b/serverless/admin_guide/serverless-ha.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="serverless-ha"]
 = High availability on {ServerlessProductName}
-include::modules/common-attributes.adoc[]
 :context: serverless-ha
 
 toc::[]
diff --git a/serverless/admin_guide/serverless-ossm-setup.adoc b/serverless/admin_guide/serverless-ossm-setup.adoc
index 4247ee5662..f17bb6637a 100644
--- a/serverless/admin_guide/serverless-ossm-setup.adoc
+++ b/serverless/admin_guide/serverless-ossm-setup.adoc
@@ -1,10 +1,10 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
 include::modules/ossm-document-attributes.adoc[]
-[id="serverless-ossm-setup"]
-= Integrating Service Mesh with OpenShift Serverless
-:context: serverless-ossm-setup
 include::modules/common-attributes.adoc[]
+[id="serverless-ossm-setup"]
+= Integrating {ProductShortName} with {ServerlessProductName}
+:context: serverless-ossm-setup
 
 toc::[]
 
diff --git a/serverless/cli_tools/advanced-kn-config.adoc b/serverless/cli_tools/advanced-kn-config.adoc
index e02e0c1d19..af6741ecc0 100644
--- a/serverless/cli_tools/advanced-kn-config.adoc
+++ b/serverless/cli_tools/advanced-kn-config.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="advanced-kn-config"]
 = Knative CLI advanced configuration
 :context: advanced-kn-config
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/cli_tools/installing-kn.adoc b/serverless/cli_tools/installing-kn.adoc
index 04be598ce9..7bba4b929a 100644
--- a/serverless/cli_tools/installing-kn.adoc
+++ b/serverless/cli_tools/installing-kn.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="installing-kn"]
 = Installing the Knative CLI
-:context: installing-kn
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: installing-kn
 
 toc::[]
 
diff --git a/serverless/develop/serverless-apiserversource.adoc b/serverless/develop/serverless-apiserversource.adoc
index b1c5936c76..ba8ec9de02 100644
--- a/serverless/develop/serverless-apiserversource.adoc
+++ b/serverless/develop/serverless-apiserversource.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-apiserversource"]
 = Using the API server source
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-apiserversource
 
 toc::[]
diff --git a/serverless/develop/serverless-configuring-routes.adoc b/serverless/develop/serverless-configuring-routes.adoc
index 5caa83aa7d..7652cb3feb 100644
--- a/serverless/develop/serverless-configuring-routes.adoc
+++ b/serverless/develop/serverless-configuring-routes.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-configuring-routes"]
 = Routing
 :context: serverless-configuring-routes
+include::modules/serverless-document-attributes.adoc[]
 include::modules/common-attributes.adoc[]
 
 toc::[]
diff --git a/serverless/develop/serverless-creating-channels.adoc b/serverless/develop/serverless-creating-channels.adoc
index c79e4df4f3..0d3d2dfc8a 100644
--- a/serverless/develop/serverless-creating-channels.adoc
+++ b/serverless/develop/serverless-creating-channels.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-creating-channels"]
 = Creating and deleting channels
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-creating-channels
 
 toc::[]
diff --git a/serverless/develop/serverless-custom-event-sources.adoc b/serverless/develop/serverless-custom-event-sources.adoc
index 6dd923b442..028a27d47d 100644
--- a/serverless/develop/serverless-custom-event-sources.adoc
+++ b/serverless/develop/serverless-custom-event-sources.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-custom-event-sources"]
 = Custom event sources
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-custom-event-sources
 
 toc::[]
diff --git a/serverless/develop/serverless-event-delivery.adoc b/serverless/develop/serverless-event-delivery.adoc
index f79dde1245..7b44479d45 100644
--- a/serverless/develop/serverless-event-delivery.adoc
+++ b/serverless/develop/serverless-event-delivery.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-event-delivery"]
 = Event delivery
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-event-delivery
 
 toc::[]
@@ -10,19 +10,6 @@ toc::[]
 You can configure event delivery parameters for Knative Eventing that are applied in cases where an event fails to be delivered by a xref:../../serverless/develop/serverless-subs.adoc#serverless-subs[subscription] or xref:../../serverless/develop/serverless-triggers.adoc#serverless-triggers[trigger] to a subscriber. Event delivery parameters are configured individually per subscriber.
 
 include::modules/serverless-event-delivery-component-behaviors.adoc[leveloffset=+1]
-
-[id="serverless-event-delivery-parameters"]
-== Configurable parameters
-
-The following parameters can be configured for event delivery.
-
-Dead letter sink:: You can configure the `deadLetterSink` delivery parameter so that if an event fails to be delivered it is sent to the specified event sink.
-
-Retries:: You can set a minimum number of times that the delivery must be retried before the event is sent to the dead letter sink, by configuring the `retry` delivery parameter with an integer value.
-
-Back off delay:: You can set the `backoffDelay` delivery parameter to specify the time delay before an event delivery retry is attempted after a failure. The duration of the `backoffDelay` parameter is specified using the https://en.wikipedia.org/wiki/ISO_8601#Durations[ISO 8601] format.
-
-Back off policy:: The `backoffPolicy` delivery parameter can be used to specify the retry back off policy. The policy can be specified as either `linear` or `exponential`. When using the `linear` back off policy, the back off delay is the time interval specified between retries. When using the `exponential` backoff policy, the back off delay is equal to `backoffDelay*2^<numberOfRetries>`.
-
+include::modules/serverless-event-delivery-parameters.adoc[leveloffset=+1]
 include::modules/serverless-subscription-event-delivery-config.adoc[leveloffset=+1]
 // add docs for configuration in triggers
diff --git a/serverless/develop/serverless-event-sinks.adoc b/serverless/develop/serverless-event-sinks.adoc
index 3a7fc13f18..ed13883569 100644
--- a/serverless/develop/serverless-event-sinks.adoc
+++ b/serverless/develop/serverless-event-sinks.adoc
@@ -1,21 +1,22 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-event-sinks"]
 = Event sinks
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-event-sinks
 
 toc::[]
 
 A sink is an addressable custom resource (CR) that can receive incoming events from other resources. Knative services, channels, and brokers are all examples of sinks.
 
+// Using --sink flag with kn (generic)
+include::modules/specifying-sink-flag-kn.adoc[leveloffset=+1]
+
 [TIP]
 ====
 You can configure which CRs can be used with the `--sink` flag for `kn` CLI commands by xref:../../serverless/cli_tools/advanced-kn-config.adoc#serverless-kn-config_advanced-kn-config[Customizing `kn`].
 ====
 
-// Using --sink flag with kn (generic)
-include::modules/specifying-sink-flag-kn.adoc[leveloffset=+1]
 // Connect sinks to sources in ODC
 include::modules/serverless-connect-sink-source-odc.adoc[leveloffset=+1]
 // Connect a trigger to a sink
diff --git a/serverless/develop/serverless-pingsource.adoc b/serverless/develop/serverless-pingsource.adoc
index e6efe18a3e..44e312e948 100644
--- a/serverless/develop/serverless-pingsource.adoc
+++ b/serverless/develop/serverless-pingsource.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-pingsource"]
 = Using a ping source
 :context: serverless-pingsource
+include::modules/serverless-document-attributes.adoc[]
 include::modules/common-attributes.adoc[]
 
 toc::[]
diff --git a/serverless/develop/serverless-subs.adoc b/serverless/develop/serverless-subs.adoc
index f66c65c3bc..7359309c59 100644
--- a/serverless/develop/serverless-subs.adoc
+++ b/serverless/develop/serverless-subs.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-subs"]
 = Subscriptions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-subs
 
 toc::[]
diff --git a/serverless/functions/serverless-developing-go-functions.adoc b/serverless/functions/serverless-developing-go-functions.adoc
index 7f4ac79712..4314da2350 100644
--- a/serverless/functions/serverless-developing-go-functions.adoc
+++ b/serverless/functions/serverless-developing-go-functions.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-developing-go-functions"]
 = Developing Golang functions
 :context: serverless-developing-go-functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-developing-nodejs-functions.adoc b/serverless/functions/serverless-developing-nodejs-functions.adoc
index 48ae6b37c5..ed45231c25 100644
--- a/serverless/functions/serverless-developing-nodejs-functions.adoc
+++ b/serverless/functions/serverless-developing-nodejs-functions.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-developing-nodejs-functions"]
 = Developing Node.js functions
 :context: serverless-developing-nodejs-functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-developing-python-functions.adoc b/serverless/functions/serverless-developing-python-functions.adoc
index 13aed73365..be156c3ee6 100644
--- a/serverless/functions/serverless-developing-python-functions.adoc
+++ b/serverless/functions/serverless-developing-python-functions.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-developing-python-functions"]
 = Developing Python functions
 :context: serverless-developing-python-functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-developing-quarkus-functions.adoc b/serverless/functions/serverless-developing-quarkus-functions.adoc
index c4efaf2c33..8081079e0c 100644
--- a/serverless/functions/serverless-developing-quarkus-functions.adoc
+++ b/serverless/functions/serverless-developing-quarkus-functions.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-developing-quarkus-functions"]
 = Developing Quarkus functions
 :context: serverless-developing-quarkus-functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-developing-typescript-functions.adoc b/serverless/functions/serverless-developing-typescript-functions.adoc
index 9f190ac75d..1fc8df6b22 100644
--- a/serverless/functions/serverless-developing-typescript-functions.adoc
+++ b/serverless/functions/serverless-developing-typescript-functions.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-developing-typescript-functions"]
 = Developing TypeScript functions
 :context: serverless-developing-typescript-functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
@@ -36,4 +36,3 @@ include::modules/serverless-testing-typescript-functions.adoc[leveloffset=+1]
 * See the xref:../../serverless/functions/serverless-functions-reference-guide.adoc#serverless-typescript-context-object-reference_serverless-functions-reference-guide[TypeScript context object reference] documentation.
 * xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-build-func-kn_serverless-functions-getting-started[Build] and xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-deploy-func-kn_serverless-functions-getting-started[deploy] a function.
 * See link:https://getpino.io/#/docs/api[the Pino API documentation] for more information on logging with functions.
-
diff --git a/serverless/functions/serverless-functions-accessing-secrets-configmaps.adoc b/serverless/functions/serverless-functions-accessing-secrets-configmaps.adoc
index f248e4b5c8..46523c93ab 100644
--- a/serverless/functions/serverless-functions-accessing-secrets-configmaps.adoc
+++ b/serverless/functions/serverless-functions-accessing-secrets-configmaps.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-accessing-secrets-configmaps"]
-= Accessing secrets and config maps from Serverless functions
+= Accessing secrets and config maps from serverless functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-functions-secrets
 
 toc::[]
diff --git a/serverless/functions/serverless-functions-annotations.adoc b/serverless/functions/serverless-functions-annotations.adoc
index af698b00f3..87b69c7147 100644
--- a/serverless/functions/serverless-functions-annotations.adoc
+++ b/serverless/functions/serverless-functions-annotations.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-attributes"]
 = Adding annotations to functions
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-functions-annotations
 
 toc::[]
diff --git a/serverless/functions/serverless-functions-eventing.adoc b/serverless/functions/serverless-functions-eventing.adoc
index b942969e0c..71c5d9f7c4 100644
--- a/serverless/functions/serverless-functions-eventing.adoc
+++ b/serverless/functions/serverless-functions-eventing.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-eventing"]
 = Using functions with Knative Eventing
-:context: serverless-functions-eventing
+include::modules/serverless-document-attributes.adoc[]
 include::modules/common-attributes.adoc[]
+:context: serverless-functions-eventing
 
 toc::[]
 
diff --git a/serverless/functions/serverless-functions-getting-started.adoc b/serverless/functions/serverless-functions-getting-started.adoc
index 0769cba752..0d1d65e738 100644
--- a/serverless/functions/serverless-functions-getting-started.adoc
+++ b/serverless/functions/serverless-functions-getting-started.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-getting-started"]
 = Getting started with functions
 :context: serverless-functions-getting-started
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-functions-reference-guide.adoc b/serverless/functions/serverless-functions-reference-guide.adoc
index 510dedfdd9..26dbfae7c2 100644
--- a/serverless/functions/serverless-functions-reference-guide.adoc
+++ b/serverless/functions/serverless-functions-reference-guide.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-reference-guide"]
 = Functions development reference guide
-:context: serverless-functions-reference-guide
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: serverless-functions-reference-guide
 
 toc::[]
 
diff --git a/serverless/functions/serverless-functions-setup.adoc b/serverless/functions/serverless-functions-setup.adoc
index 02aae81957..136efd7ef1 100644
--- a/serverless/functions/serverless-functions-setup.adoc
+++ b/serverless/functions/serverless-functions-setup.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="serverless-functions-setup"]
 = Setting up {FunctionsProductName}
 :context: serverless-functions-setup
-include::modules/common-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/functions/serverless-functions-yaml.adoc b/serverless/functions/serverless-functions-yaml.adoc
index 75286168ca..76b75d3aaf 100644
--- a/serverless/functions/serverless-functions-yaml.adoc
+++ b/serverless/functions/serverless-functions-yaml.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-functions-project-configuration"]
 = Function project configuration in func.yaml
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-functions-yaml
 
 toc::[]
diff --git a/serverless/install/install-serverless-operator.adoc b/serverless/install/install-serverless-operator.adoc
index e02308efe2..492b539329 100644
--- a/serverless/install/install-serverless-operator.adoc
+++ b/serverless/install/install-serverless-operator.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="install-serverless-operator"]
 = Installing the {ServerlessOperatorName}
-include::modules/common-attributes.adoc[]
 :context: install-serverless-operator
 
 toc::[]
diff --git a/serverless/install/removing-openshift-serverless.adoc b/serverless/install/removing-openshift-serverless.adoc
index 4b914df01e..282b1aab6f 100644
--- a/serverless/install/removing-openshift-serverless.adoc
+++ b/serverless/install/removing-openshift-serverless.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-[id="removing-openshift-serverless"]
-= Removing {ServerlessProductName}
 include::modules/common-attributes.adoc[]
 include::modules/serverless-document-attributes.adoc[]
+[id="removing-openshift-serverless"]
+= Removing {ServerlessProductName}
 :context: removing-openshift-serverless
 
 toc::[]
diff --git a/serverless/integrations/gpu-resources.adoc b/serverless/integrations/gpu-resources.adoc
index dc9fea6615..70af2ed197 100644
--- a/serverless/integrations/gpu-resources.adoc
+++ b/serverless/integrations/gpu-resources.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="gpu-resources"]
 = Using NVIDIA GPU resources with serverless applications
 :context: gpu-resources
-include::modules/common-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/monitor/cluster-logging-serverless.adoc b/serverless/monitor/cluster-logging-serverless.adoc
index fd328bcfc2..9ea27706d5 100644
--- a/serverless/monitor/cluster-logging-serverless.adoc
+++ b/serverless/monitor/cluster-logging-serverless.adoc
@@ -1,8 +1,8 @@
-include::modules/serverless-document-attributes.adoc[]
 :_content-type: ASSEMBLY
+include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="cluster-logging-serverless"]
 = Using OpenShift Logging with {ServerlessProductName}
-include::modules/common-attributes.adoc[]
 :context: cluster-logging-serverless
 
 toc::[]
diff --git a/serverless/monitor/serverless-service-monitoring.adoc b/serverless/monitor/serverless-service-monitoring.adoc
index 92266a67af..1d35575ac2 100644
--- a/serverless/monitor/serverless-service-monitoring.adoc
+++ b/serverless/monitor/serverless-service-monitoring.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-service-monitoring"]
 = Monitoring Knative services
+include::modules/serverless-document-attributes.adoc[]
 include::modules/common-attributes.adoc[]
 :context: serverless-service-monitoring
 
diff --git a/serverless/monitor/serverless-serving-metrics.adoc b/serverless/monitor/serverless-serving-metrics.adoc
index fd2545e35f..ff7bd291d1 100644
--- a/serverless/monitor/serverless-serving-metrics.adoc
+++ b/serverless/monitor/serverless-serving-metrics.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-serving-metrics"]
 = Metrics
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-serving-metrics
 
 toc::[]
diff --git a/serverless/monitor/serverless-tracing.adoc b/serverless/monitor/serverless-tracing.adoc
index 8aeeb4273e..86bf2b46e6 100644
--- a/serverless/monitor/serverless-tracing.adoc
+++ b/serverless/monitor/serverless-tracing.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-tracing"]
 = Tracing requests using Jaeger
 :context: serverless-tracing
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/reference/kn-event-ref.adoc b/serverless/reference/kn-event-ref.adoc
index a9c52643dd..022de8e3e7 100644
--- a/serverless/reference/kn-event-ref.adoc
+++ b/serverless/reference/kn-event-ref.adoc
@@ -1,8 +1,8 @@
-include::modules/serverless-document-attributes.adoc[]
 [id="kn-event-ref"]
 = kn event
-:context: kn-event-ref
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: kn-event-ref
 
 toc::[]
 
diff --git a/serverless/reference/kn-eventing-ref.adoc b/serverless/reference/kn-eventing-ref.adoc
index 28a31e484b..5cfb702848 100644
--- a/serverless/reference/kn-eventing-ref.adoc
+++ b/serverless/reference/kn-eventing-ref.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="kn-eventing-ref"]
 = Knative Eventing CLI commands
-:context: kn-eventing-ref
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: kn-eventing-ref
 
 toc::[]
 
diff --git a/serverless/reference/kn-flags-reference.adoc b/serverless/reference/kn-flags-reference.adoc
index 1b5d08a053..0a4ad170c0 100644
--- a/serverless/reference/kn-flags-reference.adoc
+++ b/serverless/reference/kn-flags-reference.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="kn-flags-reference"]
 = kn flags reference
-:context: kn-flags-reference
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: kn-flags-reference
 
 toc::[]
 
diff --git a/serverless/reference/kn-func-ref.adoc b/serverless/reference/kn-func-ref.adoc
index a78e82a20f..411c374ffe 100644
--- a/serverless/reference/kn-func-ref.adoc
+++ b/serverless/reference/kn-func-ref.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="kn-func-ref"]
 = kn func
-:context: kn-func-ref
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: kn-func-ref
 
 toc::[]
 
diff --git a/serverless/reference/kn-serving-ref.adoc b/serverless/reference/kn-serving-ref.adoc
index 7aa63a84e4..0c72e1f394 100644
--- a/serverless/reference/kn-serving-ref.adoc
+++ b/serverless/reference/kn-serving-ref.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="kn-serving-ref"]
 = Knative Serving CLI commands
-:context: kn-serving-ref
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+:context: kn-serving-ref
 
 toc::[]
 
diff --git a/serverless/reference/serverless-listing-event-sources.adoc b/serverless/reference/serverless-listing-event-sources.adoc
index 103a8df245..706fb0991d 100644
--- a/serverless/reference/serverless-listing-event-sources.adoc
+++ b/serverless/reference/serverless-listing-event-sources.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
 [id="serverless-listing-event-sources"]
 = Listing event sources and event source types
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 :context: serverless-listing-event-sources
 
 toc::[]
diff --git a/serverless/security/serverless-custom-domains.adoc b/serverless/security/serverless-custom-domains.adoc
index 4bbe48cc4f..2136e96be4 100644
--- a/serverless/security/serverless-custom-domains.adoc
+++ b/serverless/security/serverless-custom-domains.adoc
@@ -1,10 +1,10 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
-include::modules/ossm-document-attributes.adoc[]
 [id="serverless-custom-domains"]
 = Configuring a custom domain for a Knative service
-:context: serverless-custom-domains
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+include::modules/ossm-document-attributes.adoc[]
+:context: serverless-custom-domains
 
 toc::[]
 
diff --git a/serverless/security/serverless-custom-tls-cert-domain-mapping.adoc b/serverless/security/serverless-custom-tls-cert-domain-mapping.adoc
index 133449989c..b4491c6e9c 100644
--- a/serverless/security/serverless-custom-tls-cert-domain-mapping.adoc
+++ b/serverless/security/serverless-custom-tls-cert-domain-mapping.adoc
@@ -1,10 +1,10 @@
 :_content-type: ASSEMBLY
 [id="serverless-custom-tls-cert-domain-mapping"]
 = Using a custom TLS certificate for domain mapping
-:context: serverless-custom-tls-cert-domain-mapping
 include::modules/common-attributes.adoc[]
 include::modules/serverless-document-attributes.adoc[]
 include::modules/ossm-document-attributes.adoc[]
+:context: serverless-custom-tls-cert-domain-mapping
 
 toc::[]
 
diff --git a/serverless/security/serverless-ossm-with-kourier-jwt.adoc b/serverless/security/serverless-ossm-with-kourier-jwt.adoc
index 9570469f4e..cf930a7444 100644
--- a/serverless/security/serverless-ossm-with-kourier-jwt.adoc
+++ b/serverless/security/serverless-ossm-with-kourier-jwt.adoc
@@ -1,10 +1,10 @@
 :_content-type: ASSEMBLY
-include::modules/serverless-document-attributes.adoc[]
-include::modules/ossm-document-attributes.adoc[]
 [id="serverless-ossm-with-kourier-jwt"]
 = Configuring JSON Web Token authentication for Knative services
-:context: serverless-ossm-with-kourier-jwt
 include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
+include::modules/ossm-document-attributes.adoc[]
+:context: serverless-ossm-with-kourier-jwt
 
 toc::[]
 
diff --git a/serverless/serverless-getting-started.adoc b/serverless/serverless-getting-started.adoc
index 00e59a2d0a..3fd26e85c6 100644
--- a/serverless/serverless-getting-started.adoc
+++ b/serverless/serverless-getting-started.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
+include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 [id="serverless-getting-started"]
 = Getting started with {ServerlessProductName}
 :context: serverless-getting-started
-include::modules/common-attributes.adoc[]
-include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
diff --git a/serverless/serverless-release-notes.adoc b/serverless/serverless-release-notes.adoc
index 1aeb3a9cbb..c38ce12479 100644
--- a/serverless/serverless-release-notes.adoc
+++ b/serverless/serverless-release-notes.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
+include::modules/common-attributes.adoc[]
+include::modules/serverless-document-attributes.adoc[]
 [id="serverless-release-notes"]
 = {ServerlessProductName} Release Notes
 :context: serverless-release-notes
-include::modules/common-attributes.adoc[]
-include::modules/serverless-document-attributes.adoc[]
 
 toc::[]
 
diff --git a/serverless/serverless-support.adoc b/serverless/serverless-support.adoc
index d39e1d88a2..1ed170ba1b 100644
--- a/serverless/serverless-support.adoc
+++ b/serverless/serverless-support.adoc
@@ -1,9 +1,9 @@
 :_content-type: ASSEMBLY
 include::modules/serverless-document-attributes.adoc[]
+include::modules/common-attributes.adoc[]
 [id="serverless-support"]
 = {ServerlessProductName} support
 :context: serverless-support
-include::modules/common-attributes.adoc[]
 
 toc::[]