From d2fc579c99b5ee3d21c46afbcce1ac2f0b3a0f2b Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Thu, 18 Jun 2026 18:45:20 +0530
Subject: [PATCH 01/12] Develop category JTBD content

---
 ...ate-repository-onboarding-to-the-catalog.adoc |  4 +++-
 ...n-automate-template-lifecycle-management.adoc |  6 +++++-
 .../con-automate-workflow-deployments.adoc       |  2 +-
 .../develop/con-build-serverless-workflows.adoc  |  8 +++++++-
 ...images-locally-using-the-build-sh-script.adoc |  2 +-
 ...-s3-or-openshift-data-foundation-buckets.adoc |  2 +-
 .../con-configure-bulk-import-capabilities.adoc  |  2 +-
 ...gure-techdocs-storage-and-cicd-pipelines.adoc | 11 ++++++++++-
 .../category-maps/develop/con-develop.adoc       |  2 +-
 .../con-disable-or-remove-techdocs-add-ons.adoc  |  6 +++++-
 ...-import-source-code-repositories-in-bulk.adoc |  2 +-
 ...-install-external-or-third-party-add-ons.adoc |  2 +-
 .../con-install-orchestrator-helm-charts.adoc    |  2 +-
 ...rchestrator-in-an-air-gapped-environment.adoc |  2 +-
 .../develop/con-install-techdocs-add-ons.adoc    |  6 +++++-
 .../con-manage-your-software-components.adoc     | 12 +++++++++++-
 ...ate-infrastructure-tasks-using-workflows.adoc | 11 ++++++++++-
 ...estrator-process-automation-architecture.adoc |  2 +-
 ...lt-workflow-container-image-capabilities.adoc |  2 +-
 ...-standardization-with-software-templates.adoc |  3 ++-
 ...-to-maintain-a-unified-service-inventory.adoc |  2 +-
 .../con-register-new-software-components.adoc    |  2 +-
 ...r-repository-lists-with-the-orchestrator.adoc |  2 +-
 ...oject-generation-with-software-templates.adoc |  4 +++-
 ...ap-dependencies-back-to-source-templates.adoc |  6 +++++-
 .../develop/con-use-enabled-add-ons.adoc         |  2 +-
 ...-track-template-updates-and-dependencies.adoc |  2 +-
 .../con-workflow-design-best-practices.adoc      |  2 +-
 ...n-as-code-to-keep-knowledge-synchronized.adoc |  2 +-
 ...v-automate-template-lifecycle-management.adoc |  4 ++--
 .../nav-automate-workflow-deployments.adoc       | 12 +++++++-----
 .../develop/nav-build-serverless-workflows.adoc  | 10 +++++-----
 ...images-locally-using-the-build-sh-script.adoc | 10 ++++++++++
 ...-s3-or-openshift-data-foundation-buckets.adoc | 10 ++++++++++
 .../nav-configure-bulk-import-capabilities.adoc  |  8 ++++----
 ...gure-techdocs-storage-and-cicd-pipelines.adoc |  4 ++--
 .../nav-disable-or-remove-techdocs-add-ons.adoc  |  4 ++++
 ...-import-source-code-repositories-in-bulk.adoc | 10 ++++++----
 ...-install-external-or-third-party-add-ons.adoc |  4 ++++
 .../nav-install-orchestrator-helm-charts.adoc    |  6 ++++++
 ...rchestrator-in-an-air-gapped-environment.adoc |  8 ++++++--
 .../develop/nav-install-techdocs-add-ons.adoc    |  6 +++---
 .../nav-manage-your-software-components.adoc     | 12 ++++++------
 ...ate-infrastructure-tasks-using-workflows.adoc |  2 +-
 ...estrator-process-automation-architecture.adoc |  4 ++++
 ...lt-workflow-container-image-capabilities.adoc |  6 ++++++
 ...-standardization-with-software-templates.adoc | 10 +++++-----
 .../nav-register-new-software-components.adoc    |  4 ++++
 ...r-repository-lists-with-the-orchestrator.adoc |  4 ++++
 ...oject-generation-with-software-templates.adoc |  6 +++---
 ...ap-dependencies-back-to-source-templates.adoc |  4 ++--
 .../develop/nav-use-enabled-add-ons.adoc         |  6 ++++++
 ...-track-template-updates-and-dependencies.adoc |  4 ++++
 .../nav-workflow-design-best-practices.adoc      |  4 ++++
 ...n-as-code-to-keep-knowledge-synchronized.adoc | 16 ++++++++--------
 55 files changed, 210 insertions(+), 81 deletions(-)

diff --git a/titles/product_product/category-maps/develop/con-automate-repository-onboarding-to-the-catalog.adoc b/titles/product_product/category-maps/develop/con-automate-repository-onboarding-to-the-catalog.adoc
index a3a5b96e977..a87510bb487 100644
--- a/titles/product_product/category-maps/develop/con-automate-repository-onboarding-to-the-catalog.adoc
+++ b/titles/product_product/category-maps/develop/con-automate-repository-onboarding-to-the-catalog.adoc
@@ -3,4 +3,6 @@
 = Automate repository onboarding to the catalog
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Automate repository onboarding to the catalog.
+Automate onboarding of GitHub repositories and GitLab projects to {product} catalog, and monitor import status by using bulk import capabilities.
+
+include::{docdir}/artifacts/snip-technology-preview.adoc[]
diff --git a/titles/product_product/category-maps/develop/con-automate-template-lifecycle-management.adoc b/titles/product_product/category-maps/develop/con-automate-template-lifecycle-management.adoc
index ee7b7202100..902f38ebb7b 100644
--- a/titles/product_product/category-maps/develop/con-automate-template-lifecycle-management.adoc
+++ b/titles/product_product/category-maps/develop/con-automate-template-lifecycle-management.adoc
@@ -3,4 +3,8 @@
 = Automate template lifecycle management
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Automate template lifecycle management.
+Automatically apply template updates to all downstream repositories to maintain compliance without manual file comparisons.
+
+When Software Templates receive security updates or configuration changes, you can apply those updates to all downstream repositories automatically so that your applications remain compliant without manual file comparisons.
+
+Automated template lifecycle management maintains consistency by monitoring your source templates. When a template version changes, the `scaffolder-relation-processor` plugin identifies all entities provisioned from that template and creates a pull request (PR) or merge request (MR) containing the necessary file updates, additions, or deletions.
diff --git a/titles/product_product/category-maps/develop/con-automate-workflow-deployments.adoc b/titles/product_product/category-maps/develop/con-automate-workflow-deployments.adoc
index fc80699e84e..1f05e893b83 100644
--- a/titles/product_product/category-maps/develop/con-automate-workflow-deployments.adoc
+++ b/titles/product_product/category-maps/develop/con-automate-workflow-deployments.adoc
@@ -3,4 +3,4 @@
 = Automate workflow deployments
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Automate workflow deployments.
+Automate the software development lifecycle for serverless workflows by using Orchestrator software templates to bootstrap complete workflow projects with Git repositories, deployment configurations, and CI/CD pipelines.
diff --git a/titles/product_product/category-maps/develop/con-build-serverless-workflows.adoc b/titles/product_product/category-maps/develop/con-build-serverless-workflows.adoc
index a96b847dd73..a1e2c7c92a7 100644
--- a/titles/product_product/category-maps/develop/con-build-serverless-workflows.adoc
+++ b/titles/product_product/category-maps/develop/con-build-serverless-workflows.adoc
@@ -3,4 +3,10 @@
 = Build serverless workflows
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Build serverless workflows.
+Deploy a workflow and make it available in the Orchestrator plugin by building workflow images, generating workflow manifests, and deploying workflows to a cluster.
+
+* Building workflow images
+* Generating workflow manifests
+* Deploying workflows to a cluster
+
+This process moves the workflow from your local machine to deployment on a cluster.
diff --git a/titles/product_product/category-maps/develop/con-build-workflow-container-images-locally-using-the-build-sh-script.adoc b/titles/product_product/category-maps/develop/con-build-workflow-container-images-locally-using-the-build-sh-script.adoc
index 44a8b6d39fe..9b3a8f17167 100644
--- a/titles/product_product/category-maps/develop/con-build-workflow-container-images-locally-using-the-build-sh-script.adoc
+++ b/titles/product_product/category-maps/develop/con-build-workflow-container-images-locally-using-the-build-sh-script.adoc
@@ -3,4 +3,4 @@
 = Build workflow container images locally using the build.sh script
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Build workflow container images locally using the build.sh script.
+Deploy a workflow and make it available in the Orchestrator plugin by building workflow images, generating workflow manifests, and deploying workflows to a cluster.
diff --git a/titles/product_product/category-maps/develop/con-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc b/titles/product_product/category-maps/develop/con-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
index 2dfbf26a23d..d86d023a8ce 100644
--- a/titles/product_product/category-maps/develop/con-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
+++ b/titles/product_product/category-maps/develop/con-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
@@ -3,4 +3,4 @@
 = Configure Amazon S3 or OpenShift Data Foundation buckets
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure Amazon S3 or OpenShift Data Foundation buckets.
+The TechDocs plugin is preinstalled and enabled on a {product-short} instance by default. You can configure TechDocs to use cloud storage for storing generated documentation files.
diff --git a/titles/product_product/category-maps/develop/con-configure-bulk-import-capabilities.adoc b/titles/product_product/category-maps/develop/con-configure-bulk-import-capabilities.adoc
index 65c454cb52c..5c0a4567f7d 100644
--- a/titles/product_product/category-maps/develop/con-configure-bulk-import-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/con-configure-bulk-import-capabilities.adoc
@@ -3,4 +3,4 @@
 = Configure bulk import capabilities
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure bulk import capabilities.
+Automate onboarding of GitHub repositories and GitLab projects to {product} catalog, and monitor import status by using bulk import capabilities.
diff --git a/titles/product_product/category-maps/develop/con-configure-techdocs-storage-and-cicd-pipelines.adoc b/titles/product_product/category-maps/develop/con-configure-techdocs-storage-and-cicd-pipelines.adoc
index 8113f5a14b9..a5f71e44fbf 100644
--- a/titles/product_product/category-maps/develop/con-configure-techdocs-storage-and-cicd-pipelines.adoc
+++ b/titles/product_product/category-maps/develop/con-configure-techdocs-storage-and-cicd-pipelines.adoc
@@ -3,4 +3,13 @@
 = Configure TechDocs storage and CI/CD pipelines
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure TechDocs storage and CI/CD pipelines.
+The TechDocs plugin is preinstalled and enabled on a {product-short} instance by default. You can disable or enable the TechDocs plugin, and change other parameters, by configuring the {product} Helm chart or the {product} Operator ConfigMap.
+
+[IMPORTANT]
+====
+{product} includes a built-in TechDocs builder that generates static HTML documentation from your codebase. However, the default basic setup of the local builder is not intended for production.
+====
+
+You can use a CI/CD pipeline with the repository that has a dedicated job to generate docs for TechDocs. The generated static files are stored in {odf-name} or in a cloud storage solution of your choice and published to a static HTML documentation site.
+
+After you configure {odf-name} to store the files that TechDocs generates, you can configure the TechDocs plugin to use the {odf-name} for cloud storage.
diff --git a/titles/product_product/category-maps/develop/con-develop.adoc b/titles/product_product/category-maps/develop/con-develop.adoc
index 688edce5f85..87739d5e6cf 100644
--- a/titles/product_product/category-maps/develop/con-develop.adoc
+++ b/titles/product_product/category-maps/develop/con-develop.adoc
@@ -3,4 +3,4 @@
 = Develop
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Develop.
+Use {product} to streamline software development through centralized component management, standardized templates, automated onboarding, workflow orchestration, and documentation as code.
diff --git a/titles/product_product/category-maps/develop/con-disable-or-remove-techdocs-add-ons.adoc b/titles/product_product/category-maps/develop/con-disable-or-remove-techdocs-add-ons.adoc
index 522cfe0bd70..836b21deb9f 100644
--- a/titles/product_product/category-maps/develop/con-disable-or-remove-techdocs-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/con-disable-or-remove-techdocs-add-ons.adoc
@@ -3,4 +3,8 @@
 = Disable or remove TechDocs add-ons
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Disable or remove TechDocs add-ons.
+Remove or disable installed TechDocs add-ons from your {product} instance by using the Operator or the Helm chart.
+
+Administrators can remove installed TechDocs add-ons by using either the Operator or Helm chart, depending on the method used to install the add-on. If you used the Operator to install the add-on, remove it from the ConfigMap. If you used the Helm chart to install the add-on, remove it from the Helm chart.
+
+If you want to disable a plugin instead of removing it from your {product} instance, you can disable the plugin that you are using to import the TechDocs add-on. Since the `disabled` status is controlled at the plugin level, disabling the plugin disables all of the TechDocs add-ons in the specified plugin package.
diff --git a/titles/product_product/category-maps/develop/con-import-source-code-repositories-in-bulk.adoc b/titles/product_product/category-maps/develop/con-import-source-code-repositories-in-bulk.adoc
index 46ed6cad3bc..11ef93a96c7 100644
--- a/titles/product_product/category-maps/develop/con-import-source-code-repositories-in-bulk.adoc
+++ b/titles/product_product/category-maps/develop/con-import-source-code-repositories-in-bulk.adoc
@@ -3,4 +3,4 @@
 = Import source code repositories in bulk
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Import source code repositories in bulk.
+Automate onboarding of GitHub repositories and GitLab projects to {product} catalog, and monitor import status by using bulk import capabilities.
diff --git a/titles/product_product/category-maps/develop/con-install-external-or-third-party-add-ons.adoc b/titles/product_product/category-maps/develop/con-install-external-or-third-party-add-ons.adoc
index ee376b56d95..76f00ddb9a2 100644
--- a/titles/product_product/category-maps/develop/con-install-external-or-third-party-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/con-install-external-or-third-party-add-ons.adoc
@@ -3,4 +3,4 @@
 = Install external or third-party add-ons
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install external or third-party add-ons.
+Install and configure TechDocs add-ons to extend the functionality of the TechDocs plugin in {product}.
diff --git a/titles/product_product/category-maps/develop/con-install-orchestrator-helm-charts.adoc b/titles/product_product/category-maps/develop/con-install-orchestrator-helm-charts.adoc
index cbfb9c9ed94..96a86c6ab21 100644
--- a/titles/product_product/category-maps/develop/con-install-orchestrator-helm-charts.adoc
+++ b/titles/product_product/category-maps/develop/con-install-orchestrator-helm-charts.adoc
@@ -3,4 +3,4 @@
 = Install Orchestrator Helm charts
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install Orchestrator Helm charts.
+Automate the software development lifecycle for serverless workflows by using Orchestrator software templates to bootstrap complete workflow projects with Git repositories, deployment configurations, and CI/CD pipelines.
diff --git a/titles/product_product/category-maps/develop/con-install-orchestrator-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/develop/con-install-orchestrator-in-an-air-gapped-environment.adoc
index d459acb59e9..2bd39b98164 100644
--- a/titles/product_product/category-maps/develop/con-install-orchestrator-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/develop/con-install-orchestrator-in-an-air-gapped-environment.adoc
@@ -3,4 +3,4 @@
 = Install Orchestrator in an air-gapped environment
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install Orchestrator in an air-gapped environment.
+You can configure {product} ({product-very-short}) with the Orchestrator plugin in a fully disconnected or partially disconnected environment by using the Operator or Helm chart.
diff --git a/titles/product_product/category-maps/develop/con-install-techdocs-add-ons.adoc b/titles/product_product/category-maps/develop/con-install-techdocs-add-ons.adoc
index 1e28da2b9ee..a09a82c3e71 100644
--- a/titles/product_product/category-maps/develop/con-install-techdocs-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/con-install-techdocs-add-ons.adoc
@@ -3,4 +3,8 @@
 = Install TechDocs add-ons
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install TechDocs add-ons.
+Install and configure TechDocs add-ons to extend the functionality of the TechDocs plugin in {product}.
+
+TechDocs add-ons supported by {company-name} are exported to the TechDocs plugin by the `backstage-plugin-techdocs-module-addons-contrib` plugin package, which is preinstalled on {product} and enabled by default. The `<ReportIssue />` add-on is part of the default configuration of this plugin package and comes ready to use in the TechDocs plugin.
+
+You can install other supported TechDocs add-ons by configuring the `backstage-plugin-techdocs-module-addons-contrib` plugin package in the {product} ConfigMap or Helm chart, depending on whether you use the Operator or Helm chart for installation. If you want to customize your TechDocs experience beyond the functions of the supported add-ons, you can install third-party add-ons on your TechDocs plugin, including add-ons that you create yourself.
diff --git a/titles/product_product/category-maps/develop/con-manage-your-software-components.adoc b/titles/product_product/category-maps/develop/con-manage-your-software-components.adoc
index 914cd27190d..77e6a388f8e 100644
--- a/titles/product_product/category-maps/develop/con-manage-your-software-components.adoc
+++ b/titles/product_product/category-maps/develop/con-manage-your-software-components.adoc
@@ -3,4 +3,14 @@
 = Manage your software components
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Manage your software components.
+The {product} Software Catalog is a centralized system that gives you visibility into all the software across your ecosystem, including services, websites, libraries, and data pipelines.
+
+The metadata for the components in your Software Catalog is stored as YAML files that live alongside your code in your version control system. The version control repositories can include one or many metadata files. Software Catalog organizes items as entities, which include Components, Resources, and APIs, and other related types. Each entity includes associated metadata such as its owner, type, and other relevant details.
+
+By storing metadata in YAML files alongside the code, you allow {product} to process and display this information through a clear, visual interface. With the Software Catalog, you can manage and maintain your software, stay aware of all software available in your ecosystem, and take ownership of your services and tools.
+
+//[Add a Software Catalog screenshot of the latest build]
+
+The *Overview* page for a component provides key information such as links to the source code, documentation, dependencies, and ownership details. You can customize this page with plugins to suit specific needs.
+
+//[Add any Component screenshot of the latest build]
diff --git a/titles/product_product/category-maps/develop/con-orchestrate-infrastructure-tasks-using-workflows.adoc b/titles/product_product/category-maps/develop/con-orchestrate-infrastructure-tasks-using-workflows.adoc
index bb33aaf6c85..b54ad7b5a73 100644
--- a/titles/product_product/category-maps/develop/con-orchestrate-infrastructure-tasks-using-workflows.adoc
+++ b/titles/product_product/category-maps/develop/con-orchestrate-infrastructure-tasks-using-workflows.adoc
@@ -3,4 +3,13 @@
 = Orchestrate infrastructure tasks using workflows
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Orchestrate infrastructure tasks using workflows.
+You can streamline and automate your work by using the Orchestrator in {product} to design, run, and monitor workflows across applications and services.
+
+* Design, run, and monitor workflows to simplify multi-step processes across applications and services.
+* Standardize onboarding, migration, and integration workflows to reduce manual effort and improve consistency.
+* Extend {product-very-short} with enterprise-grade Orchestration features to support collaboration and scalability.
+
+[NOTE]
+====
+Orchestrator currently supports only {ocp-brand-name} ({ocp-short}); it is not available on {aks-brand-name} ({aks-short}), {eks-brand-name} ({eks-short}), or {gke-brand-name} ({gke-short}).
+====
diff --git a/titles/product_product/category-maps/develop/con-orchestrator-process-automation-architecture.adoc b/titles/product_product/category-maps/develop/con-orchestrator-process-automation-architecture.adoc
index bc638c27c66..226d533f8a1 100644
--- a/titles/product_product/category-maps/develop/con-orchestrator-process-automation-architecture.adoc
+++ b/titles/product_product/category-maps/develop/con-orchestrator-process-automation-architecture.adoc
@@ -3,4 +3,4 @@
 = Orchestrator process automation architecture
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Orchestrator process automation architecture.
+You can streamline and automate your work by using the Orchestrator in {product} to design, run, and monitor workflows across applications and services.
diff --git a/titles/product_product/category-maps/develop/con-pre-built-workflow-container-image-capabilities.adoc b/titles/product_product/category-maps/develop/con-pre-built-workflow-container-image-capabilities.adoc
index 8c889c4ea47..dc2a7adea7d 100644
--- a/titles/product_product/category-maps/develop/con-pre-built-workflow-container-image-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/con-pre-built-workflow-container-image-capabilities.adoc
@@ -3,4 +3,4 @@
 = Pre-built workflow container image capabilities
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Pre-built workflow container image capabilities.
+Deploy a workflow and make it available in the Orchestrator plugin by building workflow images, generating workflow manifests, and deploying workflows to a cluster.
diff --git a/titles/product_product/category-maps/develop/con-project-standardization-with-software-templates.adoc b/titles/product_product/category-maps/develop/con-project-standardization-with-software-templates.adoc
index 6b2347b7efb..c927878628b 100644
--- a/titles/product_product/category-maps/develop/con-project-standardization-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/con-project-standardization-with-software-templates.adoc
@@ -3,4 +3,5 @@
 = Project standardization with software templates
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Project standardization with software templates.
+Software Templates in {product} provide a streamlined way to create software components and publish them to different version control repositories such as Git.
+Platform engineers create and maintain Software Templates in {product}.
diff --git a/titles/product_product/category-maps/develop/con-register-and-update-software-components-to-maintain-a-unified-service-inventory.adoc b/titles/product_product/category-maps/develop/con-register-and-update-software-components-to-maintain-a-unified-service-inventory.adoc
index 7ef1e7dc7c8..04679489bc5 100644
--- a/titles/product_product/category-maps/develop/con-register-and-update-software-components-to-maintain-a-unified-service-inventory.adoc
+++ b/titles/product_product/category-maps/develop/con-register-and-update-software-components-to-maintain-a-unified-service-inventory.adoc
@@ -3,4 +3,4 @@
 = Register and update software components to maintain a unified service inventory
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Register and update software components to maintain a unified service inventory.
+The {product} Software Catalog is a centralized system that gives you visibility into all the software across your ecosystem, including services, websites, libraries, and data pipelines.
diff --git a/titles/product_product/category-maps/develop/con-register-new-software-components.adoc b/titles/product_product/category-maps/develop/con-register-new-software-components.adoc
index 80f13b46a03..64e9307f505 100644
--- a/titles/product_product/category-maps/develop/con-register-new-software-components.adoc
+++ b/titles/product_product/category-maps/develop/con-register-new-software-components.adoc
@@ -3,4 +3,4 @@
 = Register new software components
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Register new software components.
+You can add new components to expand your {product-short} Software Catalog by registering them manually, creating them from Software Templates, or using bulk import.
diff --git a/titles/product_product/category-maps/develop/con-register-repository-lists-with-the-orchestrator.adoc b/titles/product_product/category-maps/develop/con-register-repository-lists-with-the-orchestrator.adoc
index f38beff966b..6e1546eacb2 100644
--- a/titles/product_product/category-maps/develop/con-register-repository-lists-with-the-orchestrator.adoc
+++ b/titles/product_product/category-maps/develop/con-register-repository-lists-with-the-orchestrator.adoc
@@ -3,4 +3,4 @@
 = Register repository lists with the orchestrator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Register repository lists with the orchestrator.
+Automate onboarding of GitHub repositories and GitLab projects to {product} catalog, and monitor import status by using bulk import capabilities.
diff --git a/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
index 4c7d5f20de3..a232f1c439f 100644
--- a/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
@@ -3,4 +3,6 @@
 = Standardized project generation with software templates
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Standardized project generation with software templates.
+To standardize and accelerate the creation of new software, use Software Templates in {product} ({product-very-short}).
+
+Each template uses a YAML definition to present a functional interface for inputting project metadata. Software Templates run a sequential series of _actions_, such as scaffolding code or creating repositories, which you can configure to run conditionally based on user input.
diff --git a/titles/product_product/category-maps/develop/con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc b/titles/product_product/category-maps/develop/con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
index 67fc7dd9aa6..cba6c00962e 100644
--- a/titles/product_product/category-maps/develop/con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
+++ b/titles/product_product/category-maps/develop/con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
@@ -3,4 +3,8 @@
 = Track component provenance to map dependencies back to source templates
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Track component provenance to map dependencies back to source templates.
+Track the dependency link between a generated entity and its source template to simplify lifecycle management.
+
+Platform engineers use custom actions within the Software Template scaffolding process to establish and track the dependency link between a generated entity (Component or Resource) and its source template. This relationship is called scaffolding provenance.
+
+Platform administrators use custom actions such as `catalog:scaffolded-from` and `catalog:template:version` in the Scaffolder backend module to track the template version and the corresponding entity version, which simplifies lifecycle management.
diff --git a/titles/product_product/category-maps/develop/con-use-enabled-add-ons.adoc b/titles/product_product/category-maps/develop/con-use-enabled-add-ons.adoc
index c776cdfea59..8b462fc0fe5 100644
--- a/titles/product_product/category-maps/develop/con-use-enabled-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/con-use-enabled-add-ons.adoc
@@ -3,4 +3,4 @@
 = Use enabled add-ons
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Use enabled add-ons.
+After an administrator installs a TechDocs add-on in your {product} instance, you can use it to extend the functionality of the TechDocs plugin and enhance your documentation experience.
diff --git a/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
index 514532ef8e1..838ca93de5a 100644
--- a/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -3,4 +3,4 @@
 = Version Software Templates to track template updates and dependencies
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Version Software Templates to track template updates and dependencies.
+Software Templates in {product} provide a streamlined way to create software components and publish them to different version control repositories such as Git.
diff --git a/titles/product_product/category-maps/develop/con-workflow-design-best-practices.adoc b/titles/product_product/category-maps/develop/con-workflow-design-best-practices.adoc
index 1f715cc138e..304169ac85d 100644
--- a/titles/product_product/category-maps/develop/con-workflow-design-best-practices.adoc
+++ b/titles/product_product/category-maps/develop/con-workflow-design-best-practices.adoc
@@ -3,4 +3,4 @@
 = Workflow design best practices
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Workflow design best practices.
+Deploy a workflow and make it available in the Orchestrator plugin by building workflow images, generating workflow manifests, and deploying workflows to a cluster.
diff --git a/titles/product_product/category-maps/develop/con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc b/titles/product_product/category-maps/develop/con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
index ccc2e4e7a28..e1dc688a807 100644
--- a/titles/product_product/category-maps/develop/con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
+++ b/titles/product_product/category-maps/develop/con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
@@ -3,4 +3,4 @@
 = Write and publish documentation as code to keep knowledge synchronized
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Write and publish documentation as code to keep knowledge synchronized.
+After an administrator configures TechDocs, a developer can add documentation by importing from a remote repository, creating standalone docs, or enabling docs for an existing catalog entity.
diff --git a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
index 1dfadf13911..be61053d1e4 100644
--- a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
+++ b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
@@ -6,6 +6,6 @@
 
 include::con-automate-template-lifecycle-management.adoc[leveloffset=+1]
 
-// TODO: include Enable the scaffolder-relation-processor
+include::modules/shared/proc-enable-automated-template-updates.adoc[leveloffset=+1]
 
-// TODO: include Template sync limitations
+include::modules/shared/ref-template-sync-considerations-and-limitations.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-automate-workflow-deployments.adoc b/titles/product_product/category-maps/develop/nav-automate-workflow-deployments.adoc
index 863dd2ae7d3..eda61e41d63 100644
--- a/titles/product_product/category-maps/develop/nav-automate-workflow-deployments.adoc
+++ b/titles/product_product/category-maps/develop/nav-automate-workflow-deployments.adoc
@@ -6,14 +6,16 @@
 
 include::con-automate-workflow-deployments.adoc[leveloffset=+1]
 
-// TODO: include Install Orchestrator Helm charts
+include::modules/extend_orchestrator-in-rhdh/con-orchestrator-workflow-deployment-components.adoc[leveloffset=+1,navtitle="Workflow deployment components"]
+
+include::nav-install-orchestrator-helm-charts.adoc[leveloffset=+1]
 
 include::nav-install-orchestrator-in-an-air-gapped-environment.adoc[leveloffset=+1]
 
-// TODO: include Launch workflow templates
+include::modules/extend_orchestrator-in-rhdh/proc-create-a-serverless-workflow-project.adoc[leveloffset=+1,navtitle="Launch workflow templates"]
 
-// TODO: include Apply generated GitOps resources
+include::modules/extend_orchestrator-in-rhdh/proc-bootstrap-gitops-resources-and-trigger-pipelines.adoc[leveloffset=+1,navtitle="Apply generated GitOps resources"]
 
-// TODO: include Verify your workflow deployment in the UI
+include::modules/extend_orchestrator-in-rhdh/proc-verify-the-deployment.adoc[leveloffset=+1,navtitle="Verify your workflow deployment in the UI"]
 
-// TODO: include Trigger workflows from event-driven systems
+include::modules/extend_orchestrator-in-rhdh/ref-troubleshooting-workflow-deployments.adoc[leveloffset=+1,navtitle="Trigger workflows from event-driven systems"]
diff --git a/titles/product_product/category-maps/develop/nav-build-serverless-workflows.adoc b/titles/product_product/category-maps/develop/nav-build-serverless-workflows.adoc
index 6655e898977..9a80f92cc49 100644
--- a/titles/product_product/category-maps/develop/nav-build-serverless-workflows.adoc
+++ b/titles/product_product/category-maps/develop/nav-build-serverless-workflows.adoc
@@ -6,12 +6,12 @@
 
 include::con-build-serverless-workflows.adoc[leveloffset=+1]
 
-// TODO: include Pre-built workflow container image capabilities
+include::nav-pre-built-workflow-container-image-capabilities.adoc[leveloffset=+1]
 
-// TODO: include Build workflow container images locally using the build.sh script
+include::nav-build-workflow-container-images-locally-using-the-build-sh-script.adoc[leveloffset=+1]
 
-// TODO: include Review generated Kubernetes manifests
+include::modules/extend_orchestrator-in-rhdh/con-generated-workflow-manifests.adoc[leveloffset=+1]
 
-// TODO: include Deploy workflow images to an OpenShift cluster
+include::modules/extend_orchestrator-in-rhdh/proc-deploy-workflows-on-a-cluster.adoc[leveloffset=+1]
 
-// TODO: include Workflow design best practices
+include::nav-workflow-design-best-practices.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-build-workflow-container-images-locally-using-the-build-sh-script.adoc b/titles/product_product/category-maps/develop/nav-build-workflow-container-images-locally-using-the-build-sh-script.adoc
index 31e260c1ae6..4720b5325c8 100644
--- a/titles/product_product/category-maps/develop/nav-build-workflow-container-images-locally-using-the-build-sh-script.adoc
+++ b/titles/product_product/category-maps/develop/nav-build-workflow-container-images-locally-using-the-build-sh-script.adoc
@@ -5,3 +5,13 @@
 :context: build-workflow-container-images-locally-using-the-build-sh-script
 
 include::con-build-workflow-container-images-locally-using-the-build-sh-script.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/proc-build-workflow-images-locally.adoc[leveloffset=+1,navtitle="build.sh script configuration and flags"]
+
+include::modules/extend_orchestrator-in-rhdh/con-the-build-sh-script-functionality-and-important-flags.adoc[leveloffset=+1,navtitle="Supported build environment variables"]
+
+include::modules/extend_orchestrator-in-rhdh/con-environment-variables-supported-by-the-build-script.adoc[leveloffset=+1,navtitle="Prerequisites"]
+
+include::modules/extend_orchestrator-in-rhdh/con-required-tools.adoc[leveloffset=+1,navtitle="Build a basic serverless workflow"]
+
+include::modules/extend_orchestrator-in-rhdh/proc-build-the-01-basic-workflow.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc b/titles/product_product/category-maps/develop/nav-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
index cd1cdf77fea..45ab009e3c7 100644
--- a/titles/product_product/category-maps/develop/nav-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
+++ b/titles/product_product/category-maps/develop/nav-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc
@@ -5,3 +5,13 @@
 :context: configure-amazon-s3-or-openshift-data-foundation-buckets
 
 include::con-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc[leveloffset=+1]
+
+include::modules/configure_techdocs-for-rhdh/con-configuring-storage-for-techdocs-files.adoc[leveloffset=+1,navtitle="Configure Amazon S3"]
+
+include::modules/shared/proc-configure-amazon-s3-for-file-storage.adoc[leveloffset=+1,navtitle="Configure OpenShift Data Foundation"]
+
+include::modules/configure_techdocs-for-rhdh/proc-configure-for-file-storage.adoc[leveloffset=+1,navtitle="Configure object storage access with Operator"]
+
+include::modules/configure_techdocs-for-rhdh/proc-make-object-storage-accessible-to-containers-by-using-the-operator.adoc[leveloffset=+1,navtitle="Configure object storage access with Helm Chart"]
+
+include::modules/configure_techdocs-for-rhdh/proc-make-object-storage-accessible-to-containers-by-using-the-helm-chart.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
index 8e95b882efc..a349d1a9024 100644
--- a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
@@ -6,10 +6,10 @@
 
 include::con-configure-bulk-import-capabilities.adoc[leveloffset=+1]
 
-// TODO: include Select and import Git projects
+include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Select and import Git projects"]
 
-// TODO: include Review input parameters
+include::modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
 
-// TODO: include Create custom Scaffolder workflows
+include::modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
 
-// TODO: include Register repository lists with the orchestrator
+include::nav-register-repository-lists-with-the-orchestrator.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-configure-techdocs-storage-and-cicd-pipelines.adoc b/titles/product_product/category-maps/develop/nav-configure-techdocs-storage-and-cicd-pipelines.adoc
index 5dd235dbe1a..b2d2b9403aa 100644
--- a/titles/product_product/category-maps/develop/nav-configure-techdocs-storage-and-cicd-pipelines.adoc
+++ b/titles/product_product/category-maps/develop/nav-configure-techdocs-storage-and-cicd-pipelines.adoc
@@ -6,6 +6,6 @@
 
 include::con-configure-techdocs-storage-and-cicd-pipelines.adoc[leveloffset=+1]
 
-// TODO: include Configure Amazon S3 or OpenShift Data Foundation buckets
+include::nav-configure-amazon-s3-or-openshift-data-foundation-buckets.adoc[leveloffset=+1]
 
-// TODO: include Use the techdocs-cli in your CI/CD pipelines
+include::modules/configure_techdocs-for-rhdh/con-configuring-ci-cd-to-generate-and-publish-techdocs-sites.adoc[leveloffset=+1,navtitle="Use the techdocs-cli in your CI/CD pipelines"]
diff --git a/titles/product_product/category-maps/develop/nav-disable-or-remove-techdocs-add-ons.adoc b/titles/product_product/category-maps/develop/nav-disable-or-remove-techdocs-add-ons.adoc
index 32c8fccc21c..2a830073d25 100644
--- a/titles/product_product/category-maps/develop/nav-disable-or-remove-techdocs-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/nav-disable-or-remove-techdocs-add-ons.adoc
@@ -5,3 +5,7 @@
 :context: disable-or-remove-techdocs-add-ons
 
 include::con-disable-or-remove-techdocs-add-ons.adoc[leveloffset=+1]
+
+include::modules/shared/proc-remove-an-external-techdocs-add-on-from-your-configmap.adoc[leveloffset=+1,navtitle="Remove from your Operator"]
+
+include::modules/shared/proc-remove-an-external-techdocs-add-on-from-your-helm-chart.adoc[leveloffset=+1,navtitle="Remove from your Helm Chart"]
diff --git a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
index 68d6a3809fd..3761efc00b0 100644
--- a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
+++ b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
@@ -6,10 +6,12 @@
 
 include::con-import-source-code-repositories-in-bulk.adoc[leveloffset=+1]
 
-// TODO: include Enable and authorize bulk import plugins
+include::modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-// TODO: include Select and import GitHub repositories
+include::modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
 
-// TODO: include Manage imported repositories
+include::modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
 
-// TODO: include Monitor bulk import operations in audit logs
+include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Manage imported repositories"]
+
+include::modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-install-external-or-third-party-add-ons.adoc b/titles/product_product/category-maps/develop/nav-install-external-or-third-party-add-ons.adoc
index 7e8dafb274b..73c62450cc2 100644
--- a/titles/product_product/category-maps/develop/nav-install-external-or-third-party-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/nav-install-external-or-third-party-add-ons.adoc
@@ -5,3 +5,7 @@
 :context: install-external-or-third-party-add-ons
 
 include::con-install-external-or-third-party-add-ons.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-and-configure-an-external-techdocs-add-on-using-the-operator.adoc[leveloffset=+1,navtitle="Install with Operator"]
+
+include::modules/shared/proc-install-and-configure-an-external-techdocs-add-on-using-the-helm-chart.adoc[leveloffset=+1,navtitle="Install with Helm Chart"]
diff --git a/titles/product_product/category-maps/develop/nav-install-orchestrator-helm-charts.adoc b/titles/product_product/category-maps/develop/nav-install-orchestrator-helm-charts.adoc
index 48b2a8f4a67..9f54fd7bbce 100644
--- a/titles/product_product/category-maps/develop/nav-install-orchestrator-helm-charts.adoc
+++ b/titles/product_product/category-maps/develop/nav-install-orchestrator-helm-charts.adoc
@@ -5,3 +5,9 @@
 :context: install-orchestrator-helm-charts
 
 include::con-install-orchestrator-helm-charts.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/proc-install-orchestrator-software-templates.adoc[leveloffset=+1,navtitle="Install the Infra chart"]
+
+include::modules/extend_orchestrator-in-rhdh/proc-install-the-orchestrator-software-templates-infra-chart.adoc[leveloffset=+1,navtitle="Enable workflow software templates"]
+
+include::modules/extend_orchestrator-in-rhdh/proc-install-the-orchestrator-software-templates-chart.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-install-orchestrator-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/develop/nav-install-orchestrator-in-an-air-gapped-environment.adoc
index ed4f17d9697..ccdbc579ac9 100644
--- a/titles/product_product/category-maps/develop/nav-install-orchestrator-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/develop/nav-install-orchestrator-in-an-air-gapped-environment.adoc
@@ -6,6 +6,10 @@
 
 include::con-install-orchestrator-in-an-air-gapped-environment.adoc[leveloffset=+1]
 
-// TODO: include Install Orchestrator with the Operator
+include::modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-fully-disconnected-ocp-environment-using-the-operator.adoc[leveloffset=+1,navtitle="Install Orchestrator with the Operator"]
 
-// TODO: include Install Orchestrator with the Helm chart
+include::modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-partially-disconnected-ocp-environment-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-fully-disconnected-ocp-environment-using-the-helm-chart.adoc[leveloffset=+1,navtitle="Install Orchestrator with the Helm chart"]
+
+include::modules/extend_orchestrator-in-rhdh/proc-install-rhdh-with-orchestrator-in-a-partially-disconnected-ocp-environment-using-the-helm-chart.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-install-techdocs-add-ons.adoc b/titles/product_product/category-maps/develop/nav-install-techdocs-add-ons.adoc
index b70aa186ecc..6cfd2d84e19 100644
--- a/titles/product_product/category-maps/develop/nav-install-techdocs-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/nav-install-techdocs-add-ons.adoc
@@ -6,8 +6,8 @@
 
 include::con-install-techdocs-add-ons.adoc[leveloffset=+1]
 
-// TODO: include Install external or third-party add-ons
+include::nav-install-external-or-third-party-add-ons.adoc[leveloffset=+1]
 
-// TODO: include Disable or remove TechDocs add-ons
+include::nav-disable-or-remove-techdocs-add-ons.adoc[leveloffset=+1]
 
-// TODO: include Use enabled add-ons
+include::nav-use-enabled-add-ons.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
index ee581c27339..0ed5c2ffd0b 100644
--- a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
@@ -6,14 +6,14 @@
 
 include::con-manage-your-software-components.adoc[leveloffset=+1]
 
-// TODO: include Register new software components
+include::nav-register-new-software-components.adoc[leveloffset=+1]
 
-// TODO: include Update component YAML metadata
+include::modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc[leveloffset=+1]
 
-// TODO: include Filter the catalog by entity kind
+include::modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc[leveloffset=+1]
 
-// TODO: include Search the catalog using text filters
+include::modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc[leveloffset=+1]
 
-// TODO: include Review the raw YAML configuration
+include::modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc[leveloffset=+1]
 
-// TODO: include Star frequently used components
+include::modules/shared/proc-star-key-components-in-the-software-catalog.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-orchestrate-infrastructure-tasks-using-workflows.adoc b/titles/product_product/category-maps/develop/nav-orchestrate-infrastructure-tasks-using-workflows.adoc
index 8a17fa5b78f..4fa9c04c0f2 100644
--- a/titles/product_product/category-maps/develop/nav-orchestrate-infrastructure-tasks-using-workflows.adoc
+++ b/titles/product_product/category-maps/develop/nav-orchestrate-infrastructure-tasks-using-workflows.adoc
@@ -6,7 +6,7 @@
 
 include::con-orchestrate-infrastructure-tasks-using-workflows.adoc[leveloffset=+1]
 
-// TODO: include Orchestrator process automation architecture
+include::nav-orchestrator-process-automation-architecture.adoc[leveloffset=+1]
 
 include::nav-build-serverless-workflows.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/develop/nav-orchestrator-process-automation-architecture.adoc b/titles/product_product/category-maps/develop/nav-orchestrator-process-automation-architecture.adoc
index 33ed8a131f5..1ed4407efa9 100644
--- a/titles/product_product/category-maps/develop/nav-orchestrator-process-automation-architecture.adoc
+++ b/titles/product_product/category-maps/develop/nav-orchestrator-process-automation-architecture.adoc
@@ -5,3 +5,7 @@
 :context: orchestrator-process-automation-architecture
 
 include::con-orchestrator-process-automation-architecture.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/ref-compatibility-guide-for-orchestrator.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/con-understand-orchestrator-architecture.adoc[leveloffset=+1,navtitle="Operator and orchestrator plugin compatibility matrix"]
diff --git a/titles/product_product/category-maps/develop/nav-pre-built-workflow-container-image-capabilities.adoc b/titles/product_product/category-maps/develop/nav-pre-built-workflow-container-image-capabilities.adoc
index 7a23b594cff..600b32b80ce 100644
--- a/titles/product_product/category-maps/develop/nav-pre-built-workflow-container-image-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/nav-pre-built-workflow-container-image-capabilities.adoc
@@ -5,3 +5,9 @@
 :context: pre-built-workflow-container-image-capabilities
 
 include::con-pre-built-workflow-container-image-capabilities.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/con-benefits-of-workflow-images.adoc[leveloffset=+1,navtitle="Project structure"]
+
+include::modules/extend_orchestrator-in-rhdh/con-project-structure-overview.adoc[leveloffset=+1,navtitle="Develop and test serverless workflows locally"]
+
+include::modules/extend_orchestrator-in-rhdh/proc-create-and-run-your-serverless-workflow-project-locally.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
index e465e803c7c..195ce8053ac 100644
--- a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
@@ -6,15 +6,15 @@
 
 include::con-project-standardization-with-software-templates.adoc[leveloffset=+1]
 
-// TODO: include Create new Software Templates
+include::modules/shared/proc-create-a-basic-software-template.adoc[leveloffset=+1]
 
-// TODO: include Use sample templates
+include::modules/shared/ref-sample-software-template.adoc[leveloffset=+1]
 
-// TODO: include Publish template definitions to the catalog
+include::modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1]
 
-// TODO: include Extend templates using conditional logic and external fetch capabilities
+include::modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc[leveloffset=+1]
 
-// TODO: include Version Software Templates to track template updates and dependencies
+include::nav-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
 include::nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
index 9241e2dff6f..7eafe557089 100644
--- a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
@@ -5,3 +5,7 @@
 :context: register-new-software-components
 
 include::con-register-new-software-components.adoc[leveloffset=+1]
+
+include::modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc[leveloffset=+1]
+
+include::modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-register-repository-lists-with-the-orchestrator.adoc b/titles/product_product/category-maps/develop/nav-register-repository-lists-with-the-orchestrator.adoc
index a7a93d1eeef..dfb6a1fc311 100644
--- a/titles/product_product/category-maps/develop/nav-register-repository-lists-with-the-orchestrator.adoc
+++ b/titles/product_product/category-maps/develop/nav-register-repository-lists-with-the-orchestrator.adoc
@@ -5,3 +5,7 @@
 :context: register-repository-lists-with-the-orchestrator
 
 include::con-register-repository-lists-with-the-orchestrator.adoc[leveloffset=+1]
+
+include::modules/shared/proc-run-orchestrator-workflows-for-bulk-imports.adoc[leveloffset=+1]
+
+include::modules/shared/con-data-handoff-and-custom-workflow-design.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
index 03b3152ceda..91bd063b8d3 100644
--- a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
@@ -6,8 +6,8 @@
 
 include::con-standardized-project-generation-with-software-templates.adoc[leveloffset=+1]
 
-// TODO: include Run Software Templates from the UI
+include::modules/shared/proc-create-a-software-component-using-software-templates.adoc[leveloffset=+1]
 
-// TODO: include Browse available templates
+include::modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc[leveloffset=+1]
 
-// TODO: include Import an existing template file using the Catalog Processor
+include::modules/shared/proc-import-an-existing-software-template.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
index 2e29e27447c..be96106b0c8 100644
--- a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
@@ -6,6 +6,6 @@
 
 include::con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc[leveloffset=+1]
 
-// TODO: include Configure provenance annotations
+include::modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc[leveloffset=+1]
 
-// TODO: include View template dependencies in the catalog
+include::modules/shared/proc-view-software-template-dependencies.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-use-enabled-add-ons.adoc b/titles/product_product/category-maps/develop/nav-use-enabled-add-ons.adoc
index b466bbd928c..1e4b4d5b638 100644
--- a/titles/product_product/category-maps/develop/nav-use-enabled-add-ons.adoc
+++ b/titles/product_product/category-maps/develop/nav-use-enabled-add-ons.adoc
@@ -5,3 +5,9 @@
 :context: use-enabled-add-ons
 
 include::con-use-enabled-add-ons.adoc[leveloffset=+1]
+
+include::modules/shared/proc-use-the-reportissue-techdocs-add-on.adoc[leveloffset=+1,navtitle="Configure documentation issue reporting"]
+
+include::modules/shared/proc-use-the-textsize-techdocs-add-on.adoc[leveloffset=+1,navtitle="Configure documentation text scaling"]
+
+include::modules/shared/proc-use-the-lightbox-techdocs-add-on.adoc[leveloffset=+1,navtitle="Configure image overlay features"]
diff --git a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
index d1034762122..7e2b550297a 100644
--- a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -5,3 +5,7 @@
 :context: version-software-templates-to-track-template-updates-and-dependencies
 
 include::con-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
+
+include::modules/shared/proc-version-a-software-template-in-rhdh.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-workflow-design-best-practices.adoc b/titles/product_product/category-maps/develop/nav-workflow-design-best-practices.adoc
index 5ed03763054..55eaef850e6 100644
--- a/titles/product_product/category-maps/develop/nav-workflow-design-best-practices.adoc
+++ b/titles/product_product/category-maps/develop/nav-workflow-design-best-practices.adoc
@@ -5,3 +5,7 @@
 :context: workflow-design-best-practices
 
 include::con-workflow-design-best-practices.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/ref-best-practices-when-creating-serverless-workflows.adoc[leveloffset=+1,navtitle="Unique workflow ID requirements"]
+
+include::modules/extend_orchestrator-in-rhdh/ref-unique-workflow-id-requirements-to-prevent-duplicates.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
index 855b2d7abda..9a03f60baf1 100644
--- a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
+++ b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
@@ -6,22 +6,22 @@
 
 include::con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc[leveloffset=+1]
 
-// TODO: include Docs-like-code practices for TechDocs strategies
+include::modules/shared/con-docs-like-code-best-practices-for-techdocs.adoc[leveloffset=+1,navtitle="Docs-like-code practices for TechDocs strategies"]
 
-// TODO: include Import Markdown documentation
+include::modules/shared/proc-import-documentation-into-techdocs-from-a-remote-repository.adoc[leveloffset=+1,navtitle="Import Markdown documentation"]
 
-// TODO: include Filter the TechDocs catalog
+include::modules/shared/proc-filter-techdocs-based-on-various-criteria.adoc[leveloffset=+1,navtitle="Filter the TechDocs catalog"]
 
-// TODO: include Navigate within TechDocs books
+include::modules/shared/proc-navigating-techdocs.adoc[leveloffset=+1,navtitle="Navigate within TechDocs books"]
 
-// TODO: include Edit TechDocs files directly
+include::modules/shared/proc-edit-documentation-in-techdocs.adoc[leveloffset=+1,navtitle="Edit TechDocs files directly"]
 
-// TODO: include Embed video iframes
+include::modules/configure_techdocs-for-rhdh/proc-embed-video-iframes-in-techdocs-pages.adoc[leveloffset=+1,navtitle="Embed video iframes"]
 
 include::nav-configure-techdocs-storage-and-cicd-pipelines.adoc[leveloffset=+1]
 
-// TODO: include Automate documentation builds with GitHub Actions
+include::modules/configure_techdocs-for-rhdh/proc-automate-techdocs-builds-with-github-actions.adoc[leveloffset=+1,navtitle="Automate documentation builds with GitHub Actions"]
 
 include::nav-install-techdocs-add-ons.adoc[leveloffset=+1]
 
-// TODO: include Develop custom TechDocs add-ons as React components
+include::modules/configure_techdocs-for-rhdh/proc-create-a-custom-techdocs-add-on.adoc[leveloffset=+1,navtitle="Develop custom TechDocs add-ons as React components"]

From 1187ea235995c288d586e6726c198d3fba64343b Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Thu, 18 Jun 2026 19:16:40 +0530
Subject: [PATCH 02/12] Fix CQA issues

---
 ...ion-as-code-to-keep-knowledge-synchronized.adoc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
index 9a03f60baf1..3698babdc5e 100644
--- a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
+++ b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
@@ -6,22 +6,22 @@
 
 include::con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc[leveloffset=+1]
 
-include::modules/shared/con-docs-like-code-best-practices-for-techdocs.adoc[leveloffset=+1,navtitle="Docs-like-code practices for TechDocs strategies"]
+// TODO: include Docs-like-code practices for TechDocs strategies
 
 include::modules/shared/proc-import-documentation-into-techdocs-from-a-remote-repository.adoc[leveloffset=+1,navtitle="Import Markdown documentation"]
 
-include::modules/shared/proc-filter-techdocs-based-on-various-criteria.adoc[leveloffset=+1,navtitle="Filter the TechDocs catalog"]
+include::modules/shared/proc-search-for-relevant-content.adoc[leveloffset=+1,navtitle="Filter the TechDocs catalog"]
 
-include::modules/shared/proc-navigating-techdocs.adoc[leveloffset=+1,navtitle="Navigate within TechDocs books"]
+include::modules/shared/proc-access-and-navigate-documentation.adoc[leveloffset=+1,navtitle="Navigate within TechDocs books"]
 
-include::modules/shared/proc-edit-documentation-in-techdocs.adoc[leveloffset=+1,navtitle="Edit TechDocs files directly"]
+include::modules/shared/proc-make-changes-to-project-documentation-in-techdocs.adoc[leveloffset=+1,navtitle="Edit TechDocs files directly"]
 
-include::modules/configure_techdocs-for-rhdh/proc-embed-video-iframes-in-techdocs-pages.adoc[leveloffset=+1,navtitle="Embed video iframes"]
+include::modules/shared/proc-add-video-content-to-enhance-techdocs.adoc[leveloffset=+1,navtitle="Embed video iframes"]
 
 include::nav-configure-techdocs-storage-and-cicd-pipelines.adoc[leveloffset=+1]
 
-include::modules/configure_techdocs-for-rhdh/proc-automate-techdocs-builds-with-github-actions.adoc[leveloffset=+1,navtitle="Automate documentation builds with GitHub Actions"]
+// TODO: include Automate documentation builds with GitHub Actions
 
 include::nav-install-techdocs-add-ons.adoc[leveloffset=+1]
 
-include::modules/configure_techdocs-for-rhdh/proc-create-a-custom-techdocs-add-on.adoc[leveloffset=+1,navtitle="Develop custom TechDocs add-ons as React components"]
+include::modules/shared/proc-create-a-techdocs-add-on.adoc[leveloffset=+1,navtitle="Develop custom TechDocs add-ons as React components"]

From 917921b01fd11bf8532c46ad22a686b653b3eab4 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Fri, 19 Jun 2026 12:44:11 +0530
Subject: [PATCH 03/12] Renaming to match JTBD titles

---
 .../assembly-about-software-templates.adoc         |  4 ++--
 ...ted-software-template-lifecycle-management.adoc |  4 ++--
 ...roject-development-with-software-templates.adoc |  8 ++++----
 ...onent-origin-and-software-template-version.adoc |  4 ++--
 ...ur-software-components-in-the-rhdh-catalog.adoc | 14 +++++++-------
 ...embly-import-your-team-s-codebase-from-git.adoc |  6 +++---
 ...mbly-manage-starred-items-for-quick-access.adoc |  2 +-
 .../assembly-bulk-importing-from-github.adoc       | 10 +++++-----
 .../assembly-bulk-importing-from-gitlab.adoc       | 10 +++++-----
 .../shared/assembly-bulk-importing-in-rhdh.adoc    | 12 ++++++------
 ...g-software-template-for-faster-development.adoc |  6 +++---
 ...plate.adoc => con-review-input-parameters.adoc} |  4 ++--
 ...e.adoc => proc-browse-available-templates.adoc} |  4 ++--
 ... => proc-configure-provenance-annotations.adoc} |  4 ++--
 ...> proc-create-custom-scaffolder-workflows.adoc} |  4 ++--
 ...doc => proc-create-new-software-templates.adoc} |  4 ++--
 ...-enable-and-authorize-bulk-import-plugins.adoc} |  4 ++--
 ...-enable-the-scaffolder-relation-processor.adoc} |  4 ++--
 ....adoc => proc-enable-update-notifications.adoc} |  4 ++--
 ...=> proc-filter-the-catalog-by-entity-kind.adoc} |  4 ++--
 ...ance.adoc => proc-generate-new-components.adoc} |  4 ++--
 ...template-file-using-the-catalog-processor.adoc} |  4 ++--
 ...adoc => proc-manage-imported-repositories.adoc} |  4 ++--
 ...itor-bulk-import-operations-in-audit-logs.adoc} |  4 ++--
 ...blish-template-definitions-to-the-catalog.adoc} |  4 ++--
 ...c-register-existing-repositories-manually.adoc} |  4 ++--
 ...=> proc-review-the-raw-yaml-configuration.adoc} |  4 ++--
 ...> proc-run-software-templates-from-the-ui.adoc} |  4 ++--
 ...roc-search-the-catalog-using-text-filters.adoc} |  4 ++--
 ...roc-select-and-import-github-repositories.adoc} |  4 ++--
 ...c => proc-star-frequently-used-components.adoc} |  4 ++--
 ...oc => proc-update-component-yaml-metadata.adoc} |  4 ++--
 ...h.adoc => proc-version-software-templates.adoc} |  4 ++--
 ...view-template-dependencies-in-the-catalog.adoc} |  4 ++--
 ...nal-logic-and-external-fetch-capabilities.adoc} |  4 ++--
 ...ons.adoc => ref-template-sync-limitations.adoc} |  4 ++--
 ...template.adoc => ref-use-sample-templates.adoc} |  4 ++--
 ...nav-automate-template-lifecycle-management.adoc |  4 ++--
 .../nav-configure-bulk-import-capabilities.adoc    |  6 +++---
 ...av-import-source-code-repositories-in-bulk.adoc |  8 ++++----
 .../nav-manage-your-software-components.adoc       | 10 +++++-----
 ...ct-standardization-with-software-templates.adoc |  8 ++++----
 .../nav-register-new-software-components.adoc      |  4 ++--
 ...project-generation-with-software-templates.adoc |  6 +++---
 ...-map-dependencies-back-to-source-templates.adoc |  4 ++--
 ...to-track-template-updates-and-dependencies.adoc |  4 ++--
 46 files changed, 119 insertions(+), 119 deletions(-)
 rename modules/shared/{con-input-parameters-for-bulk-import-scaffolder-template.adoc => con-review-input-parameters.adoc} (93%)
 rename modules/shared/{proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc => proc-browse-available-templates.adoc} (73%)
 rename modules/shared/{proc-configure-provenance-and-software-template-versioning-rhdh.adoc => proc-configure-provenance-annotations.adoc} (95%)
 rename modules/shared/{proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc => proc-create-custom-scaffolder-workflows.adoc} (95%)
 rename modules/shared/{proc-create-a-basic-software-template.adoc => proc-create-new-software-templates.adoc} (95%)
 rename modules/shared/{proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc => proc-enable-and-authorize-bulk-import-plugins.adoc} (94%)
 rename modules/shared/{proc-enable-automated-template-updates.adoc => proc-enable-the-scaffolder-relation-processor.adoc} (95%)
 rename modules/shared/{proc-enable-software-template-version-update-notifications-in-rhdh.adoc => proc-enable-update-notifications.adoc} (91%)
 rename modules/shared/{proc-find-components-by-kind-in-the-rhdh-catalog.adoc => proc-filter-the-catalog-by-entity-kind.adoc} (85%)
 rename modules/shared/{proc-create-new-components-in-your-rhdh-instance.adoc => proc-generate-new-components.adoc} (85%)
 rename modules/shared/{proc-import-an-existing-software-template.adoc => proc-import-an-existing-template-file-using-the-catalog-processor.adoc} (90%)
 rename modules/shared/{proc-import-multiple-gitlab-repositories.adoc => proc-manage-imported-repositories.adoc} (96%)
 rename modules/shared/{proc-monitor-bulk-import-actions-using-audit-logs.adoc => proc-monitor-bulk-import-operations-in-audit-logs.adoc} (96%)
 rename modules/shared/{proc-share-software-templates-with-your-organization.adoc => proc-publish-template-definitions-to-the-catalog.adoc} (88%)
 rename modules/shared/{proc-register-components-manually-in-your-rhdh-instance.adoc => proc-register-existing-repositories-manually.adoc} (92%)
 rename modules/shared/{proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc => proc-review-the-raw-yaml-configuration.adoc} (75%)
 rename modules/shared/{proc-create-a-software-component-using-software-templates.adoc => proc-run-software-templates-from-the-ui.adoc} (91%)
 rename modules/shared/{proc-filter-components-by-text-in-the-rhdh-catalog.adoc => proc-search-the-catalog-using-text-filters.adoc} (82%)
 rename modules/shared/{proc-import-multiple-github-repositories.adoc => proc-select-and-import-github-repositories.adoc} (95%)
 rename modules/shared/{proc-star-key-components-in-the-software-catalog.adoc => proc-star-frequently-used-components.adoc} (81%)
 rename modules/shared/{proc-update-existing-components-in-your-rhdh-catalog.adoc => proc-update-component-yaml-metadata.adoc} (85%)
 rename modules/shared/{proc-version-a-software-template-in-rhdh.adoc => proc-version-software-templates.adoc} (96%)
 rename modules/shared/{proc-view-software-template-dependencies.adoc => proc-view-template-dependencies-in-the-catalog.adoc} (89%)
 rename modules/shared/{ref-extending-software-templates-for-complex-project-requirements.adoc => ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc} (78%)
 rename modules/shared/{ref-template-sync-considerations-and-limitations.adoc => ref-template-sync-limitations.adoc} (92%)
 rename modules/shared/{ref-sample-software-template.adoc => ref-use-sample-templates.adoc} (95%)

diff --git a/assemblies/configure_customizing-rhdh/assembly-about-software-templates.adoc b/assemblies/configure_customizing-rhdh/assembly-about-software-templates.adoc
index 37fd96e9d22..825d55cb238 100644
--- a/assemblies/configure_customizing-rhdh/assembly-about-software-templates.adoc
+++ b/assemblies/configure_customizing-rhdh/assembly-about-software-templates.adoc
@@ -11,8 +11,8 @@ ifdef::context[:parent-context: {context}]
 Software Templates in {product} provide a streamlined way to create software components and publish them to different version control repositories such as Git.
 Platform engineers create and maintain Software Templates in {product}.
 
-include::../modules/shared/proc-version-a-software-template-in-rhdh.adoc[leveloffset=+1]
-include::../modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-version-software-templates.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-update-notifications.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 [role="_additional-resources"]
diff --git a/assemblies/configure_customizing-rhdh/assembly-automated-software-template-lifecycle-management.adoc b/assemblies/configure_customizing-rhdh/assembly-automated-software-template-lifecycle-management.adoc
index 4748abfced7..031257e089b 100644
--- a/assemblies/configure_customizing-rhdh/assembly-automated-software-template-lifecycle-management.adoc
+++ b/assemblies/configure_customizing-rhdh/assembly-automated-software-template-lifecycle-management.adoc
@@ -14,8 +14,8 @@ When Software Templates receive security updates or configuration changes, you c
 
 Automated template lifecycle management maintains consistency by monitoring your source templates. When a template version changes, the `scaffolder-relation-processor` plugin identifies all entities provisioned from that template and creates a pull request (PR) or merge request (MR) containing the necessary file updates, additions, or deletions.
 
-include::../modules/shared/proc-enable-automated-template-updates.adoc[leveloffset=+1]
-include::../modules/shared/ref-template-sync-considerations-and-limitations.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-the-scaffolder-relation-processor.adoc[leveloffset=+1]
+include::../modules/shared/ref-template-sync-limitations.adoc[leveloffset=+1]
 include::../modules/shared/ref-template-synchronization-and-notification-outcomes.adoc[leveloffset=+1]
 
 :context: {previouscontext}
diff --git a/assemblies/configure_customizing-rhdh/assembly-standardize-project-development-with-software-templates.adoc b/assemblies/configure_customizing-rhdh/assembly-standardize-project-development-with-software-templates.adoc
index ee8a930a688..8844002619e 100644
--- a/assemblies/configure_customizing-rhdh/assembly-standardize-project-development-with-software-templates.adoc
+++ b/assemblies/configure_customizing-rhdh/assembly-standardize-project-development-with-software-templates.adoc
@@ -12,15 +12,15 @@ Use Software Templates in {product} to provide standardized project starter kits
 
 include::../modules/shared/con-software-templates-in-rhdh.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-create-a-basic-software-template.adoc[leveloffset=+1]
+include::../modules/shared/proc-create-new-software-templates.adoc[leveloffset=+1]
 
 include::../modules/shared/ref-default-environment-parameters-and-secrets.adoc[leveloffset=+1]
 
-include::../modules/shared/ref-sample-software-template.adoc[leveloffset=+1]
+include::../modules/shared/ref-use-sample-templates.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1]
+include::../modules/shared/proc-publish-template-definitions-to-the-catalog.adoc[leveloffset=+1]
 
-include::../modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc[leveloffset=+1]
+include::../modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc[leveloffset=+1]
 
 :context: {previouscontext}
 :!previouscontext:
diff --git a/assemblies/configure_customizing-rhdh/assembly-track-component-origin-and-software-template-version.adoc b/assemblies/configure_customizing-rhdh/assembly-track-component-origin-and-software-template-version.adoc
index f8b520cbdaa..402fbdb8dc3 100644
--- a/assemblies/configure_customizing-rhdh/assembly-track-component-origin-and-software-template-version.adoc
+++ b/assemblies/configure_customizing-rhdh/assembly-track-component-origin-and-software-template-version.adoc
@@ -14,9 +14,9 @@ Platform engineers use custom actions within the Software Template scaffolding p
 
 Platform administrators use custom actions such as `catalog:scaffolded-from` and `catalog:template:version` in the Scaffolder backend module to track the template version and the corresponding entity version, which simplifies lifecycle management.
 
-include::../modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-configure-provenance-annotations.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-view-software-template-dependencies.adoc[leveloffset=+1]
+include::../modules/shared/proc-view-template-dependencies-in-the-catalog.adoc[leveloffset=+1]
 
 :context: {previouscontext}
 :!previouscontext:
diff --git a/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-centralize-your-software-components-in-the-rhdh-catalog.adoc b/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-centralize-your-software-components-in-the-rhdh-catalog.adoc
index de90a1b5dd6..a32b20bcd9b 100644
--- a/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-centralize-your-software-components-in-the-rhdh-catalog.adoc
+++ b/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-centralize-your-software-components-in-the-rhdh-catalog.adoc
@@ -21,19 +21,19 @@ The *Overview* page for a component provides key information such as links to th
 
 include::../modules/shared/proc-add-new-components-to-your-rhdh-instance.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc[leveloffset=+2]
+include::../modules/shared/proc-generate-new-components.adoc[leveloffset=+2]
 
-include::../modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc[leveloffset=+2]
+include::../modules/shared/proc-register-existing-repositories-manually.adoc[leveloffset=+2]
 
-include::../modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-update-component-yaml-metadata.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-filter-the-catalog-by-entity-kind.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-search-the-catalog-using-text-filters.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-review-the-raw-yaml-configuration.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-star-key-components-in-the-software-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-star-frequently-used-components.adoc[leveloffset=+1]
 
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]
diff --git a/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-import-your-team-s-codebase-from-git.adoc b/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-import-your-team-s-codebase-from-git.adoc
index a1c197d7ddd..2ab65d853dd 100644
--- a/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-import-your-team-s-codebase-from-git.adoc
+++ b/assemblies/develop_streamline-software-development-and-management-in-rhdh/assembly-import-your-team-s-codebase-from-git.adoc
@@ -12,12 +12,12 @@ ifdef::context[:parent-context: {context}]
 
 include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
-include::../modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
+include::../modules/shared/proc-select-and-import-github-repositories.adoc[leveloffset=+1]
 
 include::../modules/develop_streamline-software-development-and-management-in-rhdh/proc-manage-the-added-git-repositories.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
+include::../modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]
diff --git a/assemblies/get-started_navigate-rhdh-on-your-first-day/assembly-manage-starred-items-for-quick-access.adoc b/assemblies/get-started_navigate-rhdh-on-your-first-day/assembly-manage-starred-items-for-quick-access.adoc
index e0fd18ea8ad..91cbd9ddbbc 100644
--- a/assemblies/get-started_navigate-rhdh-on-your-first-day/assembly-manage-starred-items-for-quick-access.adoc
+++ b/assemblies/get-started_navigate-rhdh-on-your-first-day/assembly-manage-starred-items-for-quick-access.adoc
@@ -11,7 +11,7 @@ To streamline your daily workflow and reduce navigation time, use the starring f
 
 This personalization makes sure that you can locate the specific tools and documentation you use most often without performing repetitive searches across the software ecosystem.
 
-include::../modules/shared/proc-star-key-components-in-the-software-catalog.adoc[leveloffset=+1]
+include::../modules/shared/proc-star-frequently-used-components.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 == Additional resources
diff --git a/assemblies/shared/assembly-bulk-importing-from-github.adoc b/assemblies/shared/assembly-bulk-importing-from-github.adoc
index 6f81491a6d6..4f552625519 100644
--- a/assemblies/shared/assembly-bulk-importing-from-github.adoc
+++ b/assemblies/shared/assembly-bulk-importing-from-github.adoc
@@ -13,15 +13,15 @@ include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 include::../modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
+include::../modules/shared/proc-select-and-import-github-repositories.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
+include::../modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
 
-include::../modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
+include::../modules/shared/con-review-input-parameters.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
+include::../modules/shared/proc-create-custom-scaffolder-workflows.adoc[leveloffset=+1]
 
 include::../modules/shared/proc-run-orchestrator-workflows-for-bulk-imports.adoc[leveloffset=+1]
 
diff --git a/assemblies/shared/assembly-bulk-importing-from-gitlab.adoc b/assemblies/shared/assembly-bulk-importing-from-gitlab.adoc
index f571615d920..b2472fd9adc 100644
--- a/assemblies/shared/assembly-bulk-importing-from-gitlab.adoc
+++ b/assemblies/shared/assembly-bulk-importing-from-gitlab.adoc
@@ -13,15 +13,15 @@ include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 include::../modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1]
+include::../modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
+include::../modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
 
-include::../modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
+include::../modules/shared/con-review-input-parameters.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
+include::../modules/shared/proc-create-custom-scaffolder-workflows.adoc[leveloffset=+1]
 
 include::../modules/shared/proc-run-orchestrator-workflows-for-bulk-imports.adoc[leveloffset=+1]
 
diff --git a/assemblies/shared/assembly-bulk-importing-in-rhdh.adoc b/assemblies/shared/assembly-bulk-importing-in-rhdh.adoc
index e7484dc757e..ce669d7f54c 100644
--- a/assemblies/shared/assembly-bulk-importing-in-rhdh.adoc
+++ b/assemblies/shared/assembly-bulk-importing-in-rhdh.adoc
@@ -13,17 +13,17 @@ include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 include::../modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
+include::../modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
+include::../modules/shared/proc-select-and-import-github-repositories.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1]
+include::../modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
+include::../modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
 
-include::../modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
+include::../modules/shared/con-review-input-parameters.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
+include::../modules/shared/proc-create-custom-scaffolder-workflows.adoc[leveloffset=+1]
 
 include::../modules/shared/proc-run-orchestrator-workflows-for-bulk-imports.adoc[leveloffset=+1]
 
diff --git a/assemblies/shared/assembly-import-and-use-an-existing-software-template-for-faster-development.adoc b/assemblies/shared/assembly-import-and-use-an-existing-software-template-for-faster-development.adoc
index e8744492de3..88d327480a2 100644
--- a/assemblies/shared/assembly-import-and-use-an-existing-software-template-for-faster-development.adoc
+++ b/assemblies/shared/assembly-import-and-use-an-existing-software-template-for-faster-development.adoc
@@ -11,11 +11,11 @@ To standardize and accelerate the creation of new software, use Software Templat
 
 Each template uses a YAML definition to present a functional interface for inputting project metadata. Software Templates run a sequential series of _actions_, such as scaffolding code or creating repositories, which you can configure to run conditionally based on user input.
 
-include::../modules/shared/proc-create-a-software-component-using-software-templates.adoc[leveloffset=+1]
+include::../modules/shared/proc-run-software-templates-from-the-ui.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc[leveloffset=+1]
+include::../modules/shared/proc-browse-available-templates.adoc[leveloffset=+1]
 
-include::../modules/shared/proc-import-an-existing-software-template.adoc[leveloffset=+1]
+include::../modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 [role="_additional-resources"]
diff --git a/modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc b/modules/shared/con-review-input-parameters.adoc
similarity index 93%
rename from modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc
rename to modules/shared/con-review-input-parameters.adoc
index bf2d0605022..e0fbf423397 100644
--- a/modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc
+++ b/modules/shared/con-review-input-parameters.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: CONCEPT
 
-[id="input-parameters-for-bulk-import-scaffolder-template_{context}"]
-= Input parameters for Bulk Import Scaffolder template
+[id="review-input-parameters_{context}"]
+= Review input parameters
 
 [role="_abstract"]
 Define Scaffolder template parameters such as repository URL, name, organization, and branch details to customize bulk import automation workflows for your repositories.
diff --git a/modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc b/modules/shared/proc-browse-available-templates.adoc
similarity index 73%
rename from modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc
rename to modules/shared/proc-browse-available-templates.adoc
index 8026533e828..00090df7d37 100644
--- a/modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc
+++ b/modules/shared/proc-browse-available-templates.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="search-and-filter-software-templates-in-your-rhdh-instance_{context}"]
-= Search and filter Software Templates in your {product} instance
+[id="browse-available-templates_{context}"]
+= Browse available templates
 
 [role="_abstract"]
 Search and filter the available Software Templates to quickly locate the correct configuration for your project.
diff --git a/modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc b/modules/shared/proc-configure-provenance-annotations.adoc
similarity index 95%
rename from modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc
rename to modules/shared/proc-configure-provenance-annotations.adoc
index 465c76f51a1..893bc392992 100644
--- a/modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc
+++ b/modules/shared/proc-configure-provenance-annotations.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="configure-provenance-and-software-template-versioning-rhdh_{context}"]
-= Configure provenance and Software Template versioning {product}
+[id="configure-provenance-annotations_{context}"]
+= Configure provenance annotations
 
 [role="_abstract"]
 Modify the Software Template YAML definition to add provenance information during the scaffolding process.
diff --git a/modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc b/modules/shared/proc-create-custom-scaffolder-workflows.adoc
similarity index 95%
rename from modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc
rename to modules/shared/proc-create-custom-scaffolder-workflows.adoc
index 4d5b3645ef0..44fa4cfa1f4 100644
--- a/modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc
+++ b/modules/shared/proc-create-custom-scaffolder-workflows.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="set-up-a-custom-scaffolder-workflow-for-bulk-import_{context}"]
-= Set up a custom Scaffolder workflow for Bulk Import
+[id="create-custom-scaffolder-workflows_{context}"]
+= Create custom Scaffolder workflows
 
 [role="_abstract"]
 Create custom Scaffolder templates aligned with your organization's repository conventions to automate bulk import tasks such as entity imports, pull request creation, and webhook integration.
diff --git a/modules/shared/proc-create-a-basic-software-template.adoc b/modules/shared/proc-create-new-software-templates.adoc
similarity index 95%
rename from modules/shared/proc-create-a-basic-software-template.adoc
rename to modules/shared/proc-create-new-software-templates.adoc
index 65f9749028a..5c8d8dfb643 100644
--- a/modules/shared/proc-create-a-basic-software-template.adoc
+++ b/modules/shared/proc-create-new-software-templates.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="create-a-basic-software-template_{context}"]
-= Create a basic software template
+[id="create-new-software-templates_{context}"]
+= Create new Software Templates
 
 [role="_abstract"]
 To automate the setup of standardized environments for your developers, you must create a template definition. This definition allows {product-very-short} to automate the repetitive tasks of repository creation and initial configuration.
diff --git a/modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc b/modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc
similarity index 94%
rename from modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc
rename to modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc
index c719c82f487..a8059ec5313 100644
--- a/modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc
+++ b/modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="enable-and-authorize-bulk-import-capabilities-in-rhdh_{context}"]
-= Enable and authorize Bulk Import capabilities in {product}
+[id="enable-and-authorize-bulk-import-plugins_{context}"]
+= Enable and authorize bulk import plugins
 
 [role="_abstract"]
 Enable Bulk Import plugins and configure RBAC permissions to allow users to import multiple GitHub repositories and GitLab projects into the catalog.
diff --git a/modules/shared/proc-enable-automated-template-updates.adoc b/modules/shared/proc-enable-the-scaffolder-relation-processor.adoc
similarity index 95%
rename from modules/shared/proc-enable-automated-template-updates.adoc
rename to modules/shared/proc-enable-the-scaffolder-relation-processor.adoc
index 1991253e81d..f42024cb628 100644
--- a/modules/shared/proc-enable-automated-template-updates.adoc
+++ b/modules/shared/proc-enable-the-scaffolder-relation-processor.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="enable-automated-template-updates_{context}"]
-= Enable automated template updates
+[id="enable-the-scaffolder-relation-processor_{context}"]
+= Enable the scaffolder-relation-processor
 
 [role="_abstract"]
 Configure the scaffolder-relation-processor plugin to synchronize Software Template changes to downstream repositories.
diff --git a/modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc b/modules/shared/proc-enable-update-notifications.adoc
similarity index 91%
rename from modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc
rename to modules/shared/proc-enable-update-notifications.adoc
index 6bc2d35d65a..fa418037f81 100644
--- a/modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc
+++ b/modules/shared/proc-enable-update-notifications.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="enable-software-template-version-update-notifications-in-rhdh_{context}"]
-= Enable Software Template version update notifications in {product}
+[id="enable-update-notifications_{context}"]
+= Enable update notifications
 
 [role="_abstract"]
 Enable notification alerts for template version updates so that component owners are automatically notified when the Software Template used to generate their components is updated to a new version.
diff --git a/modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc b/modules/shared/proc-filter-the-catalog-by-entity-kind.adoc
similarity index 85%
rename from modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc
rename to modules/shared/proc-filter-the-catalog-by-entity-kind.adoc
index d386fba719c..6637449e93b 100644
--- a/modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc
+++ b/modules/shared/proc-filter-the-catalog-by-entity-kind.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: PROCEDURE
-[id="find-components-by-kind-in-the-rhdh-catalog_{context}"]
-= Find components by Kind in the {product} catalog
+[id="filter-the-catalog-by-entity-kind_{context}"]
+= Filter the catalog by entity kind
 
 [role="_abstract"]
 Filter the Software Catalog to display components by their type, such as Component, API, or Template.
diff --git a/modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc b/modules/shared/proc-generate-new-components.adoc
similarity index 85%
rename from modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc
rename to modules/shared/proc-generate-new-components.adoc
index 90342edc3c7..bd83113247b 100644
--- a/modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc
+++ b/modules/shared/proc-generate-new-components.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="create-new-components-in-your-rhdh-instance_{context}"]
-= Create new components in your {product} instance
+[id="generate-new-components_{context}"]
+= Generate new components
 
 [role="_abstract"]
 You can create new components in the Software Catalog in your {product-very-short} instance. {product} automatically registers all components that developers or platform engineers create using Templates in the Software Catalog.
diff --git a/modules/shared/proc-import-an-existing-software-template.adoc b/modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc
similarity index 90%
rename from modules/shared/proc-import-an-existing-software-template.adoc
rename to modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc
index 927fa7a6714..c2e2ea191de 100644
--- a/modules/shared/proc-import-an-existing-software-template.adoc
+++ b/modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="import-an-existing-software-template_{context}"]
-= Import an existing Software Template
+[id="import-an-existing-template-file-using-the-catalog-processor_{context}"]
+= Import an existing template file using the Catalog Processor
 
 [role="_abstract"]
 You can use the *Catalog Processor* to import an existing Software Template into your {product} instance.
diff --git a/modules/shared/proc-import-multiple-gitlab-repositories.adoc b/modules/shared/proc-manage-imported-repositories.adoc
similarity index 96%
rename from modules/shared/proc-import-multiple-gitlab-repositories.adoc
rename to modules/shared/proc-manage-imported-repositories.adoc
index e8ea75214e5..db32371ef7e 100644
--- a/modules/shared/proc-import-multiple-gitlab-repositories.adoc
+++ b/modules/shared/proc-manage-imported-repositories.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="import-multiple-gitlab-repositories_{context}"]
-= Import multiple GitLab repositories
+[id="manage-imported-repositories_{context}"]
+= Manage imported repositories
 
 [role="_abstract"]
 Select and import multiple GitLab projects that you can access into the {product} catalog, automatically creating merge requests with required catalog-info.yaml files.
diff --git a/modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc b/modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc
similarity index 96%
rename from modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc
rename to modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc
index b4d00b8a261..cc1174e2c23 100644
--- a/modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc
+++ b/modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="monitor-bulk-import-actions-using-audit-logs_{context}"]
-= Monitor Bulk Import actions using audit logs
+[id="monitor-bulk-import-operations-in-audit-logs_{context}"]
+= Monitor bulk import operations in audit logs
 
 [role="_abstract"]
 Review Bulk Import backend plugin audit log events to monitor repository import operations, track API requests, and troubleshoot import issues.
diff --git a/modules/shared/proc-share-software-templates-with-your-organization.adoc b/modules/shared/proc-publish-template-definitions-to-the-catalog.adoc
similarity index 88%
rename from modules/shared/proc-share-software-templates-with-your-organization.adoc
rename to modules/shared/proc-publish-template-definitions-to-the-catalog.adoc
index 967b62a88bc..02c13553a3d 100644
--- a/modules/shared/proc-share-software-templates-with-your-organization.adoc
+++ b/modules/shared/proc-publish-template-definitions-to-the-catalog.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="share-software-templates-with-your-organization_{context}"]
-= Share software templates with your organization
+[id="publish-template-definitions-to-the-catalog_{context}"]
+= Publish template definitions to the catalog
 
 [role="_abstract"]
 To allow developers to create new projects independently using your standards, you must publish the Software Template definition to the {product-very-short} catalog. This registration makes the template a selectable option in the software creator interface.
diff --git a/modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc b/modules/shared/proc-register-existing-repositories-manually.adoc
similarity index 92%
rename from modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc
rename to modules/shared/proc-register-existing-repositories-manually.adoc
index e90eb133a05..49d4d5c012a 100644
--- a/modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc
+++ b/modules/shared/proc-register-existing-repositories-manually.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="register-components-manually-in-your-rhdh-instance_{context}"]
-= Register components manually in your {product-very-short} instance
+[id="register-existing-repositories-manually_{context}"]
+= Register existing repositories manually
 
 [role="_abstract"]
 To manually register components in your {product-very-short} instance, create a `catalog-info.yaml` file and register it with your {product} instance.
diff --git a/modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc b/modules/shared/proc-review-the-raw-yaml-configuration.adoc
similarity index 75%
rename from modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc
rename to modules/shared/proc-review-the-raw-yaml-configuration.adoc
index f7a213a6356..0a9ac6e6558 100644
--- a/modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc
+++ b/modules/shared/proc-review-the-raw-yaml-configuration.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="review-the-yaml-configuration-of-your-rhdh-software-catalog_{context}"]
-= Review the YAML configuration of your {product} Software Catalog
+[id="review-the-raw-yaml-configuration_{context}"]
+= Review the raw YAML configuration
 
 [role="_abstract"]
 You can view the Software Catalog YAML file in your {product} instance to review the metadata for the components in your Software Catalog.
diff --git a/modules/shared/proc-create-a-software-component-using-software-templates.adoc b/modules/shared/proc-run-software-templates-from-the-ui.adoc
similarity index 91%
rename from modules/shared/proc-create-a-software-component-using-software-templates.adoc
rename to modules/shared/proc-run-software-templates-from-the-ui.adoc
index c6f0e0b4e6c..a1a0f9104f3 100644
--- a/modules/shared/proc-create-a-software-component-using-software-templates.adoc
+++ b/modules/shared/proc-run-software-templates-from-the-ui.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="create-a-software-component-using-software-templates_{context}"]
-= Create a software component using Software Templates
+[id="run-software-templates-from-the-ui_{context}"]
+= Run Software Templates from the UI
 
 [role="_abstract"]
 To ensure project consistency and reduce manual configuration time, use Software Templates to create new components.
diff --git a/modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc b/modules/shared/proc-search-the-catalog-using-text-filters.adoc
similarity index 82%
rename from modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc
rename to modules/shared/proc-search-the-catalog-using-text-filters.adoc
index 976c05f234b..55ad4e9bd91 100644
--- a/modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc
+++ b/modules/shared/proc-search-the-catalog-using-text-filters.adoc
@@ -3,8 +3,8 @@
 // Module included in the following assemblies:
 //
 // * assemblies/assembly-about-software-catalogs.adoc
-[id="filter-components-by-text-in-the-rhdh-catalog_{context}"]
-= Filter components by text in the {product} catalog
+[id="search-the-catalog-using-text-filters_{context}"]
+= Search the catalog using text filters
 
 [role="_abstract"]
 Search and filter components by text in the Software Catalog to quickly locate specific services, libraries, or other entities.
diff --git a/modules/shared/proc-import-multiple-github-repositories.adoc b/modules/shared/proc-select-and-import-github-repositories.adoc
similarity index 95%
rename from modules/shared/proc-import-multiple-github-repositories.adoc
rename to modules/shared/proc-select-and-import-github-repositories.adoc
index 0c33ccde7f1..686b142f937 100644
--- a/modules/shared/proc-import-multiple-github-repositories.adoc
+++ b/modules/shared/proc-select-and-import-github-repositories.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="import-multiple-github-repositories_{context}"]
-= Import multiple GitHub repositories
+[id="select-and-import-github-repositories_{context}"]
+= Select and import GitHub repositories
 
 [role="_abstract"]
 Select and import multiple GitHub repositories that you can access into the {product} catalog, automatically creating pull requests with required catalog-info.yaml files.
diff --git a/modules/shared/proc-star-key-components-in-the-software-catalog.adoc b/modules/shared/proc-star-frequently-used-components.adoc
similarity index 81%
rename from modules/shared/proc-star-key-components-in-the-software-catalog.adoc
rename to modules/shared/proc-star-frequently-used-components.adoc
index 58cd21de41f..eb1d8957da9 100644
--- a/modules/shared/proc-star-key-components-in-the-software-catalog.adoc
+++ b/modules/shared/proc-star-frequently-used-components.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="star-key-components-in-the-software-catalog_{context}"]
-= Star key components in the Software Catalog
+[id="star-frequently-used-components_{context}"]
+= Star frequently used components
 
 [role="_abstract"]
 You can add commonly used components to the *Your Starred Entities* card for quick access.
diff --git a/modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc b/modules/shared/proc-update-component-yaml-metadata.adoc
similarity index 85%
rename from modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc
rename to modules/shared/proc-update-component-yaml-metadata.adoc
index ad52dc1c429..e9525331594 100644
--- a/modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc
+++ b/modules/shared/proc-update-component-yaml-metadata.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="update-existing-components-in-your-rhdh-catalog_{context}"]
-= Update existing components in your {product} catalog
+[id="update-component-yaml-metadata_{context}"]
+= Update component YAML metadata
 
 [role="_abstract"]
 You can update components in the Software Catalog in your {product} instance.
diff --git a/modules/shared/proc-version-a-software-template-in-rhdh.adoc b/modules/shared/proc-version-software-templates.adoc
similarity index 96%
rename from modules/shared/proc-version-a-software-template-in-rhdh.adoc
rename to modules/shared/proc-version-software-templates.adoc
index 225d4463020..cf6b4684779 100644
--- a/modules/shared/proc-version-a-software-template-in-rhdh.adoc
+++ b/modules/shared/proc-version-software-templates.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="version-a-software-template-in-rhdh_{context}"]
-= Version a Software Template in {product}
+[id="version-software-templates_{context}"]
+= Version Software Templates
 
 [role="_abstract"]
 Version Software Templates by using the `catalog:scaffolded-from` and `catalog:template:version` custom actions to track template versions and the entities created from them.
diff --git a/modules/shared/proc-view-software-template-dependencies.adoc b/modules/shared/proc-view-template-dependencies-in-the-catalog.adoc
similarity index 89%
rename from modules/shared/proc-view-software-template-dependencies.adoc
rename to modules/shared/proc-view-template-dependencies-in-the-catalog.adoc
index 6c5573dbeba..d5e1e393a32 100644
--- a/modules/shared/proc-view-software-template-dependencies.adoc
+++ b/modules/shared/proc-view-template-dependencies-in-the-catalog.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="view-software-template-dependencies_{context}"]
-= View Software Template dependencies
+[id="view-template-dependencies-in-the-catalog_{context}"]
+= View template dependencies in the catalog
 
 [role="_abstract"]
 View all entities created from a specific Software Template to identify the complete dependency and impact map.
diff --git a/modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc b/modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc
similarity index 78%
rename from modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc
rename to modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc
index 1c32e3b807b..79b0df592fe 100644
--- a/modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc
+++ b/modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: REFERENCE
 
-[id="extending-software-templates-for-complex-project-requirements_{context}"]
-= Extending software templates for complex project requirements
+[id="extend-templates-using-conditional-logic-and-external-fetch-capabilities_{context}"]
+= Extend templates using conditional logic and external fetch capabilities
 
 [role="_abstract"]
 Use advanced logic to create Software Templates that adapt to specific project requirements and user inputs. Advanced templating includes parameterization, conditional logic, and fetch-and-run capabilities.
diff --git a/modules/shared/ref-template-sync-considerations-and-limitations.adoc b/modules/shared/ref-template-sync-limitations.adoc
similarity index 92%
rename from modules/shared/ref-template-sync-considerations-and-limitations.adoc
rename to modules/shared/ref-template-sync-limitations.adoc
index aab027324ec..d13635e70f0 100644
--- a/modules/shared/ref-template-sync-considerations-and-limitations.adoc
+++ b/modules/shared/ref-template-sync-limitations.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: REFERENCE
 
-[id="template-sync-considerations-and-limitations_{context}"]
-= Template sync considerations and limitations
+[id="template-sync-limitations_{context}"]
+= Template sync limitations
 
 [role="_abstract"]
 Review reviewer assignment, variable resolution limitations, and other details to troubleshoot the synchronization process.
diff --git a/modules/shared/ref-sample-software-template.adoc b/modules/shared/ref-use-sample-templates.adoc
similarity index 95%
rename from modules/shared/ref-sample-software-template.adoc
rename to modules/shared/ref-use-sample-templates.adoc
index 128df1277ea..b0945bde710 100644
--- a/modules/shared/ref-sample-software-template.adoc
+++ b/modules/shared/ref-use-sample-templates.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: REFERENCE
 
-[id="sample-software-template_{context}"]
-= Sample software template
+[id="use-sample-templates_{context}"]
+= Use sample templates
 
 [role="_abstract"]
 This sample Software Template defines project parameters and publishes the generated code to a GitHub repository.
diff --git a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
index be61053d1e4..ee0706ca101 100644
--- a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
+++ b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
@@ -6,6 +6,6 @@
 
 include::con-automate-template-lifecycle-management.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-automated-template-updates.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-the-scaffolder-relation-processor.adoc[leveloffset=+1]
 
-include::modules/shared/ref-template-sync-considerations-and-limitations.adoc[leveloffset=+1]
+include::modules/shared/ref-template-sync-limitations.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
index a349d1a9024..8ef33107619 100644
--- a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
@@ -6,10 +6,10 @@
 
 include::con-configure-bulk-import-capabilities.adoc[leveloffset=+1]
 
-include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Select and import Git projects"]
+include::modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1,navtitle="Select and import Git projects"]
 
-include::modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
+include::modules/shared/con-review-input-parameters.adoc[leveloffset=+1]
 
-include::modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
+include::modules/shared/proc-create-custom-scaffolder-workflows.adoc[leveloffset=+1]
 
 include::nav-register-repository-lists-with-the-orchestrator.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
index 3761efc00b0..0fc43aa0272 100644
--- a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
+++ b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
@@ -8,10 +8,10 @@ include::con-import-source-code-repositories-in-bulk.adoc[leveloffset=+1]
 
 include::modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
 
-include::modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
+include::modules/shared/proc-select-and-import-github-repositories.adoc[leveloffset=+1]
 
-include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Manage imported repositories"]
+include::modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1,navtitle="Manage imported repositories"]
 
-include::modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
+include::modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
index 0ed5c2ffd0b..60c168599dd 100644
--- a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
@@ -8,12 +8,12 @@ include::con-manage-your-software-components.adoc[leveloffset=+1]
 
 include::nav-register-new-software-components.adoc[leveloffset=+1]
 
-include::modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-update-component-yaml-metadata.adoc[leveloffset=+1]
 
-include::modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-filter-the-catalog-by-entity-kind.adoc[leveloffset=+1]
 
-include::modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-search-the-catalog-using-text-filters.adoc[leveloffset=+1]
 
-include::modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-review-the-raw-yaml-configuration.adoc[leveloffset=+1]
 
-include::modules/shared/proc-star-key-components-in-the-software-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-star-frequently-used-components.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
index 195ce8053ac..a51170a22ee 100644
--- a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
@@ -6,13 +6,13 @@
 
 include::con-project-standardization-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-a-basic-software-template.adoc[leveloffset=+1]
+include::modules/shared/proc-create-new-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/ref-sample-software-template.adoc[leveloffset=+1]
+include::modules/shared/ref-use-sample-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1]
+include::modules/shared/proc-publish-template-definitions-to-the-catalog.adoc[leveloffset=+1]
 
-include::modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc[leveloffset=+1]
+include::modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc[leveloffset=+1]
 
 include::nav-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
index 7eafe557089..b69ccf13dd5 100644
--- a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
@@ -6,6 +6,6 @@
 
 include::con-register-new-software-components.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc[leveloffset=+1]
+include::modules/shared/proc-generate-new-components.adoc[leveloffset=+1]
 
-include::modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc[leveloffset=+1]
+include::modules/shared/proc-register-existing-repositories-manually.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
index 91bd063b8d3..a383df5fbb8 100644
--- a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
@@ -6,8 +6,8 @@
 
 include::con-standardized-project-generation-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-a-software-component-using-software-templates.adoc[leveloffset=+1]
+include::modules/shared/proc-run-software-templates-from-the-ui.adoc[leveloffset=+1]
 
-include::modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc[leveloffset=+1]
+include::modules/shared/proc-browse-available-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-import-an-existing-software-template.adoc[leveloffset=+1]
+include::modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
index be96106b0c8..f1a0d9f4188 100644
--- a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
@@ -6,6 +6,6 @@
 
 include::con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc[leveloffset=+1]
+include::modules/shared/proc-configure-provenance-annotations.adoc[leveloffset=+1]
 
-include::modules/shared/proc-view-software-template-dependencies.adoc[leveloffset=+1]
+include::modules/shared/proc-view-template-dependencies-in-the-catalog.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
index 7e2b550297a..1cd2c0b88ec 100644
--- a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -6,6 +6,6 @@
 
 include::con-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
-include::modules/shared/proc-version-a-software-template-in-rhdh.adoc[leveloffset=+1]
+include::modules/shared/proc-version-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-update-notifications.adoc[leveloffset=+1]

From d29487e42ef4aaf95ee110466c2cf3c0041262a7 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Fri, 19 Jun 2026 12:57:37 +0530
Subject: [PATCH 04/12] Fix broken xrefs after module renames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update cross-references to use the new module IDs after files were renamed:
- enable-and-authorize-bulk-import-capabilities-in-rhdh → enable-and-authorize-bulk-import-plugins
- import-multiple-github-repositories → select-and-import-github-repositories

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../proc-manage-the-added-git-repositories.adoc                 | 2 +-
 modules/shared/proc-select-and-import-github-repositories.adoc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/develop_streamline-software-development-and-management-in-rhdh/proc-manage-the-added-git-repositories.adoc b/modules/develop_streamline-software-development-and-management-in-rhdh/proc-manage-the-added-git-repositories.adoc
index ad4c3243e1e..04205d6d542 100644
--- a/modules/develop_streamline-software-development-and-management-in-rhdh/proc-manage-the-added-git-repositories.adoc
+++ b/modules/develop_streamline-software-development-and-management-in-rhdh/proc-manage-the-added-git-repositories.adoc
@@ -7,7 +7,7 @@
 You can oversee and manage the Git repositories that are imported to {product-short}.
 
 .Prerequisites
-* You have xref:import-multiple-github-repositories_{context}[imported GitHub repositories].
+* You have xref:select-and-import-github-repositories_{context}[imported GitHub repositories].
 
 
 .Procedure
diff --git a/modules/shared/proc-select-and-import-github-repositories.adoc b/modules/shared/proc-select-and-import-github-repositories.adoc
index 686b142f937..9862dde459c 100644
--- a/modules/shared/proc-select-and-import-github-repositories.adoc
+++ b/modules/shared/proc-select-and-import-github-repositories.adoc
@@ -7,7 +7,7 @@
 Select and import multiple GitHub repositories that you can access into the {product} catalog, automatically creating pull requests with required catalog-info.yaml files.
 
 .Prerequisites
-* You have xref:enable-and-authorize-bulk-import-capabilities-in-rhdh_{context}[enabled the Bulk Import feature and configured access permissions].
+* You have xref:enable-and-authorize-bulk-import-plugins_{context}[enabled the Bulk Import feature and configured access permissions].
 * You have {authentication-book-link}#enabling-user-authentication-with-github[authenticated to {product-short} using GitHub as your authentication provider].
 
 [NOTE]

From 114310ef841a06eb4237d4168bd1787f3f3ead38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= <ffloreth@redhat.com>
Date: Fri, 19 Jun 2026 14:53:20 +0200
Subject: [PATCH 05/12] [RHIDP-14526][RHIDP-14531][RHIDP-14532][RHIDP-14534]:
 Populate Install category MAP files with module includes (#2390)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabrice Flore-Thébault <ffloreth@redhat.com>
---
 .../proc-deploy-on-gke-with-the-helm-chart.adoc  |  2 +-
 ...ms-using-helm-in-air-gapped-environments.adoc |  8 +++++++-
 ...-using-helm-in-an-air-gapped-environment.adoc |  2 +-
 ...ir-gapped-environment-using-the-operator.adoc |  2 +-
 ...con-install-in-an-air-gapped-environment.adoc |  2 +-
 ...ic-kubernetes-service-using-the-operator.adoc | 12 +++++++++++-
 ...gle-kubernetes-engine-using-the-operator.adoc | 12 +++++++++++-
 ...nments-to-integrate-with-cloud-resources.adoc |  2 +-
 ...re-kubernetes-service-using-the-operator.adoc | 12 +++++++++++-
 ...leverage-existing-red-hat-infrastructure.adoc |  2 +-
 ...-container-platform-using-the-helm-chart.adoc |  5 ++++-
 ...ft-container-platform-using-the-operator.adoc |  2 +-
 ...ms-using-helm-in-air-gapped-environments.adoc |  4 ++++
 ...-using-helm-in-an-air-gapped-environment.adoc |  4 ++++
 ...ir-gapped-environment-using-the-operator.adoc |  4 ++++
 ...nav-install-in-an-air-gapped-environment.adoc |  8 ++++----
 ...ic-kubernetes-service-using-the-operator.adoc | 10 ++++++++++
 ...gle-kubernetes-engine-using-the-operator.adoc | 10 ++++++++++
 ...nments-to-integrate-with-cloud-resources.adoc | 16 ++++++++--------
 ...re-kubernetes-service-using-the-operator.adoc | 10 ++++++++++
 ...leverage-existing-red-hat-infrastructure.adoc |  6 +++---
 ...-container-platform-using-the-helm-chart.adoc |  4 ++++
 ...ft-container-platform-using-the-operator.adoc |  4 ++++
 23 files changed, 116 insertions(+), 27 deletions(-)

diff --git a/modules/shared/proc-deploy-on-gke-with-the-helm-chart.adoc b/modules/shared/proc-deploy-on-gke-with-the-helm-chart.adoc
index d543924db87..9fe33d5959d 100644
--- a/modules/shared/proc-deploy-on-gke-with-the-helm-chart.adoc
+++ b/modules/shared/proc-deploy-on-gke-with-the-helm-chart.adoc
@@ -88,7 +88,7 @@ For more information about setting a policy to redirect to HTTPS, see https://cl
 
 . Create a file named `values.yaml` using the following template:
 +
-.Example `values.yaml` file
+Example `values.yaml` file:
 [source,yaml,subs="attributes+"]
 ----
 global:
diff --git a/titles/product_product/category-maps/install/con-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc b/titles/product_product/category-maps/install/con-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
index 20d7b9118b7..cd0717b036d 100644
--- a/titles/product_product/category-maps/install/con-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
+++ b/titles/product_product/category-maps/install/con-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
@@ -3,4 +3,10 @@
 = Deploy on Kubernetes platforms using Helm in air-gapped environments
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Deploy on Kubernetes platforms using Helm in air-gapped environments.
+Install {product} on supported Kubernetes platforms in fully or partially disconnected environments by using the Helm chart.
+
+Supported Kubernetes platforms include the following:
+
+* {aks-brand-name}
+* {eks-brand-name}
+* {gke-brand-name}
diff --git a/titles/product_product/category-maps/install/con-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/install/con-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
index 59204b282bd..c20f4147b73 100644
--- a/titles/product_product/category-maps/install/con-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/install/con-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
@@ -3,4 +3,4 @@
 = Deploy on OpenShift using Helm in an air-gapped environment
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Deploy on OpenShift using Helm in an air-gapped environment.
+Install {product} on {ocp-short} in fully or partially disconnected environments by using the Helm chart.
diff --git a/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment-using-the-operator.adoc b/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment-using-the-operator.adoc
index 3a54a1d3ce1..6087a777874 100644
--- a/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment-using-the-operator.adoc
@@ -3,4 +3,4 @@
 = Install in an air-gapped environment using the Operator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install in an air-gapped environment using the Operator.
+Install {product} in fully or partially disconnected environments by using the Operator.
diff --git a/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment.adoc
index 9d151374f2d..c5a0a9d310d 100644
--- a/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/install/con-install-in-an-air-gapped-environment.adoc
@@ -3,4 +3,4 @@
 = Install in an air-gapped environment
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install in an air-gapped environment.
+Install {product} in a restricted network environment by following a clear installation path that accounts for fully or partially disconnected infrastructure, so you can get {product-short} running securely without requiring direct internet access.
diff --git a/titles/product_product/category-maps/install/con-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc b/titles/product_product/category-maps/install/con-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
index 022686c7a4e..dc5317ce022 100644
--- a/titles/product_product/category-maps/install/con-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
@@ -3,4 +3,14 @@
 = Install on Amazon Elastic Kubernetes Service (EKS) using the Operator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on Amazon Elastic Kubernetes Service (EKS) using the Operator.
+Install {product} on {eks-short} by using the {product} Operator with the Operator Lifecycle Manager (OLM) framework for over-the-air updates and catalogs.
+
+To benefit from over-the-air updates and catalogs provided by Operator-based applications distributed with the Operator Lifecycle Manager (OLM) framework, consider installing {product} by using the {product} Operator distributed in the {rhcr}.
+
+On {eks-short}, the most notable differences over an OpenShift-based installation are:
+
+* The OLM framework and the {rhcr} are not built-in.
+* The {rhcr} pull-secret is not managed globally.
+* To expose the application, Ingresses replace OpenShift Routes.
+
+For clarity, sections highlight these platform-specific additional steps.
diff --git a/titles/product_product/category-maps/install/con-install-on-google-kubernetes-engine-using-the-operator.adoc b/titles/product_product/category-maps/install/con-install-on-google-kubernetes-engine-using-the-operator.adoc
index 6b4df733b64..6256519f933 100644
--- a/titles/product_product/category-maps/install/con-install-on-google-kubernetes-engine-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-google-kubernetes-engine-using-the-operator.adoc
@@ -3,4 +3,14 @@
 = Install on Google Kubernetes Engine (GKE) using the Operator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on Google Kubernetes Engine (GKE) using the Operator.
+Install {product} on {gke-short} by using the {product} Operator with the Operator Lifecycle Manager (OLM) framework for over-the-air updates and catalogs.
+
+To benefit from over-the-air updates and catalogs provided by Operator-based applications distributed with the Operator Lifecycle Manager (OLM) framework, consider installing {product} by using the {product} Operator distributed in the {rhcr}.
+
+On {gke-short}, the most notable differences over an OpenShift-based installation are:
+
+* The OLM framework and the {rhcr} are not built-in.
+* The {rhcr} pull-secret is not managed globally.
+* To expose the application, Ingresses replace OpenShift Routes.
+
+For clarity, sections highlight these platform-specific additional steps.
diff --git a/titles/product_product/category-maps/install/con-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc b/titles/product_product/category-maps/install/con-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
index 5ca70ef6b87..aebef54626b 100644
--- a/titles/product_product/category-maps/install/con-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
@@ -3,4 +3,4 @@
 = Install on managed hyperscaler environments to integrate with cloud resources
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on managed hyperscaler environments to integrate with cloud resources.
+Install {product} on managed cloud Kubernetes platforms by following a clear installation path for your specific hyperscaler environment, so you can get {product-short} running on {eks-short}, {gke-short}, {aks-short}, or {osd-short} without having to adapt generic instructions.
diff --git a/titles/product_product/category-maps/install/con-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc b/titles/product_product/category-maps/install/con-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
index 437af148bc5..9b5a639aa9e 100644
--- a/titles/product_product/category-maps/install/con-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
@@ -3,4 +3,14 @@
 = Install on Microsoft Azure Kubernetes Service (AKS) using the Operator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on Microsoft Azure Kubernetes Service (AKS) using the Operator.
+Install {product} on {aks-short} by using the {product} Operator with the Operator Lifecycle Manager (OLM) framework for over-the-air updates and catalogs.
+
+To benefit from over-the-air updates and catalogs provided by Operator-based applications distributed with the Operator Lifecycle Manager (OLM) framework, consider installing {product} by using the {product} Operator distributed in the {rhcr}.
+
+On {aks-short}, the most notable differences over an OpenShift-based installation are:
+
+* The OLM framework and the {rhcr} are not built-in.
+* The {rhcr} pull-secret is not managed globally.
+* To expose the application, Ingresses replace OpenShift Routes.
+
+For clarity, sections highlight these platform-specific additional steps.
diff --git a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
index 8ff6fa7558f..9d9be1e40e0 100644
--- a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
@@ -3,4 +3,4 @@
 = Install on OpenShift Container Platform to leverage existing Red Hat infrastructure
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on OpenShift Container Platform to leverage existing Red Hat infrastructure.
+Install {product} on {ocp-brand-name} by using either the {product} Operator or the Helm chart.
diff --git a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-helm-chart.adoc b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-helm-chart.adoc
index fb30e39d76b..ae49fe87be7 100644
--- a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-helm-chart.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-helm-chart.adoc
@@ -3,4 +3,7 @@
 = Install on OpenShift Container Platform using the Helm chart
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on OpenShift Container Platform using the Helm chart.
+You can install {product} on {ocp-short} by using the Helm chart with one of the following methods:
+
+* The {ocp-short} console
+* The Helm CLI
diff --git a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-operator.adoc b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-operator.adoc
index d619af9f47f..db0d1897750 100644
--- a/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/con-install-on-openshift-container-platform-using-the-operator.adoc
@@ -3,4 +3,4 @@
 = Install on OpenShift Container Platform using the Operator
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Install on OpenShift Container Platform using the Operator.
+You can install {product} on {ocp-short} by using the {product} Operator in the {ocp-short} console.
diff --git a/titles/product_product/category-maps/install/nav-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc b/titles/product_product/category-maps/install/nav-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
index eedd6f8ba3d..2d88408162c 100644
--- a/titles/product_product/category-maps/install/nav-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
+++ b/titles/product_product/category-maps/install/nav-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc
@@ -5,3 +5,7 @@
 :context: deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments
 
 include::con-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc[leveloffset=+1]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-on-a-supported-kubernetes-platform-in-a-fully-disconnected-environment-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Mirror Helm images to deploy in fully disconnected Kubernetes networks"]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-on-a-supported-kubernetes-platform-in-a-partially-disconnected-environment-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Mirror Helm images to local registries for partially disconnected Kubernetes networks"]
diff --git a/titles/product_product/category-maps/install/nav-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/install/nav-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
index 18fdba117a9..2cb155fd566 100644
--- a/titles/product_product/category-maps/install/nav-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/install/nav-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc
@@ -5,3 +5,7 @@
 :context: deploy-on-openshift-using-helm-in-an-air-gapped-environment
 
 include::con-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc[leveloffset=+1]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-on-ocp-in-a-fully-disconnected-environment-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Mirror Helm images to deploy in fully disconnected OpenShift networks"]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-on-ocp-in-a-partially-disconnected-environment-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Mirror Helm images to local registries for partially disconnected networks"]
diff --git a/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment-using-the-operator.adoc b/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment-using-the-operator.adoc
index d210728e2e0..1ac59aab8a4 100644
--- a/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment-using-the-operator.adoc
@@ -5,3 +5,7 @@
 :context: install-in-an-air-gapped-environment-using-the-operator
 
 include::con-install-in-an-air-gapped-environment-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-in-a-fully-disconnected-environment-with-the-operator.adoc[leveloffset=+1,navtitle="Mirror Operator images to deploy in fully disconnected networks"]
+
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/proc-install-rhdh-in-a-partially-disconnected-environment-with-the-operator.adoc[leveloffset=+1,navtitle="Mirror Operator images to local registries for partially disconnected networks"]
diff --git a/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment.adoc b/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment.adoc
index 418ebf5611d..1d37671b80e 100644
--- a/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment.adoc
+++ b/titles/product_product/category-maps/install/nav-install-in-an-air-gapped-environment.adoc
@@ -6,10 +6,10 @@
 
 include::con-install-in-an-air-gapped-environment.adoc[leveloffset=+1]
 
-// TODO: include Isolated network deployments for air-gapped environments
+include::modules/install_installing-rhdh-in-an-air-gapped-environment/con-air-gapped-environment.adoc[leveloffset=+1,navtitle="Isolated network deployments for air-gapped environments"]
 
-// TODO: include Install in an air-gapped environment using the Operator
+include::nav-install-in-an-air-gapped-environment-using-the-operator.adoc[leveloffset=+1]
 
-// TODO: include Deploy on OpenShift using Helm in an air-gapped environment
+include::nav-deploy-on-openshift-using-helm-in-an-air-gapped-environment.adoc[leveloffset=+1]
 
-// TODO: include Deploy on Kubernetes platforms using Helm in air-gapped environments
+include::nav-deploy-on-kubernetes-platforms-using-helm-in-air-gapped-environments.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/install/nav-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc b/titles/product_product/category-maps/install/nav-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
index 141866cf100..1a4af0dc9e0 100644
--- a/titles/product_product/category-maps/install/nav-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc
@@ -5,3 +5,13 @@
 :context: install-on-amazon-elastic-kubernetes-service-using-the-operator
 
 include::con-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-the-operator-on-eks-by-using-olm.adoc[leveloffset=+1,navtitle="Install the Operator using OLM to automate deployments"]
+
+include::modules/shared/proc-provision-your-custom-rhdh-configuration.adoc[leveloffset=+1,navtitle="Provision custom configuration files and secrets to your cluster"]
+
+include::modules/shared/proc-provision-your-pull-secret-to-your-rhdh-instance-namespace.adoc[leveloffset=+1,navtitle="Provision a pull secret to access the container registry"]
+
+include::modules/shared/proc-use-the-rhdh-operator-to-run-rhdh-with-your-custom-configuration.adoc[leveloffset=+1,navtitle="Apply the custom resource to initialize the platform"]
+
+include::modules/shared/proc-expose-your-operator-based-instance-on-eks.adoc[leveloffset=+1,navtitle="Expose your Operator instance using an Ingress resource"]
diff --git a/titles/product_product/category-maps/install/nav-install-on-google-kubernetes-engine-using-the-operator.adoc b/titles/product_product/category-maps/install/nav-install-on-google-kubernetes-engine-using-the-operator.adoc
index 280443a9f0b..4f84773ab1d 100644
--- a/titles/product_product/category-maps/install/nav-install-on-google-kubernetes-engine-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-google-kubernetes-engine-using-the-operator.adoc
@@ -5,3 +5,13 @@
 :context: install-on-google-kubernetes-engine-using-the-operator
 
 include::con-install-on-google-kubernetes-engine-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-the-operator-on-gke-by-using-olm.adoc[leveloffset=+1,navtitle="Install the Operator using OLM to automate deployments"]
+
+include::modules/shared/proc-provision-your-custom-rhdh-configuration.adoc[leveloffset=+1,navtitle="Provision custom configuration files and secrets to your cluster"]
+
+include::modules/shared/proc-provision-your-pull-secret-to-your-rhdh-instance-namespace.adoc[leveloffset=+1,navtitle="Provision a pull secret to access the container registry"]
+
+include::modules/shared/proc-use-the-rhdh-operator-to-run-rhdh-with-your-custom-configuration.adoc[leveloffset=+1,navtitle="Apply the custom resource to initialize the platform"]
+
+include::modules/shared/proc-expose-your-operator-based-instance-on-gke.adoc[leveloffset=+1,navtitle="Expose your Operator instance using an Ingress resource"]
diff --git a/titles/product_product/category-maps/install/nav-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc b/titles/product_product/category-maps/install/nav-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
index 76554fa679a..889c47ed051 100644
--- a/titles/product_product/category-maps/install/nav-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-managed-hyperscaler-environments-to-integrate-with-cloud-resources.adoc
@@ -9,9 +9,9 @@ include::con-install-on-managed-hyperscaler-environments-to-integrate-with-cloud
 // EKS: override platform attributes
 include::../../platform-eks.adoc[]
 
-// TODO: include Install on Amazon Elastic Kubernetes Service (EKS) using the Operator
+include::nav-install-on-amazon-elastic-kubernetes-service-using-the-operator.adoc[leveloffset=+1]
 
-// TODO: include Deploy on Amazon EKS using the Helm chart
+include::modules/shared/proc-deploy-on-eks-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Deploy on Amazon EKS using the Helm chart"]
 
 // Restore platform attributes to OCP defaults
 include::../../platform-ocp.adoc[]
@@ -19,9 +19,9 @@ include::../../platform-ocp.adoc[]
 // GKE: override platform attributes
 include::../../platform-gke.adoc[]
 
-// TODO: include Install on Google Kubernetes Engine (GKE) using the Operator
+include::nav-install-on-google-kubernetes-engine-using-the-operator.adoc[leveloffset=+1]
 
-// TODO: include Deploy on GKE using the Helm chart
+include::modules/shared/proc-deploy-on-gke-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Deploy on GKE using the Helm chart"]
 
 // Restore platform attributes to OCP defaults
 include::../../platform-ocp.adoc[]
@@ -29,13 +29,13 @@ include::../../platform-ocp.adoc[]
 // AKS: override platform attributes
 include::../../platform-aks.adoc[]
 
-// TODO: include Install on Microsoft Azure Kubernetes Service (AKS) using the Operator
+include::nav-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc[leveloffset=+1]
 
-// TODO: include Deploy on AKS using the Helm chart
+include::modules/shared/proc-deploy-rhdh-on-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Deploy on AKS using the Helm chart"]
 
 // Restore platform attributes to OCP defaults
 include::../../platform-ocp.adoc[]
 
-// TODO: include Install on OpenShift Dedicated using the Operator
+include::modules/install_installing-rhdh-on-osd-on-gcp/proc-install-rhdh-on-on-using-the-operator.adoc[leveloffset=+1,navtitle="Install on OpenShift Dedicated using the Operator"]
 
-// TODO: include Deploy on OpenShift Dedicated using the Helm chart
+include::modules/install_installing-rhdh-on-osd-on-gcp/proc-install-rhdh-on-on-using-the-helm-chart.adoc[leveloffset=+1,navtitle="Deploy on OpenShift Dedicated using the Helm chart"]
diff --git a/titles/product_product/category-maps/install/nav-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc b/titles/product_product/category-maps/install/nav-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
index 00afbc5f090..b20cdd458c4 100644
--- a/titles/product_product/category-maps/install/nav-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc
@@ -5,3 +5,13 @@
 :context: install-on-microsoft-azure-kubernetes-service-using-the-operator
 
 include::con-install-on-microsoft-azure-kubernetes-service-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-the-operator-on-aks-by-using-olm.adoc[leveloffset=+1,navtitle="Install the Operator using OLM to automate deployments"]
+
+include::modules/shared/proc-provision-your-custom-rhdh-configuration.adoc[leveloffset=+1,navtitle="Provision custom configuration files and secrets to your cluster"]
+
+include::modules/shared/proc-provision-your-pull-secret-to-your-rhdh-instance-namespace.adoc[leveloffset=+1,navtitle="Provision a pull secret to access the container registry"]
+
+include::modules/shared/proc-use-the-rhdh-operator-to-run-rhdh-with-your-custom-configuration.adoc[leveloffset=+1,navtitle="Apply the custom resource to initialize the platform"]
+
+include::modules/shared/proc-expose-your-operator-based-instance-on-aks.adoc[leveloffset=+1,navtitle="Expose your Operator instance using an Ingress resource"]
diff --git a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
index 633c15bcdff..c64718512a0 100644
--- a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc
@@ -6,8 +6,8 @@
 
 include::con-install-on-openshift-container-platform-to-leverage-existing-red-hat-infrastructure.adoc[leveloffset=+1]
 
-// TODO: include Compare the Helm chart and Operator deployment methods
+include::modules/install_installing-rhdh-on-ocp/con-rhdh-installation-methods-on-ocp.adoc[leveloffset=+1,navtitle="Compare the Helm chart and Operator deployment methods"]
 
-// TODO: include Install on OpenShift Container Platform using the Operator
+include::nav-install-on-openshift-container-platform-using-the-operator.adoc[leveloffset=+1]
 
-// TODO: include Install on OpenShift Container Platform using the Helm chart
+include::nav-install-on-openshift-container-platform-using-the-helm-chart.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-helm-chart.adoc b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-helm-chart.adoc
index c5075d8698a..40a7c5f78b7 100644
--- a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-helm-chart.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-helm-chart.adoc
@@ -5,3 +5,7 @@
 :context: install-on-openshift-container-platform-using-the-helm-chart
 
 include::con-install-on-openshift-container-platform-using-the-helm-chart.adoc[leveloffset=+1]
+
+include::modules/install_installing-rhdh-on-ocp/proc-deploy-rhdh-from-the-ocp-web-console-with-the-helm-chart.adoc[leveloffset=+1,navtitle="Deploy from the web console"]
+
+include::modules/install_installing-rhdh-on-ocp/proc-deploy-rhdh-on-ocp-with-the-helm-cli.adoc[leveloffset=+1,navtitle="Deploy with the Helm CLI"]
diff --git a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-operator.adoc b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-operator.adoc
index e1f11230c77..5fa78d5ccd7 100644
--- a/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-operator.adoc
+++ b/titles/product_product/category-maps/install/nav-install-on-openshift-container-platform-using-the-operator.adoc
@@ -5,3 +5,7 @@
 :context: install-on-openshift-container-platform-using-the-operator
 
 include::con-install-on-openshift-container-platform-using-the-operator.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-the-rhdh-operator.adoc[leveloffset=+1,navtitle="Install the Operator"]
+
+include::modules/shared/proc-provision-your-custom-rhdh-configuration.adoc[leveloffset=+1,navtitle="Deploy the instance"]

From dcceb89709db5ba751efb1229d91e8cf874e1b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= <ffloreth@redhat.com>
Date: Fri, 19 Jun 2026 16:23:20 +0200
Subject: [PATCH 06/12] [RHIDP-14698][RHIDP-14699][RHIDP-14700][RHIDP-14701]:
 Populate Reference category MAP files with module includes (#2396)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../ref-community-supported-plugins.adoc         |  2 +-
 ...ref-community-supported-plugins.template.adoc |  2 +-
 .../ref-other-installable-plugins.adoc           |  2 +-
 .../ref-technology-preview-plugins.adoc          |  2 +-
 .../ref-technology-preview-plugins.template.adoc |  2 +-
 .../con-diagnostic-data-collection-overview.adoc |  2 +-
 ...ameter-reference-for-configuration-paths.adoc |  6 +++++-
 ...parameters-to-define-advanced-deployment.adoc |  5 ++++-
 .../con-helm-chart-configuration-parameters.adoc | 10 +++++++++-
 .../con-opentelemetry-configurations.adoc        |  6 ------
 ...-rules-reference-for-rbac-configurations.adoc |  5 ++++-
 .../category-maps/reference/con-reference.adoc   |  4 +++-
 ...on-trace-attributes-and-lifecycle-events.adoc |  5 ++++-
 ...ributes-and-opentelemetry-configurations.adoc |  5 ++++-
 ...ameter-reference-for-configuration-paths.adoc | 11 ++++++-----
 ...parameters-to-define-advanced-deployment.adoc |  2 +-
 .../nav-helm-chart-configuration-parameters.adoc | 16 ++++++++++++++++
 .../nav-opentelemetry-configurations.adoc        |  7 -------
 ...av-trace-attributes-and-lifecycle-events.adoc |  8 ++++++++
 ...ributes-and-opentelemetry-configurations.adoc |  4 ++--
 20 files changed, 72 insertions(+), 34 deletions(-)
 delete mode 100644 titles/product_product/category-maps/reference/con-opentelemetry-configurations.adoc
 delete mode 100644 titles/product_product/category-maps/reference/nav-opentelemetry-configurations.adoc

diff --git a/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.adoc b/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.adoc
index de6b939f522..8ff277939fe 100644
--- a/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.adoc
+++ b/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.adoc
@@ -336,7 +336,7 @@ If a plugin fails to load, perform the following checks:
 
 *Determining tag values*
 
-include::../../artifacts/snip-tag-for-OCI-package-paths.adoc[]
+include::{docdir}/artifacts/snip-tag-for-OCI-package-paths.adoc[]
 
 *Determining SHA256 digests*
 
diff --git a/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.template.adoc b/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.template.adoc
index 0dae7ed65fc..d3a1fbd64ba 100644
--- a/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.template.adoc
+++ b/modules/extend_dynamic-plugins-reference/ref-community-supported-plugins.template.adoc
@@ -37,7 +37,7 @@ If a plugin fails to load, perform the following checks:
 
 *Determining tag values*
 
-include::../../artifacts/snip-tag-for-OCI-package-paths.adoc[]
+include::{docdir}/artifacts/snip-tag-for-OCI-package-paths.adoc[]
 
 *Determining SHA256 digests*
 
diff --git a/modules/extend_dynamic-plugins-reference/ref-other-installable-plugins.adoc b/modules/extend_dynamic-plugins-reference/ref-other-installable-plugins.adoc
index 89444184e5f..ae8f5e55190 100644
--- a/modules/extend_dynamic-plugins-reference/ref-other-installable-plugins.adoc
+++ b/modules/extend_dynamic-plugins-reference/ref-other-installable-plugins.adoc
@@ -6,7 +6,7 @@
 [role="_abstract"]
 The following {technology-preview} plugins are not preinstalled and must be installed from an external source.
 
-include::../../artifacts/snip-technology-preview.adoc[]
+include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 [%header,cols=4*]
 |===
diff --git a/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.adoc b/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.adoc
index 35aaf30bfec..7cb437260ab 100644
--- a/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.adoc
+++ b/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.adoc
@@ -8,7 +8,7 @@
 [role="_abstract"]
 {company-name} provides {technology-preview} support for the following 14 plugins.
 
-include::../../artifacts/snip-technology-preview.adoc[]
+include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 [%header,cols=4*]
 |===
diff --git a/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.template.adoc b/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.template.adoc
index 9932416ee60..4b8bfea1b2e 100644
--- a/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.template.adoc
+++ b/modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.template.adoc
@@ -8,7 +8,7 @@
 [role="_abstract"]
 {company-name} provides {technology-preview} support for the following %%COUNT_2%% plugins.
 
-include::../../artifacts/snip-technology-preview.adoc[]
+include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 [%header,cols=4*]
 |===
diff --git a/modules/observe_diagnostic-data-collection/con-diagnostic-data-collection-overview.adoc b/modules/observe_diagnostic-data-collection/con-diagnostic-data-collection-overview.adoc
index 0b0a776bb35..a317cdd2f29 100644
--- a/modules/observe_diagnostic-data-collection/con-diagnostic-data-collection-overview.adoc
+++ b/modules/observe_diagnostic-data-collection/con-diagnostic-data-collection-overview.adoc
@@ -6,7 +6,7 @@
 [role="_abstract"]
 The must-gather tool collects diagnostic data and logging information from your cluster, which helps {company-name} Support resolve your deployment issues efficiently.
 
-include::../../artifacts/snip-technology-preview.adoc[]
+include::{docdir}/artifacts/snip-technology-preview.adoc[]
 
 Use must-gather when you open a support ticket with {company-name} Global Support Services, troubleshoot deployment issues, or capture deployment state before {product-very-short} upgrades.
 
diff --git a/titles/product_product/category-maps/reference/con-dynamic-plugin-parameter-reference-for-configuration-paths.adoc b/titles/product_product/category-maps/reference/con-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
index 0b41f7f7229..b64d04138b3 100644
--- a/titles/product_product/category-maps/reference/con-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
+++ b/titles/product_product/category-maps/reference/con-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
@@ -3,4 +3,8 @@
 = Dynamic plugin parameter reference for configuration paths
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Dynamic plugin parameter reference for configuration paths.
+Reference information about the dynamic plugins available in {product}, including preinstalled plugins, supported configuration paths, and support tiers.
+
+Use this reference to look up plugin names, package identifiers, and configuration paths when installing, enabling, or customizing dynamic plugins in your {product-short} deployment.
+// cqa-17: suppress — categorical label, not a feature declaration
+Plugins are organized by support tier: generally available, Technology Preview, deprecated, and other installable plugins.
diff --git a/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc b/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
index 07ea2a186fc..ebc1afd573c 100644
--- a/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
+++ b/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
@@ -3,4 +3,7 @@
 = Helm chart configuration parameters to define advanced deployment
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Helm chart configuration parameters to define advanced deployment.
+Reference information about Helm chart configuration parameters for defining advanced {product-short} deployments on Kubernetes and OpenShift clusters.
+
+Use this reference to look up supported Helm keys, default values, and parameter override schemas when deploying or upgrading {product}.
+You can customize resource boundaries, networking parameters, and runtime configurations to establish a production-ready environment.
diff --git a/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters.adoc b/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters.adoc
index 1ba4fcae967..8a6639df2a4 100644
--- a/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters.adoc
+++ b/titles/product_product/category-maps/reference/con-helm-chart-configuration-parameters.adoc
@@ -3,4 +3,12 @@
 = Helm chart configuration parameters
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Helm chart configuration parameters.
+Use the overview of default Helm Chart values to configure and customize your {product-very-short} deployment.
+
+The values are organized into five main categories, which cover the key namespaces that organize the chart's hierarchical configuration structure:
+
+* Global
+* Orchestrator
+* Route
+* Test
+* Upstream
diff --git a/titles/product_product/category-maps/reference/con-opentelemetry-configurations.adoc b/titles/product_product/category-maps/reference/con-opentelemetry-configurations.adoc
deleted file mode 100644
index f45d1fc8c69..00000000000
--- a/titles/product_product/category-maps/reference/con-opentelemetry-configurations.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-:_mod-docs-content-type: CONCEPT
-
-= OpenTelemetry configurations
-
-[role="_abstract"]
-TODO: Replace this placeholder with an overview of OpenTelemetry configurations.
diff --git a/titles/product_product/category-maps/reference/con-permission-policies-and-conditional-rules-reference-for-rbac-configurations.adoc b/titles/product_product/category-maps/reference/con-permission-policies-and-conditional-rules-reference-for-rbac-configurations.adoc
index 38e768eed2c..a2d0e3605dd 100644
--- a/titles/product_product/category-maps/reference/con-permission-policies-and-conditional-rules-reference-for-rbac-configurations.adoc
+++ b/titles/product_product/category-maps/reference/con-permission-policies-and-conditional-rules-reference-for-rbac-configurations.adoc
@@ -3,4 +3,7 @@
 = Permission policies and conditional rules reference for RBAC configurations
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Permission policies and conditional rules reference for RBAC configurations.
+Reference information about permission policy types, available permissions, and conditional policy rules for RBAC configurations in {product}.
+
+Use this reference to look up the permission strings required when defining RBAC policies for catalog, scaffolder, RBAC, Kubernetes, Extensions, and plugin resources.
+You can also look up conditional policy schemas and examples for defining fine-grained access rules with or without criteria.
diff --git a/titles/product_product/category-maps/reference/con-reference.adoc b/titles/product_product/category-maps/reference/con-reference.adoc
index 3396a988d26..17e4299e85f 100644
--- a/titles/product_product/category-maps/reference/con-reference.adoc
+++ b/titles/product_product/category-maps/reference/con-reference.adoc
@@ -3,4 +3,6 @@
 = Reference
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Reference.
+Quick-lookup reference information for {product} configuration syntax, permission policies, trace attributes, and Helm chart parameters.
+
+Use this section to look up supported dynamic plugin parameters and configuration paths, permission policy strings and conditional rule schemas for RBAC, OpenTelemetry configuration properties and trace attributes for workflow observability, and Helm chart values for deployment customization.
diff --git a/titles/product_product/category-maps/reference/con-trace-attributes-and-lifecycle-events.adoc b/titles/product_product/category-maps/reference/con-trace-attributes-and-lifecycle-events.adoc
index 235324bd87f..89d1341da62 100644
--- a/titles/product_product/category-maps/reference/con-trace-attributes-and-lifecycle-events.adoc
+++ b/titles/product_product/category-maps/reference/con-trace-attributes-and-lifecycle-events.adoc
@@ -3,4 +3,7 @@
 = Trace attributes and lifecycle events
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Trace attributes and lifecycle events.
+Reference information about span attributes and lifecycle events that SonataFlow automatically generates for workflow executions.
+
+Use this data dictionary to build Jaeger queries, filter traces by workflow state, and track requests across service boundaries.
+This data allows you to track a workflow from start to finish, analyze external function calls, and correlate logs across asynchronous boundaries.
diff --git a/titles/product_product/category-maps/reference/con-trace-attributes-and-opentelemetry-configurations.adoc b/titles/product_product/category-maps/reference/con-trace-attributes-and-opentelemetry-configurations.adoc
index 52ddc2aca14..0bd7c164896 100644
--- a/titles/product_product/category-maps/reference/con-trace-attributes-and-opentelemetry-configurations.adoc
+++ b/titles/product_product/category-maps/reference/con-trace-attributes-and-opentelemetry-configurations.adoc
@@ -3,4 +3,7 @@
 = Trace attributes and OpenTelemetry configurations
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Trace attributes and OpenTelemetry configurations.
+Reference information about OpenTelemetry configuration properties and trace attributes for serverless workflow observability in {product}.
+
+Use this reference to look up configuration properties that control where traces are sent, sampling rates, and service names.
+You can also look up span attributes and lifecycle events that SonataFlow automatically generates for workflow executions, to build Jaeger queries, filter traces by workflow state, and track requests across service boundaries.
diff --git a/titles/product_product/category-maps/reference/nav-dynamic-plugin-parameter-reference-for-configuration-paths.adoc b/titles/product_product/category-maps/reference/nav-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
index 9c8a4b3b5f4..67c1c0dec95 100644
--- a/titles/product_product/category-maps/reference/nav-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
+++ b/titles/product_product/category-maps/reference/nav-dynamic-plugin-parameter-reference-for-configuration-paths.adoc
@@ -6,12 +6,13 @@
 
 include::con-dynamic-plugin-parameter-reference-for-configuration-paths.adoc[leveloffset=+1]
 
-// TODO: include Preinstalled dynamic plugins reference
+include::modules/extend_dynamic-plugins-reference/con-preinstalled-dynamic-plugins.adoc[leveloffset=+1,navtitle="Preinstalled dynamic plugins reference"]
 
-// TODO: include Red Hat supported plugins and configuration paths reference
+include::modules/extend_dynamic-plugins-reference/ref-ga-plugins.adoc[leveloffset=+1,navtitle="Red Hat supported plugins and configuration paths reference"]
 
-// TODO: include Technology Preview plugins
+// cqa-17: suppress — disclaimer is in the included module
+include::modules/extend_dynamic-plugins-reference/ref-technology-preview-plugins.adoc[leveloffset=+1,navtitle="Technology Preview plugins"]
 
-// TODO: include Deprecated plugins
+include::modules/extend_dynamic-plugins-reference/ref-deprecated-plugins.adoc[leveloffset=+1]
 
-// TODO: include Other installable plugins
+include::modules/extend_dynamic-plugins-reference/ref-other-installable-plugins.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc b/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
index debcd85caa7..2c181772214 100644
--- a/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
+++ b/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc
@@ -6,4 +6,4 @@
 
 include::con-helm-chart-configuration-parameters-to-define-advanced-deployment.adoc[leveloffset=+1]
 
-// TODO: include Helm chart configuration parameters
+include::nav-helm-chart-configuration-parameters.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters.adoc b/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters.adoc
index 80585f277ec..c56eb789f40 100644
--- a/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters.adoc
+++ b/titles/product_product/category-maps/reference/nav-helm-chart-configuration-parameters.adoc
@@ -5,3 +5,19 @@
 :context: helm-chart-configuration-parameters
 
 include::con-helm-chart-configuration-parameters.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/proc-display-a-complete-list-of-helm-chart-values-with-helm-cli.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-root-namespace-value.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-global-namespace-values.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-orchestrator-namespace-values.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-route-namespace-values.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-test-namespace-values.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-upstream-namespace-values.adoc[leveloffset=+1]
+
+include::modules/configure_helm-chart-config-reference/ref-additional-upstream-chart-values.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/reference/nav-opentelemetry-configurations.adoc b/titles/product_product/category-maps/reference/nav-opentelemetry-configurations.adoc
deleted file mode 100644
index 2575e19ee56..00000000000
--- a/titles/product_product/category-maps/reference/nav-opentelemetry-configurations.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-:_mod-docs-content-type: MAP
-
-[id="opentelemetry-configurations_{context}"]
-= OpenTelemetry configurations
-:context: opentelemetry-configurations
-
-include::con-opentelemetry-configurations.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/reference/nav-trace-attributes-and-lifecycle-events.adoc b/titles/product_product/category-maps/reference/nav-trace-attributes-and-lifecycle-events.adoc
index c03c89968b8..22461f9be77 100644
--- a/titles/product_product/category-maps/reference/nav-trace-attributes-and-lifecycle-events.adoc
+++ b/titles/product_product/category-maps/reference/nav-trace-attributes-and-lifecycle-events.adoc
@@ -5,3 +5,11 @@
 :context: trace-attributes-and-lifecycle-events
 
 include::con-trace-attributes-and-lifecycle-events.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/ref-span-attributes-for-workflow-filtering.adoc[leveloffset=+1,navtitle="Span attributes"]
+
+include::modules/extend_orchestrator-in-rhdh/ref-process-lifecycle-events-for-timeline-tracking.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/ref-function-call-attributes-for-external-integration-debugging.adoc[leveloffset=+1]
+
+include::modules/extend_orchestrator-in-rhdh/ref-trace-context-propagation-headers-across-services.adoc[leveloffset=+1,navtitle="Propagation headers"]
diff --git a/titles/product_product/category-maps/reference/nav-trace-attributes-and-opentelemetry-configurations.adoc b/titles/product_product/category-maps/reference/nav-trace-attributes-and-opentelemetry-configurations.adoc
index 2282062f3c2..12d45f61ff0 100644
--- a/titles/product_product/category-maps/reference/nav-trace-attributes-and-opentelemetry-configurations.adoc
+++ b/titles/product_product/category-maps/reference/nav-trace-attributes-and-opentelemetry-configurations.adoc
@@ -6,6 +6,6 @@
 
 include::con-trace-attributes-and-opentelemetry-configurations.adoc[leveloffset=+1]
 
-// TODO: include OpenTelemetry configurations
+include::modules/extend_orchestrator-in-rhdh/ref-opentelemetry-configuration-reference-for-controlling-trace-behavior.adoc[leveloffset=+1,navtitle="OpenTelemetry configurations"]
 
-// TODO: include Trace attributes and lifecycle events
+include::nav-trace-attributes-and-lifecycle-events.adoc[leveloffset=+1]

From 565f295b22790112a742c6d05a15839235c17df9 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Mon, 22 Jun 2026 13:47:07 +0530
Subject: [PATCH 07/12] RHIDP-14365: Update product bundle and chart versions
 to 1.10.1 (#2371)

---
 artifacts/attributes.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artifacts/attributes.adoc b/artifacts/attributes.adoc
index 945e50c73d9..f538ae8d75c 100644
--- a/artifacts/attributes.adoc
+++ b/artifacts/attributes.adoc
@@ -16,8 +16,8 @@
 :product-local: Red Hat Developer Hub Local
 :product-local-very-short: RHDH Local
 :product-version: 1.10
-:product-bundle-version: 1.10.0
-:product-chart-version: 1.10.0
+:product-bundle-version: 1.10.1
+:product-chart-version: 1.10.1
 :product-backstage-version: 1.45.3
 // after 1.10 we skip to 2.1
 :product-version-next: 2.1

From 722fcb37465471905aee65cf64e1f51db00ff531 Mon Sep 17 00:00:00 2001
From: Tim O'Keefe <tokeefe@redhat.com>
Date: Mon, 22 Jun 2026 05:35:26 -0400
Subject: [PATCH 08/12] =?UTF-8?q?RHIDP-14962:=20RHDH=20Docs=20JTBD:=20Opti?=
 =?UTF-8?q?mize=20=E2=80=94=20Scale=20system=20performance=20for=20growing?=
 =?UTF-8?q?=20traffic=20(#2393)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ility-in-a-rhdh-helm-chart-deployment.adoc |  2 +-
 ...ability-in-a-rhdh-operator-deployment.adoc |  2 +-
 ...ic-plugin-cache-by-using-the-operator.adoc |  2 +-
 ...mic-plugin-cache-using-the-helm-chart.adoc |  2 +-
 ...c-enable-the-rhdh-plugin-assets-cache.adoc |  2 +-
 ...bility-with-database-and-cache-layers.adoc |  8 ++++----
 ...-availability-to-maintain-performance.adoc | 20 ++++++++++++++++++-
 ...n-configure-the-dynamic-plugins-cache.adoc | 12 ++++++++++-
 ...-using-high-availability-architecture.adoc |  4 +++-
 ...-availability-to-maintain-performance.adoc |  4 ++++
 ...v-configure-the-dynamic-plugins-cache.adoc |  6 +++++-
 ...-using-high-availability-architecture.adoc |  2 ++
 12 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-helm-chart-deployment.adoc b/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-helm-chart-deployment.adoc
index a8316b6a2c0..dabd89ce9cc 100644
--- a/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-helm-chart-deployment.adoc
+++ b/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-helm-chart-deployment.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
 [id="configure-high-availability-in-a-rhdh-helm-chart-deployment_{context}"]
-= Configure high availability in a {product} Helm chart deployment
+= Configure with the Helm chart
 
 [role="_abstract"]
 Configure high availability for Helm deployments by setting the `replicas` value to greater than 1 in the Helm configuration file.
diff --git a/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-operator-deployment.adoc b/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-operator-deployment.adoc
index 8efb3ab712b..65d3dadf5c7 100644
--- a/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-operator-deployment.adoc
+++ b/modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-operator-deployment.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
 [id="configure-high-availability-in-a-rhdh-operator-deployment_{context}"]
-= Configure high availability in a {product} Operator deployment
+= Configure with the Operator
 
 [role="_abstract"]
 Configure high availability for Operator deployments by setting the `replicas` field to a value greater than 1 in the custom resource.
diff --git a/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator.adoc b/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator.adoc
index 4831c6607a5..f8ad0c63e3d 100644
--- a/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator.adoc
+++ b/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
 [id="create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator_{context}"]
-= Create a PVC for the dynamic plugin cache by using the Operator
+= Create PVC with Operator
 
 [role="_abstract"]
 Create a persistent volume claim for the dynamic plugin cache in Operator deployments by replacing the default `dynamic-plugins-root` volume.
diff --git a/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart.adoc b/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart.adoc
index bedc5457cb3..ed7aca97505 100644
--- a/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart.adoc
+++ b/modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
 [id="create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart_{context}"]
-= Create a PVC for the dynamic plugin cache using the Helm Chart
+= Create PVC with Helm Chart
 
 [role="_abstract"]
 Create a persistent volume claim for the dynamic plugin cache in Helm deployments to persist the cache across pod restarts.
diff --git a/modules/configure_configuring-rhdh/proc-enable-the-rhdh-plugin-assets-cache.adoc b/modules/configure_configuring-rhdh/proc-enable-the-rhdh-plugin-assets-cache.adoc
index f6accb3f2b4..c7b63565ca1 100644
--- a/modules/configure_configuring-rhdh/proc-enable-the-rhdh-plugin-assets-cache.adoc
+++ b/modules/configure_configuring-rhdh/proc-enable-the-rhdh-plugin-assets-cache.adoc
@@ -1,7 +1,7 @@
 :_mod-docs-content-type: PROCEDURE
 
 [id="enable-the-rhdh-plugin-assets-cache_{context}"]
-= Enable the {product} plugin assets cache
+= Enable the plugin assets cache
 
 [role="_abstract"]
 Use a Redis cache store to improve {product-short} performance and reliability by caching plugin assets.
diff --git a/modules/discover_about-rhdh/con-high-availability-with-database-and-cache-layers.adoc b/modules/discover_about-rhdh/con-high-availability-with-database-and-cache-layers.adoc
index 03e76e73e55..43170b6f47c 100644
--- a/modules/discover_about-rhdh/con-high-availability-with-database-and-cache-layers.adoc
+++ b/modules/discover_about-rhdh/con-high-availability-with-database-and-cache-layers.adoc
@@ -1,13 +1,13 @@
 :_mod-docs-content-type: CONCEPT
 
 [id="high-availability-with-database-and-cache-layers_{context}"]
-= High availability with database and cache layers
+= Plan production scaling using high availability architecture
 
 [role="_abstract"]
 Achieving high availability in {product} requires implementing redundancy and failover for both the backend service and its data dependencies.
 This is accomplished through horizontal scaling, database replication, and shared caching to ensure continuous operation during component failures.
 
-== Backend scalability
+== Deploy multiple stateless instances
 
 {product-very-short} backend uses a stateless design to support horizontal scaling. PostgreSQL stores persistent data and the database manages sessions, allowing multiple backend instances to serve any request simultaneously. To improve performance, you can configure an optional logical cache by using Redis.
 
@@ -18,7 +18,7 @@ Configure a load balancer:: Use platform-provided load balancing, such as OpenSh
 Enable health checks:: Configure the load balancer to probe backend health and remove failed instances from rotation.
 Disable session affinity (sticky sessions):: Database-backed sessions allow any instance to serve any request.
 
-== Database high availability
+== Implement database HA
 {product-very-short} operations rely on PostgreSQL for persistence. A database outage renders the deployment non-functional until the database is restored. For production deployments, you must configure PostgreSQL with high availability (primary-replica replication) to minimize downtime.
 
 [IMPORTANT]
@@ -26,7 +26,7 @@ Disable session affinity (sticky sessions):: Database-backed sessions allow any
 If you use catalog providers exclusively, the database acts as an indexed cache. You do not require disaster recovery backups because you can repopulate catalog data from external sources of truth, such as Git repositories, CI/CD platforms, and monitoring tools.
 ====
 
-== Cache high availability (optional)
+== Implement cache HA
 
 Configuring Redis as a shared logical cache improves production performance by sharing cached data across multiple backend instances. A shared cache makes sure that all instances access the same processed data, such as rendered TechDocs.
 
diff --git a/titles/product_product/category-maps/optimize/con-configure-high-availability-to-maintain-performance.adoc b/titles/product_product/category-maps/optimize/con-configure-high-availability-to-maintain-performance.adoc
index b1421f2e0fd..8ff6736105a 100644
--- a/titles/product_product/category-maps/optimize/con-configure-high-availability-to-maintain-performance.adoc
+++ b/titles/product_product/category-maps/optimize/con-configure-high-availability-to-maintain-performance.adoc
@@ -3,4 +3,22 @@
 = Configure high availability to maintain performance
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure high availability to maintain performance.
+Configure high availability to ensure continuous service accessibility by eliminating single points of failure through redundancy and failover mechanisms.
+
+{product} supports HA deployments on the following platforms:
+
+* {ocp-brand-name}
+* {aks-name}
+* {eks-name}
+* {gke-brand-name}
+
+The HA deployments enable more resilient and reliable service availability across supported environments.
+
+In a single instance deployment, a failure makes the entire service unavailable. Software crashes, hardware issues, or other disruptions can interrupt development workflows and access to key resources.
+
+With HA enabled, you can scale the number of backend replicas to introduce redundancy. This setup ensures that if one pod or component fails, others continue to serve requests without disruption. The built-in load balancer manages ingress traffic and distributes the load across the available pods. Meanwhile, the {product-very-short} backend manages concurrent requests and resolves resource-level conflicts effectively.
+
+As an administrator, you can configure high availability by adjusting replica values in your configuration file:
+
+* If you installed using the Operator, configure the replica values in your `{product-custom-resource-type}` custom resource.
+* If you used the Helm chart, set the replica values in the Helm configuration.
diff --git a/titles/product_product/category-maps/optimize/con-configure-the-dynamic-plugins-cache.adoc b/titles/product_product/category-maps/optimize/con-configure-the-dynamic-plugins-cache.adoc
index cc7b32c5dde..b34dde50e7f 100644
--- a/titles/product_product/category-maps/optimize/con-configure-the-dynamic-plugins-cache.adoc
+++ b/titles/product_product/category-maps/optimize/con-configure-the-dynamic-plugins-cache.adoc
@@ -3,4 +3,14 @@
 = Configure the dynamic plugins cache
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure the dynamic plugins cache.
+The dynamic plugins cache reduces platform boot time by storing already-installed plugins and skipping redundant downloads when the configuration does not change.
+
+When you enable dynamic plugins cache:
+
+* The system calculates a checksum of each plugin's YAML configuration (excluding `pluginConfig`).
+* The system stores the checksum in a file named `dynamic-plugin-config.hash` within the plugin's directory.
+* During boot, if a plugin's package reference matches the earlier installation and the checksum does not change, the system skips the download.
+* The system automatically removes plugins that you disabled since the earlier boot.
+
+[NOTE]
+To enable the dynamic plugins cache in {product-very-short}, the plugins directory `dynamic-plugins-root` must be a persistent volume.
diff --git a/titles/product_product/category-maps/optimize/con-plan-production-scaling-using-high-availability-architecture.adoc b/titles/product_product/category-maps/optimize/con-plan-production-scaling-using-high-availability-architecture.adoc
index 81ed7bb0524..145551578b5 100644
--- a/titles/product_product/category-maps/optimize/con-plan-production-scaling-using-high-availability-architecture.adoc
+++ b/titles/product_product/category-maps/optimize/con-plan-production-scaling-using-high-availability-architecture.adoc
@@ -3,4 +3,6 @@
 = Plan production scaling using high availability architecture
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Plan production scaling using high availability architecture.
+Achieving high availability in Red Hat Developer Hub requires implementing redundancy and failover for both the backend service and its data dependencies. This is accomplished through horizontal scaling, database replication, and shared caching to ensure continuous operation during component failures.
+
+include::con-deploy-multiple-stateless-instances.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/optimize/nav-configure-high-availability-to-maintain-performance.adoc b/titles/product_product/category-maps/optimize/nav-configure-high-availability-to-maintain-performance.adoc
index 288ef479b0b..f653e2b41f3 100644
--- a/titles/product_product/category-maps/optimize/nav-configure-high-availability-to-maintain-performance.adoc
+++ b/titles/product_product/category-maps/optimize/nav-configure-high-availability-to-maintain-performance.adoc
@@ -5,3 +5,7 @@
 :context: configure-high-availability-to-maintain-performance
 
 include::con-configure-high-availability-to-maintain-performance.adoc[leveloffset=+1]
+
+include::modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-operator-deployment.adoc[leveloffset=+1,navtitle="Configure with the Operator"]
+
+include::modules/configure_configuring-rhdh/proc-configure-high-availability-in-a-rhdh-helm-chart-deployment.adoc[leveloffset=+1,navtitle="Configure with the Helm chart"]
diff --git a/titles/product_product/category-maps/optimize/nav-configure-the-dynamic-plugins-cache.adoc b/titles/product_product/category-maps/optimize/nav-configure-the-dynamic-plugins-cache.adoc
index 3f68e4ef8e1..4d09f59c405 100644
--- a/titles/product_product/category-maps/optimize/nav-configure-the-dynamic-plugins-cache.adoc
+++ b/titles/product_product/category-maps/optimize/nav-configure-the-dynamic-plugins-cache.adoc
@@ -6,4 +6,8 @@
 
 include::con-configure-the-dynamic-plugins-cache.adoc[leveloffset=+1]
 
-// TODO: include Create a persistent volume claim
+include::modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-by-using-the-operator.adoc[leveloffset=+1,navtitle="Create PVC with Operator"]
+
+include::modules/configure_configuring-rhdh/proc-create-a-pvc-for-the-dynamic-plugin-cache-using-the-helm-chart.adoc[leveloffset=+1,navtitle="Create PVC with Helm Chart"]
+
+include::modules/configure_configuring-rhdh/proc-enable-the-rhdh-plugin-assets-cache.adoc[leveloffset=+1,navtitle="Enable the plugin assets cache"]
diff --git a/titles/product_product/category-maps/optimize/nav-plan-production-scaling-using-high-availability-architecture.adoc b/titles/product_product/category-maps/optimize/nav-plan-production-scaling-using-high-availability-architecture.adoc
index 08743086720..9b6fcdfb8b1 100644
--- a/titles/product_product/category-maps/optimize/nav-plan-production-scaling-using-high-availability-architecture.adoc
+++ b/titles/product_product/category-maps/optimize/nav-plan-production-scaling-using-high-availability-architecture.adoc
@@ -5,3 +5,5 @@
 :context: plan-production-scaling-using-high-availability-architecture
 
 include::con-plan-production-scaling-using-high-availability-architecture.adoc[leveloffset=+1]
+
+include::modules/discover_about-rhdh/con-high-availability-with-database-and-cache-layers.adoc[leveloffset=+1]

From 5bc06b62141f869b2df72df80c472d9ca49aaad8 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Mon, 22 Jun 2026 15:09:00 +0530
Subject: [PATCH 09/12] RHIDP-14642: RHDH JTBD Integrate category (#2395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fabrice Flore-Thébault <ffloreth@redhat.com>
---
 .../jtbd-map/RHIDP-14642-validation-report.md | 265 ++++++++++++++++++
 ...ntegrating-the-openshift-ai-connector.adoc |   2 +-
 ...wledge-base-with-lightspeed-notebooks.adoc |   2 +-
 .../con-configure-ai-asset-mapping.adoc       |   2 +-
 ...on-configure-mcp-tokens-and-endpoints.adoc |   2 +-
 ...ance-ai-interactions-with-portal-data.adoc |   2 +-
 ...mize-the-system-prompt-and-ui-options.adoc |   2 +-
 ...oper-lightspeed-for-rhdh-architecture.adoc |   2 +-
 ...n-enable-ai-assistance-for-developers.adoc |   2 +-
 .../con-enable-scaffolder-mcp-tools.adoc      |   2 +-
 ...con-enable-software-catalog-mcp-tools.adoc |   2 +-
 .../con-enable-techdocs-mcp-tools.adoc        |   2 +-
 ...-to-visualize-pipelines-and-workloads.adoc |   2 +-
 .../integrate/con-integrate.adoc              |   2 +-
 ...identity-data-by-integrating-keycloak.adoc |   2 +-
 ...on-populate-ai-model-catalog-metadata.adoc |   2 +-
 ...uild-artifacts-using-the-jfrog-plugin.adoc |   2 +-
 ...ent-history-and-rollouts-with-argo-cd.adoc |   2 +-
 ...ifacts-using-nexus-repository-manager.adoc |   2 +-
 ...orkloads-and-pod-health-with-topology.adoc |   2 +-
 ...ntegrating-the-openshift-ai-connector.adoc |   6 +-
 ...wledge-base-with-lightspeed-notebooks.adoc |   3 +-
 .../nav-configure-ai-asset-mapping.adoc       |   4 +
 ...av-configure-mcp-tokens-and-endpoints.adoc |   2 +
 ...ance-ai-interactions-with-portal-data.adoc |   9 +-
 ...mize-the-system-prompt-and-ui-options.adoc |   6 +
 ...oper-lightspeed-for-rhdh-architecture.adoc |  13 +-
 ...v-enable-ai-assistance-for-developers.adoc |  13 +-
 .../nav-enable-scaffolder-mcp-tools.adoc      |  10 +-
 ...nav-enable-software-catalog-mcp-tools.adoc |   8 +
 .../nav-enable-techdocs-mcp-tools.adoc        |   6 +
 ...-to-visualize-pipelines-and-workloads.adoc |  12 +-
 ...identity-data-by-integrating-keycloak.adoc |   6 +
 ...av-populate-ai-model-catalog-metadata.adoc |   4 +
 ...uild-artifacts-using-the-jfrog-plugin.adoc |   4 +
 ...ent-history-and-rollouts-with-argo-cd.adoc |   4 +
 ...ifacts-using-nexus-repository-manager.adoc |   4 +
 ...orkloads-and-pod-health-with-topology.adoc |  16 ++
 38 files changed, 391 insertions(+), 42 deletions(-)
 create mode 100644 .claude/skills/jtbd-map/RHIDP-14642-validation-report.md

diff --git a/.claude/skills/jtbd-map/RHIDP-14642-validation-report.md b/.claude/skills/jtbd-map/RHIDP-14642-validation-report.md
new file mode 100644
index 00000000000..e0afbcf408f
--- /dev/null
+++ b/.claude/skills/jtbd-map/RHIDP-14642-validation-report.md
@@ -0,0 +1,265 @@
+# RHIDP-14642 Validation Report: Integrate Category
+
+**Date**: 2026-06-19
+**Status**: ✅ PASSED
+**Category**: Integrate
+**Ticket**: https://redhat.atlassian.net/browse/RHIDP-14642
+**Assignee**: Priyanka
+
+---
+
+## Validation Summary
+
+| Check | Status | Details |
+|-------|--------|---------|
+| TODO Comments | ✅ PASS | 0 remaining TODO comments |
+| MAP File Structure | ✅ PASS | All 18 nav files have correct attributes |
+| Module Paths | ✅ PASS | All paths use `modules/` symlink format |
+| Concept Files | ✅ PASS | All nav files have matching concept files |
+| Include Syntax | ✅ PASS | All include directives properly formatted |
+| Module Existence | ✅ PASS | All 67 referenced modules exist |
+| Sample Content | ✅ PASS | Verified correct include counts |
+
+**Total Errors**: 0
+**Total Warnings**: 0
+
+---
+
+## Work Completed
+
+### Files Modified: 18
+
+1. ✅ `nav-enable-ai-assistance-for-developers.adoc` (9 modules added)
+2. ✅ `nav-developer-lightspeed-for-rhdh-architecture.adoc` (9 modules + 1 nav)
+3. ✅ `nav-customize-the-system-prompt-and-ui-options.adoc` (3 modules)
+4. ✅ `nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc` (2 modules)
+5. ✅ `nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc` (2 modules + 4 nav refs)
+6. ✅ `nav-configure-mcp-tokens-and-endpoints.adoc` (1 module)
+7. ✅ `nav-enable-software-catalog-mcp-tools.adoc` (4 modules)
+8. ✅ `nav-enable-techdocs-mcp-tools.adoc` (3 modules)
+9. ✅ `nav-enable-scaffolder-mcp-tools.adoc` (8 modules)
+10. ✅ `nav-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc` (1 module + 2 nav refs)
+11. ✅ `nav-configure-ai-asset-mapping.adoc` (2 modules)
+12. ✅ `nav-populate-ai-model-catalog-metadata.adoc` (1 module)
+13. ✅ `nav-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc` (1 module + 5 nav refs)
+14. ✅ `nav-track-deployment-history-and-rollouts-with-argo-cd.adoc` (2 modules)
+15. ✅ `nav-track-build-artifacts-using-the-jfrog-plugin.adoc` (2 modules)
+16. ✅ `nav-manage-identity-data-by-integrating-keycloak.adoc` (3 modules)
+17. ✅ `nav-view-build-artifacts-using-nexus-repository-manager.adoc` (2 modules)
+18. ✅ `nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc` (13 modules)
+
+### Statistics
+
+- **TODO Items Resolved**: 22
+- **Module Includes Added**: 67
+- **Nav References Added**: 12
+- **Net Lines Added**: 105
+- **Net Lines Removed**: 23
+- **Total Lines Changed**: 128
+
+---
+
+## Validation Methodology
+
+Since Node.js was not available in the environment for automated CQA checks, comprehensive manual validation was performed:
+
+### 1. Structure Validation
+- ✅ Verified all MAP files have `:_mod-docs-content-type: MAP`
+- ✅ Confirmed proper ID format: `[id="..._\{context\}"]`
+- ✅ Checked `:context:` declarations present
+- ✅ Validated first include is concept file (`con-*.adoc`)
+
+### 2. Path Validation
+- ✅ All module includes use `modules/` symlink
+- ✅ Proper subdirectory paths (e.g., `modules/shared/`, `modules/integrate_*/`)
+- ✅ No hardcoded absolute paths
+- ✅ Nav references use relative paths
+
+### 3. File Existence
+- ✅ All 67 referenced modules verified to exist
+- ✅ All 18 concept files present
+- ✅ All 12 nav references valid
+- ✅ No broken includes
+
+### 4. Syntax Validation
+- ✅ All includes use `leveloffset=+1` format
+- ✅ Proper bracket closure on all includes
+- ✅ Correct `navtitle` usage (10 instances where needed)
+- ✅ No syntax errors in AsciiDoc directives
+
+### 5. Content Verification
+- ✅ Spot-checked multiple files for correct include counts
+- ✅ Verified hierarchical nav structure maintained
+- ✅ Confirmed TODO comments completely eliminated
+- ✅ Validated mapping against TSV reference
+
+---
+
+## Content Areas Covered
+
+### AI Assistance & Developer Lightspeed
+- LLM requirements and model integration (OpenAI, Ollama, vLLM, Vertex AI)
+- User data security and privacy practices
+- RAG embeddings and vector search
+- Virtual assistant configuration
+- System prompts and UI customization
+- Chat history storage
+- Lightspeed Notebooks for private knowledge bases
+- Air-gapped environment support
+
+### Model Context Protocol (MCP)
+- MCP server and tool plugin installation
+- Token configuration and endpoint management
+- Software Catalog MCP tools (fetch, register, unregister entities)
+- TechDocs MCP tools (retrieve docs, measure gaps, search)
+- Scaffolder MCP tools (automate resources, templates, task monitoring)
+
+### OpenShift AI Connector
+- AI asset mapping configuration
+- Model-to-Entity mapping
+- Data mapping specifications
+- API Definition tab population
+
+### CI/CD & Infrastructure Integrations
+- Argo CD for deployment tracking and rollouts
+- JFrog Artifactory for build artifact management
+- Keycloak for identity data integration
+- Nexus Repository Manager for artifact viewing
+- Tekton for CI pipeline monitoring
+- Topology plugin for Kubernetes workload visualization
+
+---
+
+## Next Steps
+
+### ✅ Ready for:
+1. Full CQA validation when Node.js is available:
+   ```bash
+   node build/scripts/cqa/index.js titles/product_product/master.adoc
+   ```
+
+2. ccutil build test to verify compilation:
+   ```bash
+   build/scripts/build-ccutil.sh
+   ```
+
+3. Git commit with proper commit message (see below)
+
+4. PR creation against `main` branch
+
+### Recommended Commit Message:
+```
+[RHIDP-14642]: Populate Integrate category MAP files with module includes
+
+- Resolved all 22 TODO items across 7 primary nav files
+- Added 67+ module includes covering AI assistance, MCP tools, and CI/CD integrations
+- Populated child nav files for granular topic organization
+- All files follow MAP structure with proper attributes and context
+- Validated: 0 errors, 0 warnings on manual checks
+
+Category: Integrate
+Files modified: 18 nav files
+Lines changed: +105 -23
+
+Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
+```
+
+---
+
+## Detailed Change Summary
+
+### AI & Developer Lightspeed Topics
+- **nav-enable-ai-assistance-for-developers.adoc**: Added 9 module includes
+  - 5 LLM requirement modules (general, OpenAI, Ollama, vLLM, Vertex AI)
+  - 4 user data security modules (privacy, feedback, BYOM, compliance)
+  
+- **nav-developer-lightspeed-for-rhdh-architecture.adoc**: Added 9 modules + 1 nav ref
+  - 1 RAG embeddings concept
+  - 4 virtual assistant configuration procedures
+  - 3 air-gapped mirroring procedures
+  - 1 nav reference to system prompt customization
+
+- **nav-customize-the-system-prompt-and-ui-options.adoc**: Added 3 modules
+  - Enable user feedback
+  - Customize system prompts
+  - Chat history storage
+
+- **nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc**: Added 2 modules
+  - Enable secure AI research
+  - Enable data persistence
+
+### MCP Tools Topics
+- **nav-configure-model-context-protocol-tools.adoc**: Added 2 modules + 4 nav refs
+  - Install backend MCP server
+  - Install MCP tool plugins
+  - References to tokens, catalog, techdocs, scaffolder nav files
+
+- **nav-configure-mcp-tokens-and-endpoints.adoc**: Added 1 module
+  - Configure MCP tokens and endpoints
+
+- **nav-enable-software-catalog-mcp-tools.adoc**: Added 4 modules
+  - Fetch entities
+  - Register entities
+  - Unregister entities
+  - Retrieve Software Template metadata
+
+- **nav-enable-techdocs-mcp-tools.adoc**: Added 3 modules
+  - Retrieve TechDocs URLs and metadata
+  - Measure documentation gaps
+  - Find specific TechDoc
+
+- **nav-enable-scaffolder-mcp-tools.adoc**: Added 8 modules
+  - 6 modules for software resource creation (validation, execution, monitoring)
+  - 2 modules for Software Templates automation
+
+### OpenShift AI Connector Topics
+- **nav-accelerate-ai-model-discovery.adoc**: Added 1 module + 2 nav refs
+  - Set up OpenShift AI Connector
+  - References to asset mapping and metadata nav files
+
+- **nav-configure-ai-asset-mapping.adoc**: Added 2 modules
+  - Model-to-Entity mapping reference
+  - Data mapping specifications reference
+
+- **nav-populate-ai-model-catalog-metadata.adoc**: Added 1 module
+  - Populate API Definition tab procedure
+
+### CI/CD & Infrastructure Topics
+- **nav-integrate-cicd-and-infrastructure-tools.adoc**: Added 1 module + 5 nav refs
+  - Tekton plugin enablement
+  - References to Argo CD, JFrog, Keycloak, Nexus, Topology nav files
+
+- **nav-track-deployment-history-and-rollouts-with-argo-cd.adoc**: Added 2 modules
+  - Enable Argo CD plugin
+  - Enable Argo CD Rollouts
+
+- **nav-track-build-artifacts-using-the-jfrog-plugin.adoc**: Added 2 modules
+  - Enable JFrog Artifactory plugin
+  - Configure JFrog Artifactory plugin
+
+- **nav-manage-identity-data-by-integrating-keycloak.adoc**: Added 3 modules
+  - Enable Keycloak plugin
+  - Configure Keycloak plugin
+  - Keycloak plugin metrics reference
+
+- **nav-view-build-artifacts-using-nexus-repository-manager.adoc**: Added 2 modules
+  - Enable Nexus Repository Manager plugin
+  - Configure Nexus Repository Manager plugin
+
+- **nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc**: Added 13 modules
+  - 1 installation module
+  - 5 configuration modules (routes, logs, PipelineRuns, VMs, editor)
+  - 7 label/annotation management modules
+
+---
+
+## Sign-off
+
+**Validation Status**: ✅ PASSED  
+**Ready for Review**: YES  
+**CQA Required**: When Node.js available  
+**Build Test Required**: When ccutil available  
+
+All manual validation checks passed with **0 errors** and **0 warnings**.
+
+The Integrate category JTBD navigation mapping for RHIDP-14642 is complete and ready for automated validation, build testing, and PR submission.
diff --git a/titles/product_product/category-maps/integrate/con-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc b/titles/product_product/category-maps/integrate/con-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
index 8635564bba2..2341ce0919f 100644
--- a/titles/product_product/category-maps/integrate/con-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
+++ b/titles/product_product/category-maps/integrate/con-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
@@ -3,4 +3,4 @@
 = Accelerate AI model discovery by integrating the OpenShift AI Connector
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Accelerate AI model discovery by integrating the OpenShift AI Connector.
+Integrate AI models and model servers from {rhoai-brand-name} directly into the {product} ({product-very-short}) Catalog to provide a unified hub for discovering and consuming AI components.
diff --git a/titles/product_product/category-maps/integrate/con-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc b/titles/product_product/category-maps/integrate/con-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
index 5d3b7749ed8..4821eecaa31 100644
--- a/titles/product_product/category-maps/integrate/con-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
+++ b/titles/product_product/category-maps/integrate/con-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
@@ -3,4 +3,4 @@
 = Build a private knowledge base with Lightspeed Notebooks
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Build a private knowledge base with Lightspeed Notebooks.
+Use {ls-short} Notebooks to research, troubleshoot, and analyze projects by using a large language model (LLM) grounded in your own documentation. Notebooks use Retrieval-Augmented Generation (RAG) to ensure that responses are based strictly on the files you upload.
diff --git a/titles/product_product/category-maps/integrate/con-configure-ai-asset-mapping.adoc b/titles/product_product/category-maps/integrate/con-configure-ai-asset-mapping.adoc
index 851be714899..43b2eb1a436 100644
--- a/titles/product_product/category-maps/integrate/con-configure-ai-asset-mapping.adoc
+++ b/titles/product_product/category-maps/integrate/con-configure-ai-asset-mapping.adoc
@@ -3,4 +3,4 @@
 = Configure AI asset mapping
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure AI asset mapping.
+The {openshift-ai-connector-name} ({openshift-ai-connector-name-short}) discovers AI assets managed within {rhoai-brand-name}. The connector automatically converts AI models and model servers into {backstage} entities to provide a unified view for developer teams.
diff --git a/titles/product_product/category-maps/integrate/con-configure-mcp-tokens-and-endpoints.adoc b/titles/product_product/category-maps/integrate/con-configure-mcp-tokens-and-endpoints.adoc
index 88b63209796..f4a6bc1eaec 100644
--- a/titles/product_product/category-maps/integrate/con-configure-mcp-tokens-and-endpoints.adoc
+++ b/titles/product_product/category-maps/integrate/con-configure-mcp-tokens-and-endpoints.adoc
@@ -3,4 +3,4 @@
 = Configure MCP tokens and endpoints
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure MCP tokens and endpoints.
+When using third-party MCP integrations, you can store your personal access tokens securely and manage credentials in {ls-brand-name} so that the AI acts on your behalf.
diff --git a/titles/product_product/category-maps/integrate/con-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc b/titles/product_product/category-maps/integrate/con-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
index 71586ec1be7..8a8fb003a29 100644
--- a/titles/product_product/category-maps/integrate/con-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
+++ b/titles/product_product/category-maps/integrate/con-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
@@ -3,4 +3,4 @@
 = Configure Model Context Protocol tools to enhance AI interactions with portal data
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Configure Model Context Protocol tools to enhance AI interactions with portal data.
+Leverage the Model Context Protocol (MCP) server to integrate {product} with AI clients through a standardized method for accessing {product-very-short} information and workflows using defined MCP tools.
diff --git a/titles/product_product/category-maps/integrate/con-customize-the-system-prompt-and-ui-options.adoc b/titles/product_product/category-maps/integrate/con-customize-the-system-prompt-and-ui-options.adoc
index 49c518cc7df..a8dcf170d1e 100644
--- a/titles/product_product/category-maps/integrate/con-customize-the-system-prompt-and-ui-options.adoc
+++ b/titles/product_product/category-maps/integrate/con-customize-the-system-prompt-and-ui-options.adoc
@@ -3,4 +3,4 @@
 = Customize the system prompt and UI options
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Customize the system prompt and UI options.
+You can customize {ls-short} to align model behavior with your operational goals, enhance developer productivity, and ensure secure data retention.
diff --git a/titles/product_product/category-maps/integrate/con-developer-lightspeed-for-rhdh-architecture.adoc b/titles/product_product/category-maps/integrate/con-developer-lightspeed-for-rhdh-architecture.adoc
index 7e7f6f2e24f..a358efdf17c 100644
--- a/titles/product_product/category-maps/integrate/con-developer-lightspeed-for-rhdh-architecture.adoc
+++ b/titles/product_product/category-maps/integrate/con-developer-lightspeed-for-rhdh-architecture.adoc
@@ -3,4 +3,4 @@
 = Developer Lightspeed for RHDH architecture
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Developer Lightspeed for RHDH architecture.
+{ls-brand-name} is enabled by default on {product} ({product-very-short}) instances. To provide developers with chat assistance, configure your deployment settings by using either the Operator or the Helm chart.
diff --git a/titles/product_product/category-maps/integrate/con-enable-ai-assistance-for-developers.adoc b/titles/product_product/category-maps/integrate/con-enable-ai-assistance-for-developers.adoc
index 08e3d285b00..5e382914fd0 100644
--- a/titles/product_product/category-maps/integrate/con-enable-ai-assistance-for-developers.adoc
+++ b/titles/product_product/category-maps/integrate/con-enable-ai-assistance-for-developers.adoc
@@ -3,4 +3,4 @@
 = Enable AI assistance for developers
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Enable AI assistance for developers.
+{ls-brand-name} ({ls-short}) is an AI-powered virtual assistant for {product} ({product-very-short}). You can interact with {ls-short} to explore {product-very-short} capabilities in detail.
diff --git a/titles/product_product/category-maps/integrate/con-enable-scaffolder-mcp-tools.adoc b/titles/product_product/category-maps/integrate/con-enable-scaffolder-mcp-tools.adoc
index 242fb6d5727..7ad723be38a 100644
--- a/titles/product_product/category-maps/integrate/con-enable-scaffolder-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/con-enable-scaffolder-mcp-tools.adoc
@@ -3,4 +3,4 @@
 = Enable Scaffolder MCP tools
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Enable Scaffolder MCP tools.
+Use the Scaffolder Model Context Protocol (MCP) (`scaffolder-mcp-extras`) tools to query available actions, validate template dry-runs, and retrieve task logs during Software Template development in {product-very-short}.
diff --git a/titles/product_product/category-maps/integrate/con-enable-software-catalog-mcp-tools.adoc b/titles/product_product/category-maps/integrate/con-enable-software-catalog-mcp-tools.adoc
index 79f53587d91..5f3da23bc88 100644
--- a/titles/product_product/category-maps/integrate/con-enable-software-catalog-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/con-enable-software-catalog-mcp-tools.adoc
@@ -3,4 +3,4 @@
 = Enable Software Catalog MCP tools
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Enable Software Catalog MCP tools.
+Install the Model Context Protocol (MCP) server and its associated tool plugins to expose {product} portal capabilities, such as the Software Catalog and TechDocs, to your external AI assistant.
diff --git a/titles/product_product/category-maps/integrate/con-enable-techdocs-mcp-tools.adoc b/titles/product_product/category-maps/integrate/con-enable-techdocs-mcp-tools.adoc
index e295faa2b2e..586c892db62 100644
--- a/titles/product_product/category-maps/integrate/con-enable-techdocs-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/con-enable-techdocs-mcp-tools.adoc
@@ -3,4 +3,4 @@
 = Enable TechDocs MCP tools
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Enable TechDocs MCP tools.
+Install the Model Context Protocol (MCP) server and its associated tool plugins to expose {product} portal capabilities, such as the Software Catalog and TechDocs, to your external AI assistant.
diff --git a/titles/product_product/category-maps/integrate/con-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc b/titles/product_product/category-maps/integrate/con-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
index c14b31b4a3b..2b563657d3d 100644
--- a/titles/product_product/category-maps/integrate/con-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
+++ b/titles/product_product/category-maps/integrate/con-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
@@ -3,4 +3,4 @@
 = Integrate CI/CD and infrastructure tools to visualize pipelines and workloads
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Integrate CI/CD and infrastructure tools to visualize pipelines and workloads.
+Integrate CI/CD and infrastructure tools with {product} to visualize deployment pipelines, track build artifacts, and monitor Kubernetes workloads.
diff --git a/titles/product_product/category-maps/integrate/con-integrate.adoc b/titles/product_product/category-maps/integrate/con-integrate.adoc
index a9d69165659..2d6ee784be7 100644
--- a/titles/product_product/category-maps/integrate/con-integrate.adoc
+++ b/titles/product_product/category-maps/integrate/con-integrate.adoc
@@ -3,4 +3,4 @@
 = Integrate
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Integrate.
+Integrate {product} with AI assistants, external tools, and infrastructure platforms to enhance developer productivity and streamline workflows.
diff --git a/titles/product_product/category-maps/integrate/con-manage-identity-data-by-integrating-keycloak.adoc b/titles/product_product/category-maps/integrate/con-manage-identity-data-by-integrating-keycloak.adoc
index 3f7bd29c5af..8df22656399 100644
--- a/titles/product_product/category-maps/integrate/con-manage-identity-data-by-integrating-keycloak.adoc
+++ b/titles/product_product/category-maps/integrate/con-manage-identity-data-by-integrating-keycloak.adoc
@@ -3,4 +3,4 @@
 = Manage identity data by integrating Keycloak
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Manage identity data by integrating Keycloak.
+Configure schedule frequency, query parameters, and authentication methods for synchronizing Keycloak users and groups.
diff --git a/titles/product_product/category-maps/integrate/con-populate-ai-model-catalog-metadata.adoc b/titles/product_product/category-maps/integrate/con-populate-ai-model-catalog-metadata.adoc
index 5f7201d7167..d7e085f5cd7 100644
--- a/titles/product_product/category-maps/integrate/con-populate-ai-model-catalog-metadata.adoc
+++ b/titles/product_product/category-maps/integrate/con-populate-ai-model-catalog-metadata.adoc
@@ -3,4 +3,4 @@
 = Populate AI model catalog metadata
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Populate AI model catalog metadata.
+Enrich the {product-very-short} experience by adding custom properties to your {rhoai-short} model metadata, so that the {openshift-ai-connector-name} populates additional fields in the catalog entities.
diff --git a/titles/product_product/category-maps/integrate/con-track-build-artifacts-using-the-jfrog-plugin.adoc b/titles/product_product/category-maps/integrate/con-track-build-artifacts-using-the-jfrog-plugin.adoc
index 9d9b6be6937..7043e18ec77 100644
--- a/titles/product_product/category-maps/integrate/con-track-build-artifacts-using-the-jfrog-plugin.adoc
+++ b/titles/product_product/category-maps/integrate/con-track-build-artifacts-using-the-jfrog-plugin.adoc
@@ -3,4 +3,4 @@
 = Track build artifacts using the JFrog plugin
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Track build artifacts using the JFrog plugin.
+Enable the JFrog Artifactory plugin to track and view build artifacts stored in your JFrog Artifactory instance.
diff --git a/titles/product_product/category-maps/integrate/con-track-deployment-history-and-rollouts-with-argo-cd.adoc b/titles/product_product/category-maps/integrate/con-track-deployment-history-and-rollouts-with-argo-cd.adoc
index ef2e2872117..eb02e36457e 100644
--- a/titles/product_product/category-maps/integrate/con-track-deployment-history-and-rollouts-with-argo-cd.adoc
+++ b/titles/product_product/category-maps/integrate/con-track-deployment-history-and-rollouts-with-argo-cd.adoc
@@ -3,4 +3,4 @@
 = Track deployment history and rollouts with Argo CD
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Track deployment history and rollouts with Argo CD.
+The Argo CD plugin provides a visual overview of the application{apos}s status, deployment details, commit message, author of the commit, container image promoted to environment and deployment history.
diff --git a/titles/product_product/category-maps/integrate/con-view-build-artifacts-using-nexus-repository-manager.adoc b/titles/product_product/category-maps/integrate/con-view-build-artifacts-using-nexus-repository-manager.adoc
index bd141738126..ccc7a9a4452 100644
--- a/titles/product_product/category-maps/integrate/con-view-build-artifacts-using-nexus-repository-manager.adoc
+++ b/titles/product_product/category-maps/integrate/con-view-build-artifacts-using-nexus-repository-manager.adoc
@@ -3,4 +3,4 @@
 = View build artifacts using Nexus Repository Manager
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of View build artifacts using Nexus Repository Manager.
+Configure the Nexus Repository Manager plugin to display artifact information from your Nexus Repository Manager instance.
diff --git a/titles/product_product/category-maps/integrate/con-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc b/titles/product_product/category-maps/integrate/con-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
index fce9f4230f1..c1b5155c6c1 100644
--- a/titles/product_product/category-maps/integrate/con-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
+++ b/titles/product_product/category-maps/integrate/con-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
@@ -3,4 +3,4 @@
 = Visualize Kubernetes workloads and pod health with Topology
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Visualize Kubernetes workloads and pod health with Topology.
+Visualize Kubernetes workloads like Deployments, Pods, and Virtual Machines by enabling the Topology plugin.
diff --git a/titles/product_product/category-maps/integrate/nav-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc b/titles/product_product/category-maps/integrate/nav-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
index 2dcc8c40de0..aa0a023ba86 100644
--- a/titles/product_product/category-maps/integrate/nav-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
+++ b/titles/product_product/category-maps/integrate/nav-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc
@@ -6,8 +6,8 @@
 
 include::con-accelerate-ai-model-discovery-by-integrating-the-openshift-ai-connector.adoc[leveloffset=+1]
 
-// TODO: include Configure AI asset mapping
+include::nav-configure-ai-asset-mapping.adoc[leveloffset=+1]
 
-// TODO: include Set up the OpenShift AI Connector
+include::modules/integrate_accelerating-ai-development-with-openshift-ai-connector-for-rhdh/proc-set-up-with.adoc[leveloffset=+1]
 
-// TODO: include Populate AI model catalog metadata
+include::nav-populate-ai-model-catalog-metadata.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc b/titles/product_product/category-maps/integrate/nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
index 4f4f7ea3297..43d229e8803 100644
--- a/titles/product_product/category-maps/integrate/nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
+++ b/titles/product_product/category-maps/integrate/nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc
@@ -6,4 +6,5 @@
 
 include::con-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc[leveloffset=+1]
 
-// TODO: include Solve project-specific challenges
+include::modules/shared/proc-enable-secure-ai-research-with-developer-lightspeed-notebooks.adoc[leveloffset=+1,navtitle="Solve project-specific challenges"]
+include::modules/shared/proc-enable-data-persistence-for-developer-lightspeed-notebooks.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-configure-ai-asset-mapping.adoc b/titles/product_product/category-maps/integrate/nav-configure-ai-asset-mapping.adoc
index 1316275b6a5..1608badd543 100644
--- a/titles/product_product/category-maps/integrate/nav-configure-ai-asset-mapping.adoc
+++ b/titles/product_product/category-maps/integrate/nav-configure-ai-asset-mapping.adoc
@@ -5,3 +5,7 @@
 :context: configure-ai-asset-mapping
 
 include::con-configure-ai-asset-mapping.adoc[leveloffset=+1]
+
+include::modules/integrate_accelerating-ai-development-with-openshift-ai-connector-for-rhdh/ref-model-to-entity-mapping.adoc[leveloffset=+1]
+
+include::modules/integrate_accelerating-ai-development-with-openshift-ai-connector-for-rhdh/ref-enrich-ai-model-metadata-for-enhanced-rhdh-experience.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-configure-mcp-tokens-and-endpoints.adoc b/titles/product_product/category-maps/integrate/nav-configure-mcp-tokens-and-endpoints.adoc
index 0785c978a07..601cdb70c9d 100644
--- a/titles/product_product/category-maps/integrate/nav-configure-mcp-tokens-and-endpoints.adoc
+++ b/titles/product_product/category-maps/integrate/nav-configure-mcp-tokens-and-endpoints.adoc
@@ -5,3 +5,5 @@
 :context: configure-mcp-tokens-and-endpoints
 
 include::con-configure-mcp-tokens-and-endpoints.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/proc-configure-mcp-tokens-and-endpoints-to-authorize-client-access.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc b/titles/product_product/category-maps/integrate/nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
index cd91e93154f..1a4a317dcba 100644
--- a/titles/product_product/category-maps/integrate/nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
+++ b/titles/product_product/category-maps/integrate/nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc
@@ -6,12 +6,13 @@
 
 include::con-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc[leveloffset=+1]
 
-// TODO: include Install MCP server and tool plugins
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/proc-install-the-backend-mcp-server-plugin.adoc[leveloffset=+1,navtitle="Install MCP server and tool plugins"]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/proc-install-the-mcp-tool-plugins.adoc[leveloffset=+1]
 
-// TODO: include Configure MCP tokens and endpoints
+include::nav-configure-mcp-tokens-and-endpoints.adoc[leveloffset=+1]
 
-// TODO: include Enable Software Catalog MCP tools
+include::nav-enable-software-catalog-mcp-tools.adoc[leveloffset=+1]
 
-// TODO: include Enable TechDocs MCP tools
+include::nav-enable-techdocs-mcp-tools.adoc[leveloffset=+1]
 
 include::nav-enable-scaffolder-mcp-tools.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-customize-the-system-prompt-and-ui-options.adoc b/titles/product_product/category-maps/integrate/nav-customize-the-system-prompt-and-ui-options.adoc
index 35252a8832a..0b447de6f9f 100644
--- a/titles/product_product/category-maps/integrate/nav-customize-the-system-prompt-and-ui-options.adoc
+++ b/titles/product_product/category-maps/integrate/nav-customize-the-system-prompt-and-ui-options.adoc
@@ -5,3 +5,9 @@
 :context: customize-the-system-prompt-and-ui-options
 
 include::con-customize-the-system-prompt-and-ui-options.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-user-feedback-to-improve-model-performance.adoc[leveloffset=+1]
+
+include::modules/shared/proc-customize-ai-responses-by-using-system-prompts.adoc[leveloffset=+1]
+
+include::modules/shared/proc-customize-chat-history-storage.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-developer-lightspeed-for-rhdh-architecture.adoc b/titles/product_product/category-maps/integrate/nav-developer-lightspeed-for-rhdh-architecture.adoc
index dccf9a44bbc..6db3eae871c 100644
--- a/titles/product_product/category-maps/integrate/nav-developer-lightspeed-for-rhdh-architecture.adoc
+++ b/titles/product_product/category-maps/integrate/nav-developer-lightspeed-for-rhdh-architecture.adoc
@@ -6,10 +6,15 @@
 
 include::con-developer-lightspeed-for-rhdh-architecture.adoc[leveloffset=+1]
 
-// TODO: include Retrieval augmented generation (RAG) embeddings
+include::modules/shared/con-retrieval-augmented-generation-rag-embeddings-for-grounded-ai-responses.adoc[leveloffset=+1]
 
-// TODO: include Configure the virtual assistant components
+include::modules/shared/proc-configure-by-using-the-operator.adoc[leveloffset=+1,navtitle="Configure the virtual assistant components"]
+include::modules/shared/proc-configure-by-using-the-helm-chart.adoc[leveloffset=+1]
+include::modules/shared/proc-disable-by-using-the-operator.adoc[leveloffset=+1]
+include::modules/shared/proc-disable-by-using-the-helm-chart.adoc[leveloffset=+1]
 
-// TODO: include Customize the system prompt and UI options
+include::nav-customize-the-system-prompt-and-ui-options.adoc[leveloffset=+1]
 
-// TODO: include Mirror Lightspeed images for air-gapped environments
+include::modules/shared/proc-mirror-images-for-operator-deployments.adoc[leveloffset=+1,navtitle="Mirror Lightspeed images for air-gapped environments"]
+include::modules/shared/proc-mirror-images-for-helm-deployments-on-ocp.adoc[leveloffset=+1]
+include::modules/shared/proc-mirror-images-for-helm-deployments-on-kubernetes.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-enable-ai-assistance-for-developers.adoc b/titles/product_product/category-maps/integrate/nav-enable-ai-assistance-for-developers.adoc
index bfdefbb9346..74f39a8b688 100644
--- a/titles/product_product/category-maps/integrate/nav-enable-ai-assistance-for-developers.adoc
+++ b/titles/product_product/category-maps/integrate/nav-enable-ai-assistance-for-developers.adoc
@@ -10,9 +10,16 @@ include::nav-developer-lightspeed-for-rhdh-architecture.adoc[leveloffset=+1]
 
 include::nav-build-a-private-knowledge-base-with-lightspeed-notebooks.adoc[leveloffset=+1]
 
-// TODO: include LLM requirements
-
-// TODO: include Manage user data security
+include::modules/shared/con-large-language-model-llm-requirements.adoc[leveloffset=+1]
+include::modules/shared/con-openai-model-integration-for-your-deployment.adoc[leveloffset=+1]
+include::modules/shared/con-ollama-model-integration-requirements.adoc[leveloffset=+1]
+include::modules/shared/con-vllm-model-integration-for-high-throughput-inference.adoc[leveloffset=+1]
+include::modules/shared/con-vertex-ai-integration-for-gemini-models.adoc[leveloffset=+1]
+
+include::modules/shared/con-data-use-and-privacy-practices.adoc[leveloffset=+1,navtitle="Manage user data security"]
+include::modules/shared/con-user-feedback-collection.adoc[leveloffset=+1]
+include::modules/shared/con-bring-your-own-model-integration.adoc[leveloffset=+1]
+include::modules/shared/con-your-compliance-and-data-sharing-responsibility.adoc[leveloffset=+1]
 
 include::nav-configure-model-context-protocol-tools-to-enhance-ai-interactions-with-portal-data.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/integrate/nav-enable-scaffolder-mcp-tools.adoc b/titles/product_product/category-maps/integrate/nav-enable-scaffolder-mcp-tools.adoc
index 6fe0d72dab2..b2a5fec59ab 100644
--- a/titles/product_product/category-maps/integrate/nav-enable-scaffolder-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/nav-enable-scaffolder-mcp-tools.adoc
@@ -6,6 +6,12 @@
 
 include::con-enable-scaffolder-mcp-tools.adoc[leveloffset=+1]
 
-// TODO: include Automate software resource creation
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/con-software-template-validation-with-scaffolder-dry-run-tools.adoc[leveloffset=+1,navtitle="Automate software resource creation"]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-scaffolder-dry-run-tool-reference.adoc[leveloffset=+1]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/con-software-template-execution-with-scaffolder-mcp-tools.adoc[leveloffset=+1]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-scaffolder-execution-tool-reference.adoc[leveloffset=+1]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/con-scaffolder-task-monitoring-with-mcp-tools.adoc[leveloffset=+1]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-scaffolder-tasks-list-tool-reference.adoc[leveloffset=+1]
 
-// TODO: include Automate Software Templates
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-list-scaffolder-actions.adoc[leveloffset=+1,navtitle="Automate Software Templates"]
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-get-scaffolder-task-logs.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-enable-software-catalog-mcp-tools.adoc b/titles/product_product/category-maps/integrate/nav-enable-software-catalog-mcp-tools.adoc
index 33762313232..1e70e9a1c05 100644
--- a/titles/product_product/category-maps/integrate/nav-enable-software-catalog-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/nav-enable-software-catalog-mcp-tools.adoc
@@ -5,3 +5,11 @@
 :context: enable-software-catalog-mcp-tools
 
 include::con-enable-software-catalog-mcp-tools.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-fetch-entities-using-fetch-catalog-entities.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-register-entities-using-catalog-register-tool.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-unregister-entities-using-catalog-unregister-tool.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-retrieve-software-template-metadata.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-enable-techdocs-mcp-tools.adoc b/titles/product_product/category-maps/integrate/nav-enable-techdocs-mcp-tools.adoc
index 17f9527eb9c..2e223226f62 100644
--- a/titles/product_product/category-maps/integrate/nav-enable-techdocs-mcp-tools.adoc
+++ b/titles/product_product/category-maps/integrate/nav-enable-techdocs-mcp-tools.adoc
@@ -5,3 +5,9 @@
 :context: enable-techdocs-mcp-tools
 
 include::con-enable-techdocs-mcp-tools.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-retrieve-techdocs-urls-and-metadata-using-fetch-techdocs.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-measure-documentation-gaps-using-analyze-techdocs-coverage.adoc[leveloffset=+1]
+
+include::modules/integrate_interacting-with-model-context-protocol-tools-for-rhdh/ref-find-a-specific-techdoc-using-retrieve-techdocs-content.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc b/titles/product_product/category-maps/integrate/nav-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
index 8e39d0212d4..c7132d176dd 100644
--- a/titles/product_product/category-maps/integrate/nav-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
+++ b/titles/product_product/category-maps/integrate/nav-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc
@@ -6,14 +6,14 @@
 
 include::con-integrate-cicd-and-infrastructure-tools-to-visualize-pipelines-and-workloads.adoc[leveloffset=+1]
 
-// TODO: include Track deployment history and rollouts with Argo CD
+include::nav-track-deployment-history-and-rollouts-with-argo-cd.adoc[leveloffset=+1]
 
-// TODO: include Track build artifacts using the JFrog plugin
+include::nav-track-build-artifacts-using-the-jfrog-plugin.adoc[leveloffset=+1]
 
-// TODO: include Manage identity data by integrating Keycloak
+include::nav-manage-identity-data-by-integrating-keycloak.adoc[leveloffset=+1]
 
-// TODO: include View build artifacts using Nexus Repository Manager
+include::nav-view-build-artifacts-using-nexus-repository-manager.adoc[leveloffset=+1]
 
-// TODO: include Monitor continuous integration pipelines with Tekton
+include::modules/shared/proc-enable-the-tekton-plugin.adoc[leveloffset=+1,navtitle="Monitor continuous integration pipelines with Tekton"]
 
-// TODO: include Visualize Kubernetes workloads and pod health with Topology
+include::nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-manage-identity-data-by-integrating-keycloak.adoc b/titles/product_product/category-maps/integrate/nav-manage-identity-data-by-integrating-keycloak.adoc
index 9e265c6d047..23ed59d2a88 100644
--- a/titles/product_product/category-maps/integrate/nav-manage-identity-data-by-integrating-keycloak.adoc
+++ b/titles/product_product/category-maps/integrate/nav-manage-identity-data-by-integrating-keycloak.adoc
@@ -5,3 +5,9 @@
 :context: manage-identity-data-by-integrating-keycloak
 
 include::con-manage-identity-data-by-integrating-keycloak.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-the-keycloak-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-configure-the-keycloak-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/ref-keycloak-plugin-metrics.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-populate-ai-model-catalog-metadata.adoc b/titles/product_product/category-maps/integrate/nav-populate-ai-model-catalog-metadata.adoc
index 045725f7b0e..39cdc782699 100644
--- a/titles/product_product/category-maps/integrate/nav-populate-ai-model-catalog-metadata.adoc
+++ b/titles/product_product/category-maps/integrate/nav-populate-ai-model-catalog-metadata.adoc
@@ -5,3 +5,7 @@
 :context: populate-ai-model-catalog-metadata
 
 include::con-populate-ai-model-catalog-metadata.adoc[leveloffset=+1]
+
+include::modules/integrate_accelerating-ai-development-with-openshift-ai-connector-for-rhdh/proc-set-up-with.adoc[leveloffset=+1]
+
+include::modules/integrate_accelerating-ai-development-with-openshift-ai-connector-for-rhdh/proc-populate-the-api-definition-tab-in-rhdh-api-entities.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-track-build-artifacts-using-the-jfrog-plugin.adoc b/titles/product_product/category-maps/integrate/nav-track-build-artifacts-using-the-jfrog-plugin.adoc
index 4c166733f8c..fdebc0f8bb1 100644
--- a/titles/product_product/category-maps/integrate/nav-track-build-artifacts-using-the-jfrog-plugin.adoc
+++ b/titles/product_product/category-maps/integrate/nav-track-build-artifacts-using-the-jfrog-plugin.adoc
@@ -5,3 +5,7 @@
 :context: track-build-artifacts-using-the-jfrog-plugin
 
 include::con-track-build-artifacts-using-the-jfrog-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-the-jfrog-artifactory-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-configure-the-jfrog-artifactory-plugin.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-track-deployment-history-and-rollouts-with-argo-cd.adoc b/titles/product_product/category-maps/integrate/nav-track-deployment-history-and-rollouts-with-argo-cd.adoc
index 09ac7a1d428..47e469e5973 100644
--- a/titles/product_product/category-maps/integrate/nav-track-deployment-history-and-rollouts-with-argo-cd.adoc
+++ b/titles/product_product/category-maps/integrate/nav-track-deployment-history-and-rollouts-with-argo-cd.adoc
@@ -5,3 +5,7 @@
 :context: track-deployment-history-and-rollouts-with-argo-cd
 
 include::con-track-deployment-history-and-rollouts-with-argo-cd.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-the-argo-cd-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-argo-cd-rollouts.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-view-build-artifacts-using-nexus-repository-manager.adoc b/titles/product_product/category-maps/integrate/nav-view-build-artifacts-using-nexus-repository-manager.adoc
index 1c3b71fc8be..2804b65ceb9 100644
--- a/titles/product_product/category-maps/integrate/nav-view-build-artifacts-using-nexus-repository-manager.adoc
+++ b/titles/product_product/category-maps/integrate/nav-view-build-artifacts-using-nexus-repository-manager.adoc
@@ -5,3 +5,7 @@
 :context: view-build-artifacts-using-nexus-repository-manager
 
 include::con-view-build-artifacts-using-nexus-repository-manager.adoc[leveloffset=+1]
+
+include::modules/shared/proc-enable-the-nexus-repository-manager-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-configure-the-nexus-repository-manager-plugin.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/integrate/nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc b/titles/product_product/category-maps/integrate/nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
index b3247127599..855fa9731be 100644
--- a/titles/product_product/category-maps/integrate/nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
+++ b/titles/product_product/category-maps/integrate/nav-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc
@@ -5,3 +5,19 @@
 :context: visualize-kubernetes-workloads-and-pod-health-with-topology
 
 include::con-visualize-kubernetes-workloads-and-pod-health-with-topology.adoc[leveloffset=+1]
+
+include::modules/shared/proc-install-the-topology-plugin.adoc[leveloffset=+1]
+
+include::modules/shared/proc-view-openshift-routes.adoc[leveloffset=+1,navtitle="Configure the plugin"]
+include::modules/shared/proc-view-pod-logs.adoc[leveloffset=+1]
+include::modules/shared/proc-view-tekton-pipelineruns.adoc[leveloffset=+1]
+include::modules/shared/proc-view-virtual-machines.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-the-source-code-editor.adoc[leveloffset=+1]
+
+include::modules/shared/proc-link-to-the-source-code-editor-or-the-source.adoc[leveloffset=+1,navtitle="Manage labels and annotations"]
+include::modules/shared/proc-add-entity-annotations-and-labels-for-the-kubernetes-plugin.adoc[leveloffset=+1]
+include::modules/shared/proc-namespace-annotation.adoc[leveloffset=+1]
+include::modules/shared/proc-add-a-label-selector-query-annotation.adoc[leveloffset=+1]
+include::modules/shared/proc-display-a-runtime-icon-in-the-topology-node.adoc[leveloffset=+1]
+include::modules/shared/proc-group-applications-in-the-topology-view.adoc[leveloffset=+1]
+include::modules/shared/proc-node-connector.adoc[leveloffset=+1]

From ed33944b6c97394c533397018bf76c70f4439566 Mon Sep 17 00:00:00 2001
From: Kalyani Desai <43639538+kaldesai@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:53:32 +0530
Subject: [PATCH 10/12] RHIDP-14495: JTBD Discover category (#2399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kalyani Desai <kaldesai@kaldesai-thinkpadt14gen4.punetw6.csb>
Co-authored-by: Fabrice Flore-Thébault <ffloreth@redhat.com>
---
 ...tegrations-for-toolchain-connectivity.adoc | 29 ++++++++-
 ...ture-for-deployment-strategy-planning.adoc | 40 +++++++++++-
 .../con-why-internal-developer-platforms.adoc | 64 ++++++++++++++++++-
 ...eed-ai-virtual-assistant-capabilities.adoc |  2 +-
 .../nav-evaluate-rhdh-capabilities.adoc       |  4 +-
 ...tegrations-for-toolchain-connectivity.adoc |  4 --
 6 files changed, 133 insertions(+), 10 deletions(-)

diff --git a/titles/product_product/category-maps/discover/con-platform-integrations-for-toolchain-connectivity.adoc b/titles/product_product/category-maps/discover/con-platform-integrations-for-toolchain-connectivity.adoc
index 641cec0c377..cb655c792bb 100644
--- a/titles/product_product/category-maps/discover/con-platform-integrations-for-toolchain-connectivity.adoc
+++ b/titles/product_product/category-maps/discover/con-platform-integrations-for-toolchain-connectivity.adoc
@@ -3,4 +3,31 @@
 = Platform integrations for toolchain connectivity
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Platform integrations for toolchain connectivity.
+{product} integrates seamlessly with {ocp-brand-name} and other tools, enabling comprehensive development and deployment workflows across enterprise.
+
+== Integration with {ocp-brand-name}
+{product} is fully integrated with {ocp-brand-name}, offering:
+
+* Operators to manage application lifecycle.
+* Access to advanced OpenShift capabilities such as service mesh, serverless functions, GitOps, and distributed tracing.
+* Pipelines and GitOps plugins for streamlined cloud-native workflows.
+
+== Integration with {rhads-brand-name}
+{rhads-brand-name} ({rhads-very-short}) enhances {product} by providing secure CI/CD capabilities that integrate security measures into every stage of the development process.
+
+While {product} focuses on the inner loop (code, build, and test), {rhads-very-short} manages the outer loop, automating:
+
+* Code scanning
+* Image building
+* Vulnerability detection
+* Deployment
+
+{rhads-very-short} includes tools such as {rhtas-brand-name} ({rhtas-very-short}) for code integrity, {rhtpa-brand-name} ({rhtpa-very-short}) for automated Software build of Materials (SBOM) creation, and {rhacs-brand-name} ({rhacs-very-short}) for vulnerability scanning.
+
+== Extending {backstage} with {product}
+{product} which is a fully supported, enterprise-grade productized version of upstream {backstage} extends the upstream project by adding:
+
+* Enhanced search capabilities that aggregate data from CI/CD pipelines, cloud providers, source control, and more.
+* A centralized software catalog for locating applications, APIs, and resources.
+* Automation through open-source plugins that expand the {backstage} core functionality.
+* Simplified technical documentation using Markdown and GitHub, with integrated search for easy navigation.
diff --git a/titles/product_product/category-maps/discover/con-system-architecture-for-deployment-strategy-planning.adoc b/titles/product_product/category-maps/discover/con-system-architecture-for-deployment-strategy-planning.adoc
index 0589cbeae66..ed295d053e2 100644
--- a/titles/product_product/category-maps/discover/con-system-architecture-for-deployment-strategy-planning.adoc
+++ b/titles/product_product/category-maps/discover/con-system-architecture-for-deployment-strategy-planning.adoc
@@ -3,4 +3,42 @@
 = System architecture for deployment strategy planning
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of System architecture for deployment strategy planning.
+Understanding {product} client-server architecture helps you plan deployments for horizontal scaling, high availability, and efficient data synchronization across the Software Catalog.
+
+By understanding the {product-very-short} architecture, you can perform the following planning tasks:
+
+Plan scalable deployments:: Deploy multiple backend instances behind a load balancer to manage increased load.
+Ensure high availability:: Configure database replication and cache clustering to eliminate single points of failure.
+Optimize resource allocation:: Assign infrastructure resources based on which components require persistent storage or high-performance memory.
+
+The following diagram shows the {product-very-short} internal architecture (frontend and backend) and its external dependencies, such as authentication providers, load balancers, and databases:
+
+image::discover_about-rhdh/rhdh-architecture-diagram.png["System architecture diagram for {product}"]
+
+The {product-very-short} architecture includes three primary layers. While the data layer (PostgreSQL and optional Redis cache) stores the indexed Software Catalog, the source of truth remains in external systems, such as Git repositories, CI/CD platforms, and other integrations. Catalog providers continuously scan these external systems and synchronize data to the database for fast querying.
+
+== Frontend (Client)
+The frontend is a browser-based single-page application (SPA). Use the frontend interface to browse the Software Catalog, interact with plugins, and connect to external integrations. The frontend communicates with the backend exclusively using REST API calls.
+
+== Backend (Service Layer)
+The backend provides REST API endpoints for the frontend. It manages the Software Catalog (an inventory of your organization's software components, APIs, and resources) and handles authentication.
+
+The stateless design allows you to scale the backend horizontally by running multiple instances behind a load balancer. The backend externalizes all persistent state to a PostgreSQL database, including:
+
+* Catalog entities
+* Task history
+* Session data (managed through a database-backed session store)
+
+== External data dependencies
+{product-very-short} requires PostgreSQL for persistence. For production environments, use a logical cache to improve performance.
+
+PostgreSQL database::
+Stores indexed Software Catalog entities (synchronized from external systems such as Git repositories and CI/CD platforms), profiles, authentication data, and backend state. You must configure PostgreSQL with high availability (HA) for production deployments.
+
+Redis Cache (Optional)::
+Configure Redis as a shared logical cache across backend instances to improve performance for frequently accessed data, such as rendered TechDocs and catalog entities.
+
+[TIP]
+====
+The default in-memory cache is suitable only for single-instance deployments. You must use Redis for production deployments with multiple backend instances to ensure cache consistency.
+====
diff --git a/titles/product_product/category-maps/discover/con-why-internal-developer-platforms.adoc b/titles/product_product/category-maps/discover/con-why-internal-developer-platforms.adoc
index 367d46323a1..e6ecdcb272c 100644
--- a/titles/product_product/category-maps/discover/con-why-internal-developer-platforms.adoc
+++ b/titles/product_product/category-maps/discover/con-why-internal-developer-platforms.adoc
@@ -3,4 +3,66 @@
 = Why Internal developer platforms?
 
 [role="_abstract"]
-TODO: Replace this placeholder with an overview of Why Internal developer platforms?.
+Internal developer platforms (IDPs) provide a unified interface that enables developer self-service for provisioning environments, deploying code, and accessing APIs.
+By centralizing these tools, IDPs reduce complexity across development workflows.
+
+Why IDPs matter::
+
+IDPs address the challenges of modern software delivery by enabling self-service, enforcing standards, and improving the developer experience.
+
+For organizations::
+
+* *Scalability:* {product-very-short} enables consistent developer onboarding and application delivery across growing teams and environments.
+* *Security:* Role-based access control (RBAC) and integration with enterprise systems ensure access is managed securely and in line with compliance requirements.
+* *Operational efficiency:* By removing manual handoffs and centralizing key development workflows, {product-very-short} improves time to value and increases return on engineering investment.
+
+For platform engineers::
+
+* *Curated platforms:* Platform teams can design reusable templates and integrations aligned with organizational policies and developer needs.
+* *Central configuration:* Infrastructure and policies are defined as code and centrally managed, reducing drift and maintenance costs.
+* *Governance at scale:* Policies and best practices are embedded into developer workflows using automation and templates, without adding friction to the process.
+
+For developers::
+
+* *Faster onboarding:* Developers can use learning paths, software templates, and software catalog to deploy compliant services within minutes, without depending on other teams for setup.
+* *Reduced cognitive load:* Developers can find tools, documentation, and deployment environments in one place, eliminating the need to switch between systems or manage disconnected resources.
+* *Self-service workflows:* Developers can create applications or environments on-demand, without raising tickets or waiting for approvals.
+* *Built-in standards:* Developers can use preconfigured templates that enforce secure, compliant workflows without requiring manual setup.
+* *Cross-team visibility:* Developers can discover shared service catalogs and documentation to improve reuse and reduce duplication.
+* *Higher productivity:* Developers can dedicate more time to building features and less time to configuring infrastructure or resolving toolchain inconsistencies.
+
+== Key features
+
+Centralized dashboard::
+Access development tools, CI/CD pipelines, APIs, monitoring tools, and documentation from a single interface. Integrate with systems such as Git, {ocp-brand-name}, Kubernetes, and Jira.
+
+Learning paths::
+Guide developers through structured tutorials and onboarding steps. Help teams build skills with internal and Red Hat training resources in one place.
+
+Plugins and integrations::
+Extend {product-very-short} with verified plugins that add new functionality without downtime. Dynamically integrate with supported tools such as Tekton for pipelines, GitOps for deployment automation, Nexus Repository for artifact storage, and JFrog Artifactory. {product-very-short} also supports connecting to {ocp-brand-name}, CI/CD systems, and security scanners through Red Hat-curated extensions.
+
+Role-based access control (RBAC)::
+Manage user access with robust security permissions tailored to organizational needs.
+
+Software catalog::
+Search, view, and manage services, APIs, and libraries from a central inventory. Track ownership, metadata, and component health in one place.
+
+Software templates::
+Accelerate project setup by using preconfigured templates for CI/CD, runtime, and security. Standardize implementation while enabling developer autonomy.
+
+Tech docs::
+Create, store, and view technical documentation alongside code. Make content searchable, consistently formatted, and accessible through the portal.
+
+Scalability::
+Support growing teams and applications while maintaining access to the same tools and services.
+
+[role="_additional-resources"]
+.Additional resources
+
+* {customizing-book-link}#configuring-templates[Configuring templates]
+* {techdocs-book-link}[{techdocs-book-title}]
+* {customizing-book-link}#proc-customize-rhdh-learning-paths_configuring-templates[Customizing the Learning Paths in {product}]
+* {installing-and-viewing-plugins-book-link}[{installing-and-viewing-plugins-book-title}]
+* xref:platform-integrations-for-toolchain-connectivity_developer-lightspeed-ai-virtual-assistant-capabilities[Integrations in {product}]
+* {authentication-book-link}[{authentication-book-title}]
diff --git a/titles/product_product/category-maps/discover/nav-developer-lightspeed-ai-virtual-assistant-capabilities.adoc b/titles/product_product/category-maps/discover/nav-developer-lightspeed-ai-virtual-assistant-capabilities.adoc
index c62fc642b92..829421c3720 100644
--- a/titles/product_product/category-maps/discover/nav-developer-lightspeed-ai-virtual-assistant-capabilities.adoc
+++ b/titles/product_product/category-maps/discover/nav-developer-lightspeed-ai-virtual-assistant-capabilities.adoc
@@ -6,4 +6,4 @@
 
 include::con-developer-lightspeed-ai-virtual-assistant-capabilities.adoc[leveloffset=+1]
 
-// TODO: include System architecture for the AI virtual assistant
+include::modules/shared/con-architecture-for-your-ai-backend-deployment.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/discover/nav-evaluate-rhdh-capabilities.adoc b/titles/product_product/category-maps/discover/nav-evaluate-rhdh-capabilities.adoc
index cb64a564a71..77287fa7127 100644
--- a/titles/product_product/category-maps/discover/nav-evaluate-rhdh-capabilities.adoc
+++ b/titles/product_product/category-maps/discover/nav-evaluate-rhdh-capabilities.adoc
@@ -6,9 +6,9 @@
 
 include::con-evaluate-rhdh-capabilities.adoc[leveloffset=+1]
 
-// TODO: include Why Internal developer platforms?
+include::nav-why-internal-developer-platforms.adoc[leveloffset=+1]
 
-// TODO: include System architecture for deployment strategy planning
+include::nav-system-architecture-for-deployment-strategy-planning.adoc[leveloffset=+1]
 
 include::nav-developer-lightspeed-ai-virtual-assistant-capabilities.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/discover/nav-platform-integrations-for-toolchain-connectivity.adoc b/titles/product_product/category-maps/discover/nav-platform-integrations-for-toolchain-connectivity.adoc
index 7e285ac47ab..d83cba38eb5 100644
--- a/titles/product_product/category-maps/discover/nav-platform-integrations-for-toolchain-connectivity.adoc
+++ b/titles/product_product/category-maps/discover/nav-platform-integrations-for-toolchain-connectivity.adoc
@@ -5,7 +5,3 @@
 :context: platform-integrations-for-toolchain-connectivity
 
 include::con-platform-integrations-for-toolchain-connectivity.adoc[leveloffset=+1]
-
-// TODO: include OpenShift integration for native Kubernetes capabilities
-
-// TODO: include Advanced Developer Suite integration for software supply chain security

From 5dfa3de0760b4ccec04711cc5d400a5e125ff6b0 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Mon, 22 Jun 2026 17:06:23 +0530
Subject: [PATCH 11/12] Fixing merge conflicts

---
 .../nav-automate-template-lifecycle-management.adoc       | 6 ++++--
 ...v-project-standardization-with-software-templates.adoc | 8 ++++----
 ...rdized-project-generation-with-software-templates.adoc | 6 +++---
 ...ance-to-map-dependencies-back-to-source-templates.adoc | 4 ++--
 ...plates-to-track-template-updates-and-dependencies.adoc | 4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
index ee0706ca101..9458f9bb6a4 100644
--- a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
+++ b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
@@ -6,6 +6,8 @@
 
 include::con-automate-template-lifecycle-management.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-the-scaffolder-relation-processor.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-the-scaffolder-relation-processor.adoc[leveloffset=+1,navtitle="Enable the scaffolder-relation-processor"]
 
-include::modules/shared/ref-template-sync-limitations.adoc[leveloffset=+1]
+include::modules/shared/ref-template-sync-limitations.adoc[leveloffset=+1,navtitle="Template sync limitations"]
+
+include::modules/shared/ref-template-synchronization-and-notification-outcomes.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
index a51170a22ee..8a7a5e6b6ea 100644
--- a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
@@ -6,13 +6,13 @@
 
 include::con-project-standardization-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-new-software-templates.adoc[leveloffset=+1]
+include::modules/shared/proc-create-new-software-templates.adoc[leveloffset=+1,navtitle="Create new Software Templates"]
 
-include::modules/shared/ref-use-sample-templates.adoc[leveloffset=+1]
+include::modules/shared/ref-use-sample-templates.adoc[leveloffset=+1,navtitle="Use sample templates"]
 
-include::modules/shared/proc-publish-template-definitions-to-the-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-publish-template-definitions-to-the-catalog.adoc[leveloffset=+1,navtitle="Publish template definitions to the catalog"]
 
-include::modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc[leveloffset=+1]
+include::modules/shared/ref-extend-templates-using-conditional-logic-and-external-fetch-capabilities.adoc[leveloffset=+1,navtitle="Extend templates using conditional logic and external fetch capabilities"]
 
 include::nav-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
index a383df5fbb8..915493b1b12 100644
--- a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
@@ -6,8 +6,8 @@
 
 include::con-standardized-project-generation-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-run-software-templates-from-the-ui.adoc[leveloffset=+1]
+include::modules/shared/proc-run-software-templates-from-the-ui.adoc[leveloffset=+1,navtitle="Run Software Templates from the UI"]
 
-include::modules/shared/proc-browse-available-templates.adoc[leveloffset=+1]
+include::modules/shared/proc-browse-available-templates.adoc[leveloffset=+1,navtitle="Browse available templates"]
 
-include::modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc[leveloffset=+1]
+include::modules/shared/proc-import-an-existing-template-file-using-the-catalog-processor.adoc[leveloffset=+1,navtitle="Import an existing template file using the Catalog Processor"]
diff --git a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
index f1a0d9f4188..3f4f34d00fd 100644
--- a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
@@ -6,6 +6,6 @@
 
 include::con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-configure-provenance-annotations.adoc[leveloffset=+1]
+include::modules/shared/proc-configure-provenance-annotations.adoc[leveloffset=+1,navtitle="Configure provenance annotations"]
 
-include::modules/shared/proc-view-template-dependencies-in-the-catalog.adoc[leveloffset=+1]
+include::modules/shared/proc-view-template-dependencies-in-the-catalog.adoc[leveloffset=+1,navtitle="View template dependencies in the catalog"]
diff --git a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
index 1cd2c0b88ec..c9a7e026364 100644
--- a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -6,6 +6,6 @@
 
 include::con-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
-include::modules/shared/proc-version-software-templates.adoc[leveloffset=+1]
+include::modules/shared/proc-version-software-templates.adoc[leveloffset=+1,navtitle="Version Software Templates"]
 
-include::modules/shared/proc-enable-update-notifications.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-update-notifications.adoc[leveloffset=+1,navtitle="Enable update notifications"]

From f48c7f21cccd985be05d5f01eda6315f7855db64 Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Thu, 18 Jun 2026 18:45:20 +0530
Subject: [PATCH 12/12] Develop category JTBD content

---
 ...project-generation-with-software-templates.adoc |  4 +++-
 ...to-track-template-updates-and-dependencies.adoc |  1 -
 ...nav-automate-template-lifecycle-management.adoc |  6 ++----
 .../nav-configure-bulk-import-capabilities.adoc    |  6 +++---
 ...av-import-source-code-repositories-in-bulk.adoc |  8 ++++----
 .../nav-manage-your-software-components.adoc       | 10 +++++-----
 ...ct-standardization-with-software-templates.adoc |  8 ++++----
 .../nav-register-new-software-components.adoc      |  4 ++--
 ...project-generation-with-software-templates.adoc |  6 +++---
 ...-map-dependencies-back-to-source-templates.adoc |  4 ++--
 ...to-track-template-updates-and-dependencies.adoc |  4 ++--
 ...ion-as-code-to-keep-knowledge-synchronized.adoc | 14 +++++++-------
 12 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
index c49ce843a5b..a232f1c439f 100644
--- a/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/con-standardized-project-generation-with-software-templates.adoc
@@ -3,4 +3,6 @@
 = Standardized project generation with software templates
 
 [role="_abstract"]
-Use Software Templates in {product} to provide standardized project starter kits that improve developer productivity and ensure that new projects follow organizational standards.
+To standardize and accelerate the creation of new software, use Software Templates in {product} ({product-very-short}).
+
+Each template uses a YAML definition to present a functional interface for inputting project metadata. Software Templates run a sequential series of _actions_, such as scaffolding code or creating repositories, which you can configure to run conditionally based on user input.
diff --git a/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
index e24ebc032ef..838ca93de5a 100644
--- a/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/con-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -4,4 +4,3 @@
 
 [role="_abstract"]
 Software Templates in {product} provide a streamlined way to create software components and publish them to different version control repositories such as Git.
-Platform engineers create and maintain Software Templates in {product}.
diff --git a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
index 22306b733bf..be61053d1e4 100644
--- a/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
+++ b/titles/product_product/category-maps/develop/nav-automate-template-lifecycle-management.adoc
@@ -6,8 +6,6 @@
 
 include::con-automate-template-lifecycle-management.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-automated-template-updates.adoc[leveloffset=+1,navtitle="Enable the scaffolder-relation-processor"]
+include::modules/shared/proc-enable-automated-template-updates.adoc[leveloffset=+1]
 
-include::modules/shared/ref-template-sync-considerations-and-limitations.adoc[leveloffset=+1,navtitle="Template sync limitations"]
-
-include::modules/shared/ref-template-synchronization-and-notification-outcomes.adoc[leveloffset=+1]
+include::modules/shared/ref-template-sync-considerations-and-limitations.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
index 8ef33107619..a349d1a9024 100644
--- a/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
+++ b/titles/product_product/category-maps/develop/nav-configure-bulk-import-capabilities.adoc
@@ -6,10 +6,10 @@
 
 include::con-configure-bulk-import-capabilities.adoc[leveloffset=+1]
 
-include::modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1,navtitle="Select and import Git projects"]
+include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Select and import Git projects"]
 
-include::modules/shared/con-review-input-parameters.adoc[leveloffset=+1]
+include::modules/shared/con-input-parameters-for-bulk-import-scaffolder-template.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-custom-scaffolder-workflows.adoc[leveloffset=+1]
+include::modules/shared/proc-set-up-a-custom-scaffolder-workflow-for-bulk-import.adoc[leveloffset=+1]
 
 include::nav-register-repository-lists-with-the-orchestrator.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
index 0fc43aa0272..3761efc00b0 100644
--- a/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
+++ b/titles/product_product/category-maps/develop/nav-import-source-code-repositories-in-bulk.adoc
@@ -8,10 +8,10 @@ include::con-import-source-code-repositories-in-bulk.adoc[leveloffset=+1]
 
 include::modules/shared/con-repository-visibility-in-bulk-import.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-and-authorize-bulk-import-plugins.adoc[leveloffset=+1]
+include::modules/shared/proc-enable-and-authorize-bulk-import-capabilities-in-rhdh.adoc[leveloffset=+1]
 
-include::modules/shared/proc-select-and-import-github-repositories.adoc[leveloffset=+1]
+include::modules/shared/proc-import-multiple-github-repositories.adoc[leveloffset=+1]
 
-include::modules/shared/proc-manage-imported-repositories.adoc[leveloffset=+1,navtitle="Manage imported repositories"]
+include::modules/shared/proc-import-multiple-gitlab-repositories.adoc[leveloffset=+1,navtitle="Manage imported repositories"]
 
-include::modules/shared/proc-monitor-bulk-import-operations-in-audit-logs.adoc[leveloffset=+1]
+include::modules/shared/proc-monitor-bulk-import-actions-using-audit-logs.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
index 60c168599dd..0ed5c2ffd0b 100644
--- a/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-manage-your-software-components.adoc
@@ -8,12 +8,12 @@ include::con-manage-your-software-components.adoc[leveloffset=+1]
 
 include::nav-register-new-software-components.adoc[leveloffset=+1]
 
-include::modules/shared/proc-update-component-yaml-metadata.adoc[leveloffset=+1]
+include::modules/shared/proc-update-existing-components-in-your-rhdh-catalog.adoc[leveloffset=+1]
 
-include::modules/shared/proc-filter-the-catalog-by-entity-kind.adoc[leveloffset=+1]
+include::modules/shared/proc-find-components-by-kind-in-the-rhdh-catalog.adoc[leveloffset=+1]
 
-include::modules/shared/proc-search-the-catalog-using-text-filters.adoc[leveloffset=+1]
+include::modules/shared/proc-filter-components-by-text-in-the-rhdh-catalog.adoc[leveloffset=+1]
 
-include::modules/shared/proc-review-the-raw-yaml-configuration.adoc[leveloffset=+1]
+include::modules/shared/proc-review-the-yaml-configuration-of-your-rhdh-software-catalog.adoc[leveloffset=+1]
 
-include::modules/shared/proc-star-frequently-used-components.adoc[leveloffset=+1]
+include::modules/shared/proc-star-key-components-in-the-software-catalog.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
index b8f86c4069c..195ce8053ac 100644
--- a/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-project-standardization-with-software-templates.adoc
@@ -6,13 +6,13 @@
 
 include::con-project-standardization-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-a-basic-software-template.adoc[leveloffset=+1,navtitle="Create new Software Templates"]
+include::modules/shared/proc-create-a-basic-software-template.adoc[leveloffset=+1]
 
-include::modules/shared/ref-default-environment-parameters-and-secrets.adoc[leveloffset=+1,navtitle="Use sample templates"]
+include::modules/shared/ref-sample-software-template.adoc[leveloffset=+1]
 
-include::modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1,navtitle="Publish template definitions to the catalog"]
+include::modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1]
 
-include::modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc[leveloffset=+1,navtitle="Extend templates using conditional logic and external fetch capabilities"]
+include::modules/shared/ref-extending-software-templates-for-complex-project-requirements.adoc[leveloffset=+1]
 
 include::nav-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
diff --git a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
index b69ccf13dd5..7eafe557089 100644
--- a/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
+++ b/titles/product_product/category-maps/develop/nav-register-new-software-components.adoc
@@ -6,6 +6,6 @@
 
 include::con-register-new-software-components.adoc[leveloffset=+1]
 
-include::modules/shared/proc-generate-new-components.adoc[leveloffset=+1]
+include::modules/shared/proc-create-new-components-in-your-rhdh-instance.adoc[leveloffset=+1]
 
-include::modules/shared/proc-register-existing-repositories-manually.adoc[leveloffset=+1]
+include::modules/shared/proc-register-components-manually-in-your-rhdh-instance.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
index f1b34f4adaf..91bd063b8d3 100644
--- a/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-standardized-project-generation-with-software-templates.adoc
@@ -6,8 +6,8 @@
 
 include::con-standardized-project-generation-with-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/con-software-templates-in-rhdh.adoc[leveloffset=+1,navtitle="Run Software Templates from the UI"]
+include::modules/shared/proc-create-a-software-component-using-software-templates.adoc[leveloffset=+1]
 
-include::modules/shared/ref-sample-software-template.adoc[leveloffset=+1,navtitle="Browse available templates"]
+include::modules/shared/proc-search-and-filter-software-templates-in-your-rhdh-instance.adoc[leveloffset=+1]
 
-include::modules/shared/proc-share-software-templates-with-your-organization.adoc[leveloffset=+1,navtitle="Import an existing template file using the Catalog Processor"]
+include::modules/shared/proc-import-an-existing-software-template.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
index e9fcb3004ba..be96106b0c8 100644
--- a/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
+++ b/titles/product_product/category-maps/develop/nav-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc
@@ -6,6 +6,6 @@
 
 include::con-track-component-provenance-to-map-dependencies-back-to-source-templates.adoc[leveloffset=+1]
 
-include::modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc[leveloffset=+1,navtitle="Configure provenance annotations"]
+include::modules/shared/proc-configure-provenance-and-software-template-versioning-rhdh.adoc[leveloffset=+1]
 
-include::modules/shared/proc-view-software-template-dependencies.adoc[leveloffset=+1,navtitle="View template dependencies in the catalog"]
+include::modules/shared/proc-view-software-template-dependencies.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
index c2809bc2d48..7e2b550297a 100644
--- a/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
+++ b/titles/product_product/category-maps/develop/nav-version-software-templates-to-track-template-updates-and-dependencies.adoc
@@ -6,6 +6,6 @@
 
 include::con-version-software-templates-to-track-template-updates-and-dependencies.adoc[leveloffset=+1]
 
-include::modules/shared/proc-version-a-software-template-in-rhdh.adoc[leveloffset=+1,navtitle="Version Software Templates"]
+include::modules/shared/proc-version-a-software-template-in-rhdh.adoc[leveloffset=+1]
 
-include::modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc[leveloffset=+1,navtitle="Enable update notifications"]
+include::modules/shared/proc-enable-software-template-version-update-notifications-in-rhdh.adoc[leveloffset=+1]
diff --git a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
index 3698babdc5e..9a03f60baf1 100644
--- a/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
+++ b/titles/product_product/category-maps/develop/nav-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc
@@ -6,22 +6,22 @@
 
 include::con-write-and-publish-documentation-as-code-to-keep-knowledge-synchronized.adoc[leveloffset=+1]
 
-// TODO: include Docs-like-code practices for TechDocs strategies
+include::modules/shared/con-docs-like-code-best-practices-for-techdocs.adoc[leveloffset=+1,navtitle="Docs-like-code practices for TechDocs strategies"]
 
 include::modules/shared/proc-import-documentation-into-techdocs-from-a-remote-repository.adoc[leveloffset=+1,navtitle="Import Markdown documentation"]
 
-include::modules/shared/proc-search-for-relevant-content.adoc[leveloffset=+1,navtitle="Filter the TechDocs catalog"]
+include::modules/shared/proc-filter-techdocs-based-on-various-criteria.adoc[leveloffset=+1,navtitle="Filter the TechDocs catalog"]
 
-include::modules/shared/proc-access-and-navigate-documentation.adoc[leveloffset=+1,navtitle="Navigate within TechDocs books"]
+include::modules/shared/proc-navigating-techdocs.adoc[leveloffset=+1,navtitle="Navigate within TechDocs books"]
 
-include::modules/shared/proc-make-changes-to-project-documentation-in-techdocs.adoc[leveloffset=+1,navtitle="Edit TechDocs files directly"]
+include::modules/shared/proc-edit-documentation-in-techdocs.adoc[leveloffset=+1,navtitle="Edit TechDocs files directly"]
 
-include::modules/shared/proc-add-video-content-to-enhance-techdocs.adoc[leveloffset=+1,navtitle="Embed video iframes"]
+include::modules/configure_techdocs-for-rhdh/proc-embed-video-iframes-in-techdocs-pages.adoc[leveloffset=+1,navtitle="Embed video iframes"]
 
 include::nav-configure-techdocs-storage-and-cicd-pipelines.adoc[leveloffset=+1]
 
-// TODO: include Automate documentation builds with GitHub Actions
+include::modules/configure_techdocs-for-rhdh/proc-automate-techdocs-builds-with-github-actions.adoc[leveloffset=+1,navtitle="Automate documentation builds with GitHub Actions"]
 
 include::nav-install-techdocs-add-ons.adoc[leveloffset=+1]
 
-include::modules/shared/proc-create-a-techdocs-add-on.adoc[leveloffset=+1,navtitle="Develop custom TechDocs add-ons as React components"]
+include::modules/configure_techdocs-for-rhdh/proc-create-a-custom-techdocs-add-on.adoc[leveloffset=+1,navtitle="Develop custom TechDocs add-ons as React components"]