diff --git a/archive.md b/archive.md
index 4b43cbbe0..d30c51fa2 100644
--- a/archive.md
+++ b/archive.md
@@ -1,6 +1,7 @@
 ---
 layout: archive
-description: Browse the archive for legacy Elastic products and documentation. Archive documentation is unmaintained and may be out-of-date.
+description: Browse the archive for legacy Elastic products and documentation.
+  Archive documentation is unmaintained and may be out-of-date.
 ---
 
 # Documentation archive
diff --git a/cloud-account/add-a-login-method.md b/cloud-account/add-a-login-method.md
index b3cd2bd7a..9770ccda8 100644
--- a/cloud-account/add-a-login-method.md
+++ b/cloud-account/add-a-login-method.md
@@ -5,6 +5,8 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Add a login method [ec-change-login-method]
diff --git a/cloud-account/change-your-password.md b/cloud-account/change-your-password.md
index 04b8b336a..2afca4af0 100644
--- a/cloud-account/change-your-password.md
+++ b/cloud-account/change-your-password.md
@@ -5,6 +5,8 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Change your password [ec-change-password]
diff --git a/cloud-account/index.md b/cloud-account/index.md
index 3c8b8d072..651e33b81 100644
--- a/cloud-account/index.md
+++ b/cloud-account/index.md
@@ -6,6 +6,9 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Manage your Cloud account and preferences
diff --git a/cloud-account/join-or-leave-an-organization.md b/cloud-account/join-or-leave-an-organization.md
index b9be2290c..eb3bf1411 100644
--- a/cloud-account/join-or-leave-an-organization.md
+++ b/cloud-account/join-or-leave-an-organization.md
@@ -6,6 +6,9 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Join or leave an organization
diff --git a/cloud-account/multifactor-authentication.md b/cloud-account/multifactor-authentication.md
index 93deb88a1..b4ff172cc 100644
--- a/cloud-account/multifactor-authentication.md
+++ b/cloud-account/multifactor-authentication.md
@@ -5,6 +5,8 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Multifactor authentication [ec-account-security-mfa]
diff --git a/cloud-account/update-your-email-address.md b/cloud-account/update-your-email-address.md
index 64d430f02..685b63cbd 100644
--- a/cloud-account/update-your-email-address.md
+++ b/cloud-account/update-your-email-address.md
@@ -5,6 +5,8 @@ applies_to:
   serverless: all
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Update your email address [ec-update-email-address]
diff --git a/deploy-manage/api-keys/elastic-cloud-api-keys.md b/deploy-manage/api-keys/elastic-cloud-api-keys.md
index ff24973aa..998b47e19 100644
--- a/deploy-manage/api-keys/elastic-cloud-api-keys.md
+++ b/deploy-manage/api-keys/elastic-cloud-api-keys.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-api-authentication.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-api-authentication.html
+products:
+  - id: cloud-hosted
 ---
 
 # {{ecloud}} API keys [ec-api-authentication]
diff --git a/deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md b/deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
index 15015ddb7..92d01fd47 100644
--- a/deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
+++ b/deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-restful-api-authentication.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-restful-api-authentication.html
+products:
+  - id: cloud-enterprise
 ---
 
 # {{ece}} API keys [ece-restful-api-authentication]
diff --git a/deploy-manage/api-keys/elasticsearch-api-keys.md b/deploy-manage/api-keys/elasticsearch-api-keys.md
index 5121c7d00..e6622c696 100644
--- a/deploy-manage/api-keys/elasticsearch-api-keys.md
+++ b/deploy-manage/api-keys/elasticsearch-api-keys.md
@@ -1,8 +1,10 @@
 ---
-applies_to:
-  stack: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/api-keys.html
+applies_to:
+  stack: ga
+products:
+  - id: kibana
 ---
 
 # {{es}} API keys [api-keys]
diff --git a/deploy-manage/api-keys/serverless-project-api-keys.md b/deploy-manage/api-keys/serverless-project-api-keys.md
index 349a79a73..2657892a4 100644
--- a/deploy-manage/api-keys/serverless-project-api-keys.md
+++ b/deploy-manage/api-keys/serverless-project-api-keys.md
@@ -1,8 +1,10 @@
 ---
-applies_to:
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/api-keys.html
+applies_to:
+  serverless: ga
+products:
+  - id: cloud-serverless
 ---
 
 # Serverless project API keys [api-keys]
diff --git a/deploy-manage/autoscaling.md b/deploy-manage/autoscaling.md
index f8afe60c2..e679cc175 100644
--- a/deploy-manage/autoscaling.md
+++ b/deploy-manage/autoscaling.md
@@ -7,6 +7,8 @@ applies_to:
     ess: ga
     eck: ga
   serverless: all
+products:
+  - id: elasticsearch
 ---
 
 # Autoscaling
diff --git a/deploy-manage/autoscaling/autoscaling-deciders.md b/deploy-manage/autoscaling/autoscaling-deciders.md
index 7da7eff9f..920898cd9 100644
--- a/deploy-manage/autoscaling/autoscaling-deciders.md
+++ b/deploy-manage/autoscaling/autoscaling-deciders.md
@@ -9,9 +9,12 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-machine-learning-decider.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-fixed-decider.html
 applies_to:
-  ece:
-  eck:
-  ess:
+  deployment:
+    ece:
+    eck:
+    ess:
+products:
+  - id: elasticsearch
 ---
 
 # Autoscaling deciders [autoscaling-deciders]
diff --git a/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md b/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
index a67e83986..836bafa8e 100644
--- a/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+++ b/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: In ECE and ECH
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-autoscaling.html
   - https://www.elastic.co/guide/en/cloud/current/ec-autoscaling.html
@@ -12,7 +13,9 @@ applies_to:
   deployment:
     ece: ga
     ess: ga
-navigation_title: "In ECE and ECH"
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Autoscaling in {{ece}} and {{ech}}
diff --git a/deploy-manage/autoscaling/autoscaling-in-eck.md b/deploy-manage/autoscaling/autoscaling-in-eck.md
index 4fc6c577a..24dac0d07 100644
--- a/deploy-manage/autoscaling/autoscaling-in-eck.md
+++ b/deploy-manage/autoscaling/autoscaling-in-eck.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: In ECK
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autoscaling.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stateless-autoscaling.html
 applies_to:
   deployment:
     eck: ga
-navigation_title: "In ECK"
+products:
+  - id: cloud-kubernetes
 ---
 # Autoscaling in {{eck}}
 
diff --git a/deploy-manage/autoscaling/trained-model-autoscaling.md b/deploy-manage/autoscaling/trained-model-autoscaling.md
index 987a38024..c88df2f84 100644
--- a/deploy-manage/autoscaling/trained-model-autoscaling.md
+++ b/deploy-manage/autoscaling/trained-model-autoscaling.md
@@ -8,6 +8,9 @@ applies_to:
     eck:
     ece:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: machine-learning
 ---
 
 # Trained model autoscaling
diff --git a/deploy-manage/cloud-organization.md b/deploy-manage/cloud-organization.md
index b022b7717..419ce9fea 100644
--- a/deploy-manage/cloud-organization.md
+++ b/deploy-manage/cloud-organization.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Manage your Cloud organization [ec-organizations]
diff --git a/deploy-manage/cloud-organization/billing.md b/deploy-manage/cloud-organization/billing.md
index 64d527693..3f0f52966 100644
--- a/deploy-manage/cloud-organization/billing.md
+++ b/deploy-manage/cloud-organization/billing.md
@@ -7,6 +7,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Billing
diff --git a/deploy-manage/cloud-organization/billing/add-billing-details.md b/deploy-manage/cloud-organization/billing/add-billing-details.md
index c927164f7..c81d9bae9 100644
--- a/deploy-manage/cloud-organization/billing/add-billing-details.md
+++ b/deploy-manage/cloud-organization/billing/add-billing-details.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Add your billing details [ec-billing-details]
diff --git a/deploy-manage/cloud-organization/billing/billing-faq.md b/deploy-manage/cloud-organization/billing/billing-faq.md
index 7c994be6f..5cc6c862b 100644
--- a/deploy-manage/cloud-organization/billing/billing-faq.md
+++ b/deploy-manage/cloud-organization/billing/billing-faq.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Billing FAQ [ec-faq-billing]
diff --git a/deploy-manage/cloud-organization/billing/billing-models.md b/deploy-manage/cloud-organization/billing/billing-models.md
index 6802ba52c..00a5245f1 100644
--- a/deploy-manage/cloud-organization/billing/billing-models.md
+++ b/deploy-manage/cloud-organization/billing/billing-models.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Billing models [ec-billing-models]
diff --git a/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md b/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
index 4af03c8e2..8af1f502b 100644
--- a/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
+++ b/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Hosted billing dimensions"
+navigation_title: Hosted billing dimensions
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-billing-dimensions.html
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Cloud Hosted deployment billing dimensions [ec-billing-dimensions]
diff --git a/deploy-manage/cloud-organization/billing/ecu.md b/deploy-manage/cloud-organization/billing/ecu.md
index 592e69261..e4048682f 100644
--- a/deploy-manage/cloud-organization/billing/ecu.md
+++ b/deploy-manage/cloud-organization/billing/ecu.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Elastic Consumption Units [ec-billing-ecu]
diff --git a/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md b/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
index e286dd918..1d697a6fa 100644
--- a/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
+++ b/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Elastic for Observability"
+navigation_title: Elastic for Observability
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-billing.html
 applies_to:
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Elastic for Observability billing dimensions [observability-billing]
diff --git a/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md b/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
index 5ff5af0d6..eb55a9d64 100644
--- a/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
+++ b/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Elasticsearch"
+navigation_title: Elasticsearch
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-billing.html
 applies_to:
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # {{es}} billing dimensions [elasticsearch-billing]
diff --git a/deploy-manage/cloud-organization/billing/manage-subscription.md b/deploy-manage/cloud-organization/billing/manage-subscription.md
index 581fb8ad6..3dc1fb2d1 100644
--- a/deploy-manage/cloud-organization/billing/manage-subscription.md
+++ b/deploy-manage/cloud-organization/billing/manage-subscription.md
@@ -9,6 +9,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-serverless
+  - id: cloud-hosted
 ---
 
 # Manage your subscription
diff --git a/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md b/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
index 345bbe4ba..e8db7517c 100644
--- a/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
+++ b/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Monitor and analyze usage
diff --git a/deploy-manage/cloud-organization/billing/security-billing-dimensions.md b/deploy-manage/cloud-organization/billing/security-billing-dimensions.md
index 944311cbd..53fb4c48b 100644
--- a/deploy-manage/cloud-organization/billing/security-billing-dimensions.md
+++ b/deploy-manage/cloud-organization/billing/security-billing-dimensions.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Elastic for Security"
+navigation_title: Elastic for Security
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/security-billing.html
 applies_to:
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Elastic for Security billing dimensions [security-billing]
diff --git a/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md b/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
index 89a9538a1..c34defd01 100644
--- a/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
+++ b/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Serverless billing dimensions"
+navigation_title: Serverless billing dimensions
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/general-serverless-billing.html
 applies_to:
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Serverless project billing dimensions [general-serverless-billing]
diff --git a/deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md b/deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
index aaf2ef468..abc4e94f3 100644
--- a/deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
+++ b/deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Update billing and operational contacts [ec-billing-contacts]
diff --git a/deploy-manage/cloud-organization/billing/view-billing-history.md b/deploy-manage/cloud-organization/billing/view-billing-history.md
index 91c347ea6..baaef3914 100644
--- a/deploy-manage/cloud-organization/billing/view-billing-history.md
+++ b/deploy-manage/cloud-organization/billing/view-billing-history.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # View your billing history [ec-billing-history]
diff --git a/deploy-manage/cloud-organization/operational-emails.md b/deploy-manage/cloud-organization/operational-emails.md
index 41108158a..c52729854 100644
--- a/deploy-manage/cloud-organization/operational-emails.md
+++ b/deploy-manage/cloud-organization/operational-emails.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Operational emails [ec-operational-emails]
diff --git a/deploy-manage/cloud-organization/service-status.md b/deploy-manage/cloud-organization/service-status.md
index 27b78dbdd..6884cc327 100644
--- a/deploy-manage/cloud-organization/service-status.md
+++ b/deploy-manage/cloud-organization/service-status.md
@@ -11,6 +11,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Service status
diff --git a/deploy-manage/cloud-organization/tools-and-apis.md b/deploy-manage/cloud-organization/tools-and-apis.md
index f6185f055..15760fcce 100644
--- a/deploy-manage/cloud-organization/tools-and-apis.md
+++ b/deploy-manage/cloud-organization/tools-and-apis.md
@@ -1,12 +1,14 @@
 ---
+navigation_title: Tools and APIs
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-work-with-apis.html
-navigation_title: Tools and APIs
+products:
+  - id: cloud-hosted
 ---
 
 # Tools and APIs for your Cloud organization [ec-work-with-apis]
 
-You can use the [{{ecloud}} API](https://www.elastic.co/docs/api/doc/cloud/) to manage your {{ecloud}} organization, members, costs, billing, and more. 
+You can use the [{{ecloud}} API](https://www.elastic.co/docs/api/doc/cloud/) to manage your {{ecloud}} organization, members, costs, billing, and more.
 
 * Refer to [](/deploy-manage/api-keys/elastic-cloud-api-keys.md) to learn how to generate an API key to access this API.
 * Refer to [{{ecloud}} RESTful API](cloud://reference/cloud-hosted/ec-api-restful.md) for usage information and examples.
diff --git a/deploy-manage/deploy.md b/deploy-manage/deploy.md
index 1b587ba83..8359e7da1 100644
--- a/deploy-manage/deploy.md
+++ b/deploy-manage/deploy.md
@@ -3,6 +3,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/intro.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro-deploy.html
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/get-elastic.html
+products:
+  - id: cloud-serverless
+  - id: elasticsearch
+  - id: elastic-stack
 ---
 
 # Deploy
diff --git a/deploy-manage/deploy/cloud-enterprise.md b/deploy-manage/deploy/cloud-enterprise.md
index 2793ca03f..205363248 100644
--- a/deploy-manage/deploy/cloud-enterprise.md
+++ b/deploy-manage/deploy/cloud-enterprise.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/index.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/Elastic-Cloud-Enterprise-overview.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # {{ece}} [Elastic-Cloud-Enterprise-overview]
diff --git a/deploy-manage/deploy/cloud-enterprise/access-kibana.md b/deploy-manage/deploy/cloud-enterprise/access-kibana.md
index ca32356e4..7cec44cb9 100644
--- a/deploy-manage/deploy/cloud-enterprise/access-kibana.md
+++ b/deploy-manage/deploy/cloud-enterprise/access-kibana.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-access-kibana.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-kibana.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Access {{kib}} [ece-access-kibana]
diff --git a/deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md b/deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
index edc988f5f..d3fc96ee0 100644
--- a/deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
+++ b/deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Add custom bundles and plugins
 mapped_pages:
-    - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-custom-bundle-plugin.html
-navigation_title: "Add custom bundles and plugins"
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-custom-bundle-plugin.html
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Add custom bundles and plugins to your deployment [ece-add-custom-bundle-plugin]
diff --git a/deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md b/deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
index 79c8c7c6e..ab164f1fe 100644
--- a/deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
+++ b/deploy-manage/deploy/cloud-enterprise/advanced-cluster-configuration.md
@@ -1,9 +1,8 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-advanced-configuration.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Advanced cluster configuration [ece-advanced-configuration]
diff --git a/deploy-manage/deploy/cloud-enterprise/air-gapped-install.md b/deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
index 2a4a01017..c54edf1a5 100644
--- a/deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
+++ b/deploy-manage/deploy/cloud-enterprise/air-gapped-install.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Air-gapped install [ece-install-offline]
diff --git a/deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md b/deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
index 49c4b7cf5..a90101dbe 100644
--- a/deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
+++ b/deploy-manage/deploy/cloud-enterprise/alternative-install-ece-with-ansible.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Ansible playbook
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-ansible.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-ansible.html
-navigation_title: Ansible playbook
+products:
+  - id: cloud-enterprise
 ---
 
 # Alternative: Install ECE with Ansible [ece-configure-ansible]
diff --git a/deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md b/deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
index b8db916ce..b1924de2a 100644
--- a/deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
+++ b/deploy-manage/deploy/cloud-enterprise/assign-roles-to-hosts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-roles.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-roles.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Assign roles to hosts [ece-change-roles]
diff --git a/deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md b/deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
index b2a5e7f93..2566230b9 100644
--- a/deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
+++ b/deploy-manage/deploy/cloud-enterprise/ce-add-support-for-node-roles-autoscaling.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Data tiers and autoscaling support
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ce-add-support-for-node-roles-and-autoscaling.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ce-add-support-for-node-roles-and-autoscaling.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Updating custom templates to support node_roles and autoscaling [ce-add-support-for-node-roles-and-autoscaling]
diff --git a/deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md b/deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
index 47fb379d7..3edba7d9d 100644
--- a/deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
+++ b/deploy-manage/deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-allocator-disconnect-timeout.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-allocator-disconnect-timeout.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Change allocator disconnect timeout [ece-change-allocator-disconnect-timeout]
diff --git a/deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md b/deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
index 240979f66..937d0d786 100644
--- a/deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
+++ b/deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-config-api-base-url.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-config-api-base-url.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Change the ECE API URL [ece-config-api-base-url]
diff --git a/deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md b/deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
index 73cf0b363..836de86e2 100644
--- a/deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
+++ b/deploy-manage/deploy/cloud-enterprise/change-endpoint-urls.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-endpoints.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-endpoints.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Change endpoint URLs [ece-administering-endpoints]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md b/deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
index ba7f24762..8ba9067b8 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-allocator-affinity.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-allocator-affinity.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-allocator-affinity.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure allocator affinity [ece-configuring-allocator-affinity]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md b/deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md
index f66a48cc1..d8e9f289c 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-deployment-templates.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-templates.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-templates.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage deployment templates [ece-configuring-ece-templates]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-deployment.md b/deploy-manage/deploy/cloud-enterprise/configure-deployment.md
index ac2a02fc9..3ab41a0fe 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-deployment.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-deployment.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Configure
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-deployment.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-deployment.html
+products:
+  - id: cloud-enterprise
 ---
 
 % document scope: introduction to deployment configuration use cases
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md b/deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
index abed8ad67..ca3193028 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ece: all
+navigation_title: RHEL
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-rhel-centos-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-rhel-centos-onprem.html
-navigation_title: RHEL
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure a RHEL host [ece-configure-hosts-rhel-centos]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-host-suse.md b/deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
index eb2ab5b95..76cebbe80 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-host-suse.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ece: all
+navigation_title: SUSE
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-sles12-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-sles12-onprem.html
-navigation_title: SUSE
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure a SUSE host [ece-configure-hosts-sles12]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md b/deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
index a5f2acf51..845de7437 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ece: all
+navigation_title: Ubuntu
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-ubuntu-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-hosts-ubuntu-onprem.html
-navigation_title: Ubuntu
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure an Ubuntu host [ece-configure-hosts-ubuntu]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure-operating-system.md b/deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
index 55ed61ca0..6d5d4005a 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure-operating-system.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-os-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-os-onprem.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure your operating system [ece-configure-os]
diff --git a/deploy-manage/deploy/cloud-enterprise/configure.md b/deploy-manage/deploy/cloud-enterprise/configure.md
index 9c8866656..112494f9d 100644
--- a/deploy-manage/deploy/cloud-enterprise/configure.md
+++ b/deploy-manage/deploy/cloud-enterprise/configure.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-ece.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure ECE [ece-configuring-ece]
diff --git a/deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md b/deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md
index 795daa62b..b135f388e 100644
--- a/deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md
+++ b/deploy-manage/deploy/cloud-enterprise/connect-elasticsearch.md
@@ -1,11 +1,13 @@
 ---
 navigation_title: Connect to Elasticsearch
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-cloud-id.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-connect.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Connect to {{es}} [ece-connect]
diff --git a/deploy-manage/deploy/cloud-enterprise/create-deployment.md b/deploy-manage/deploy/cloud-enterprise/create-deployment.md
index d9ae750e2..554dbd2ea 100644
--- a/deploy-manage/deploy/cloud-enterprise/create-deployment.md
+++ b/deploy-manage/deploy/cloud-enterprise/create-deployment.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-create-deployment.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-create-deployment.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Create a deployment
diff --git a/deploy-manage/deploy/cloud-enterprise/customize-deployment.md b/deploy-manage/deploy/cloud-enterprise/customize-deployment.md
index 9be26ecc7..3f36a249e 100644
--- a/deploy-manage/deploy/cloud-enterprise/customize-deployment.md
+++ b/deploy-manage/deploy/cloud-enterprise/customize-deployment.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Customize deployment components
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-customize-deployment.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-customize-deployment.html
+products:
+  - id: cloud-enterprise
 ---
 
 % document scope: this document focuses on the Deployment -> Edit page, how ECE applies changes, and links to other configurable features
diff --git a/deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md b/deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
index f313bb5cb..cbe85b40c 100644
--- a/deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
+++ b/deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-system-deployment-versions.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-system-deployment-versions.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Default system deployment versions [ece-system-deployment-versions]
diff --git a/deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md b/deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
index a9cb06d72..9d4a4aeaf 100644
--- a/deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
+++ b/deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-large-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-large-onprem.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Deploy a large installation [ece-install-large]
diff --git a/deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md b/deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
index d38d3f6ec..8d34c0798 100644
--- a/deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
+++ b/deploy-manage/deploy/cloud-enterprise/deploy-medium-installation.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-medium-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-medium-onprem.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Deploy a medium installation [ece-install-medium]
diff --git a/deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md b/deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
index 6192a87d8..aa3f8dca5 100644
--- a/deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
+++ b/deploy-manage/deploy/cloud-enterprise/deploy-small-installation.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-small-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-small-onprem.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Deploy a small installation [ece-install-small]
diff --git a/deploy-manage/deploy/cloud-enterprise/deployment-templates.md b/deploy-manage/deploy/cloud-enterprise/deployment-templates.md
index 54b6536f0..75073bdcd 100644
--- a/deploy-manage/deploy/cloud-enterprise/deployment-templates.md
+++ b/deploy-manage/deploy/cloud-enterprise/deployment-templates.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deployment-templates.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deployment-templates.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Deployment templates [ece-deployment-templates]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-architecture.md b/deploy-manage/deploy/cloud-enterprise/ece-architecture.md
index 82c9d7915..d3869e01b 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-architecture.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-architecture.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-architecture.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-containerization.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Service-oriented architecture [ece-architecture]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md b/deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
index 0375fb3e2..f6383e173 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-ce-add-support-for-integrations-server.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Integrations server support
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-ce-add-support-for-integrations-server.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-ce-add-support-for-integrations-server.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Updating custom templates to support Integrations Server [ece-ce-add-support-for-integrations-server]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md b/deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
index 6cfd2dabb..94cef1f1d 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Configure index management
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-templates-index-management.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-templates-index-management.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure index management for deployment templates [ece-configure-templates-index-management]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
index 1c244f7a8..56416aa1a 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-configure-system-templates.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Configure default templates
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-configure-system-templates.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-configure-system-templates.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure default system deployment templates [ece-configuring-ece-configure-system-templates]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
index b05662eff..f605af60c 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Create templates
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-create-templates.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-create-templates.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Create deployment templates [ece-configuring-ece-create-templates]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
index 30a92ee5f..1b8e26f00 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-create.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-create.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-create.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Create instance configurations [ece-configuring-ece-instance-configurations-create]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
index c8ecec298..969d072ce 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-default.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-default.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-default.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Default instance configurations [ece-configuring-ece-instance-configurations-default]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
index 1421f8d8f..8ce215969 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-instance-configurations-edit.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-edit.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-instance-configurations-edit.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Edit instance configurations [ece-configuring-ece-instance-configurations-edit]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
index d3c358531..f39088521 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-tag-allocators.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-tag-allocators.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-ece-tag-allocators.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Tag your allocators [ece-configuring-ece-tag-allocators]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-ha.md b/deploy-manage/deploy/cloud-enterprise/ece-ha.md
index fadbdf853..ba5b7c3cb 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-ha.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-ha.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: High availability
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-ha.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-ha.html
+products:
+  - id: cloud-enterprise
 ---
 
 # High availability in ECE
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md b/deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
index 911f34165..bb1d72775 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-hardware-prereq.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-hardware-prereq.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-hardware-prereq.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Hardware prerequisites [ece-hardware-prereq]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md b/deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
index 557b420ed..cc799f0ad 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-include-additional-kibana-plugin.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Include additional {{kib}} plugins
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-include-additional-kibana-plugin.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-include-additional-kibana-plugin.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Include additional {{kib}} plugins [ece-include-additional-kibana-plugin]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
index 16e52fe8b..7b3c9519e 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-images.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-images.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Available Docker images [ece-install-offline-images]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
index f199ac253..095c4c3e9 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Without a private Docker registry
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-no-registry.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-no-registry.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Air-gapped install without a private Docker registry [ece-install-offline-no-registry]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
index a244e8cc0..8d0bd1fdc 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-install-offline-with-registry.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: With your private Docker registry
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-with-registry.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-offline-with-registry.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Air-gapped install with a private Docker registry [ece-install-offline-with-registry]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md b/deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
index ba9f320a2..2824d21da 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-integrations-server-api-example.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-integrations-server-api-example.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Enable Integrations Server through the API [ece-integrations-server-api-example]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-jvm.md b/deploy-manage/deploy/cloud-enterprise/ece-jvm.md
index 64ed541a1..b5535b3e2 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-jvm.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-jvm.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-jvm.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-jvm.html
+products:
+  - id: cloud-enterprise
 ---
 
 # JVM heap size [ece-jvm]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md b/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
index 9a1173ff2..f55a02fe0 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-load-balancers.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-load-balancers.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Load balancers [ece-load-balancers]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md b/deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
index 1c65c3d47..c2f3ad76f 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-capacity.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-capacity.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage your allocators capacity [ece-manage-capacity]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md b/deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
index 738631ef7..439a04a8a 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-networking-prereq.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-networking-prereq.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-networking-prereq.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Networking prerequisites [ece-networking-prereq]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md b/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
index d816875a7..850899c12 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-regional-deployment-aliases.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-regional-deployment-aliases.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Custom endpoint aliases [ece-regional-deployment-aliases]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-roles.md b/deploy-manage/deploy/cloud-enterprise/ece-roles.md
index 933125abf..640d10d54 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-roles.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-roles.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-roles.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-roles.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Separation of roles [ece-roles]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md b/deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
index a4055ebdd..227d9c8f7 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-software-prereq.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-software-prereq.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Software prerequisites [ece-software-prereq]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md b/deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
index 0a038ef58..b493c89c5 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-sysconfig.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-sysconfig.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-sysconfig.html
+products:
+  - id: cloud-enterprise
 ---
 
 # System configuration [ece-sysconfig]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md b/deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
index 1720725b2..3e5270c29 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-users-permissions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-users-permissions.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-users-permissions.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Users and permissions prerequisites [ece-users-permissions]
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md b/deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
index e9bdf506c..99469c2c6 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-wildcard-dns.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-wildcard-dns.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-wildcard-dns.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Wildcard DNS record [ece-wildcard-dns]
diff --git a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
index e4572e73b..5c99c63fb 100644
--- a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
+++ b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: APM user settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-settings.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-settings.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Add APM user settings [ece-manage-apm-settings]
diff --git a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
index 1a3ffd544..1669d9f7c 100644
--- a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
+++ b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-elasticsearch.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Elasticsearch user settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-user-settings.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-user-settings.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Add {{es}} user settings [ece-add-user-settings]
diff --git a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
index 16623c44f..1b58546dd 100644
--- a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
+++ b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-enterprise.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Enterprise search user settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-enterprise-search-settings.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-enterprise-search-settings.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Add Enterprise Search user settings [ece-manage-enterprise-search-settings]
diff --git a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
index 1e21fc77e..22695b831 100644
--- a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
+++ b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings-kibana.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Kibana user settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-kibana-settings.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-kibana-settings.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Add {{kib}} user settings [ece-manage-kibana-settings]
diff --git a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
index f6a92283e..5cd8ca2f6 100644
--- a/deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
+++ b/deploy-manage/deploy/cloud-enterprise/edit-stack-settings.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Edit stack settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/editing-user-settings.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/editing-user-settings.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Edit stack user settings [editing-user-settings]
diff --git a/deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md b/deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
index 1e518c459..c6c633a7c 100644
--- a/deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
+++ b/deploy-manage/deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-deployment-aliases.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-deployment-aliases.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Enable custom endpoint aliases [ece-configuring-deployment-aliases]
diff --git a/deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md b/deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
index 078f587b6..b8c83a3e7 100644
--- a/deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
+++ b/deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ece: all
+navigation_title: Deploy using Podman
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-using-podman-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-using-podman-onprem.html
-navigation_title: Deploy using Podman
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Fresh installation of ECE using Podman hosts [ece-install-using-podman]
diff --git a/deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md b/deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
index f9da468b5..190d79d0d 100644
--- a/deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
+++ b/deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-generate-roles-token.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-revoke-roles-token.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage roles tokens
diff --git a/deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md b/deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
index e76d1f341..0418afa0a 100644
--- a/deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
+++ b/deploy-manage/deploy/cloud-enterprise/identify-deployment-scenario.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deploy-scenario.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deploy-scenario.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Identify the deployment scenario [ece-deploy-scenario]
diff --git a/deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md b/deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
index ec34cff2e..8e541d03f 100644
--- a/deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
+++ b/deploy-manage/deploy/cloud-enterprise/install-ece-on-additional-hosts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-installing-additional.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-installing-additional.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Install ECE on additional hosts [ece-installing-additional]
diff --git a/deploy-manage/deploy/cloud-enterprise/install.md b/deploy-manage/deploy/cloud-enterprise/install.md
index db3140810..d102e0027 100644
--- a/deploy-manage/deploy/cloud-enterprise/install.md
+++ b/deploy-manage/deploy/cloud-enterprise/install.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  deployment:
-    ece: all
+navigation_title: Install ECE
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-installing.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-public.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-your-infra.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-cloud.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-install-onprem.html
-navigation_title: Install ECE
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Install {{ece}} [ece-installing]
diff --git a/deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md b/deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
index c1373f315..28e3f46d2 100644
--- a/deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
+++ b/deploy-manage/deploy/cloud-enterprise/keep-track-of-deployment-activity.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-activity-page.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-activity-page.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Keep track of deployment activity [ece-activity-page]
diff --git a/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md b/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md
index cfa549fd8..72147a046 100644
--- a/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md
+++ b/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-login.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-login.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Log into the Cloud UI [ece-login]
diff --git a/deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md b/deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
index 2ff81dce3..05adfc628 100644
--- a/deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
+++ b/deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-elastic-stack.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-elastic-stack.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage {{stack}} versions [ece-manage-elastic-stack]
diff --git a/deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md b/deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
index 3687c14df..e296bcb73 100644
--- a/deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
+++ b/deploy-manage/deploy/cloud-enterprise/manage-integrations-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-integrations-server.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-integrations-server.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage your Integrations Server [ece-manage-integrations-server]
diff --git a/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md b/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
index ad0680c3e..54b9e0e5a 100644
--- a/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
+++ b/deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-to-podman.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-to-podman.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Migrate ECE to Podman hosts [ece-migrate-to-podman]
diff --git a/deploy-manage/deploy/cloud-enterprise/post-installation-steps.md b/deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
index 0809cec1a..19764cbb0 100644
--- a/deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
+++ b/deploy-manage/deploy/cloud-enterprise/post-installation-steps.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-post-installation.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-post-installation.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Post-installation steps [ece-getting-started-post-installation]
diff --git a/deploy-manage/deploy/cloud-enterprise/prepare-environment.md b/deploy-manage/deploy/cloud-enterprise/prepare-environment.md
index 4bb2c067f..30759072d 100644
--- a/deploy-manage/deploy/cloud-enterprise/prepare-environment.md
+++ b/deploy-manage/deploy/cloud-enterprise/prepare-environment.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-prereqs.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-prereqs.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Prepare your environment [ece-prereqs]
diff --git a/deploy-manage/deploy/cloud-enterprise/resize-deployment.md b/deploy-manage/deploy/cloud-enterprise/resize-deployment.md
index 52e6cd8d3..6c928d0e9 100644
--- a/deploy-manage/deploy/cloud-enterprise/resize-deployment.md
+++ b/deploy-manage/deploy/cloud-enterprise/resize-deployment.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-resize-deployment.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-resize-deployment.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Resize deployment [ece-resize-deployment]
diff --git a/deploy-manage/deploy/cloud-enterprise/resource-overrides.md b/deploy-manage/deploy/cloud-enterprise/resource-overrides.md
index 057dd08b4..c9298075c 100644
--- a/deploy-manage/deploy/cloud-enterprise/resource-overrides.md
+++ b/deploy-manage/deploy/cloud-enterprise/resource-overrides.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-resource-overrides.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-resource-overrides.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Resource overrides [ece-resource-overrides]
diff --git a/deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md b/deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
index 8e54a65ee..3886bb024 100644
--- a/deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
+++ b/deploy-manage/deploy/cloud-enterprise/search-filter-deployments.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-find.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-find.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Search and filter deployments [ece-find]
diff --git a/deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md b/deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
index c24ae957f..015595d6d 100644
--- a/deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
+++ b/deploy-manage/deploy/cloud-enterprise/statistics-collected-by-cloud-enterprise.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-phone-home.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-phone-home.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Statistics collected by {{ece}} [ece-phone-home]
diff --git a/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md b/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
index 5dd77457f..ae7162b36 100644
--- a/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
+++ b/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-integrations-server-apm-switch.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-integrations-server-apm-switch.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Switch from APM to Integrations Server payload [ece-integrations-server-apm-switch]
diff --git a/deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md b/deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md
index 6361efc7b..50c6fc82f 100644
--- a/deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md
+++ b/deploy-manage/deploy/cloud-enterprise/system-deployments-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-system-clusters-configuration.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-system-clusters-configuration.html
+products:
+  - id: cloud-enterprise
 ---
 
 # System deployments configuration [ece-system-clusters-configuration]
diff --git a/deploy-manage/deploy/cloud-enterprise/tools-apis.md b/deploy-manage/deploy/cloud-enterprise/tools-apis.md
index b218a8055..50e64a76f 100644
--- a/deploy-manage/deploy/cloud-enterprise/tools-apis.md
+++ b/deploy-manage/deploy/cloud-enterprise/tools-apis.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Tools and APIs
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-api-console.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-api-console.html
-navigation_title: "Tools and APIs"
+products:
+  - id: cloud-enterprise
 ---
 # Tools and APIs for {{ece}}
 
diff --git a/deploy-manage/deploy/cloud-enterprise/working-with-deployments.md b/deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
index 6dbcd9171..36c61e593 100644
--- a/deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
+++ b/deploy-manage/deploy/cloud-enterprise/working-with-deployments.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ece: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-stack-getting-started.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-deployments.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-monitoring-deployments.html
+applies_to:
+  deployment:
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 % document scope: This doc focuses on everything that can be achieved from the deployment UI
diff --git a/deploy-manage/deploy/cloud-on-k8s.md b/deploy-manage/deploy/cloud-on-k8s.md
index 802556fd4..5b14687c1 100644
--- a/deploy-manage/deploy/cloud-on-k8s.md
+++ b/deploy-manage/deploy/cloud-on-k8s.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/index.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-overview.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-advanced-topics.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-supported.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_learn_more_about_eck.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{eck}} [k8s-overview]
diff --git a/deploy-manage/deploy/cloud-on-k8s/accessing-services.md b/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
index b27ecc12f..ff01de630 100644
--- a/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
+++ b/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-accessing-elastic-services.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-request-elasticsearch-endpoint.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-services.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Accessing services [k8s-accessing-elastic-services]
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
index 994ea4785..8ad7e854b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-advanced-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-advanced-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Advanced configuration [k8s-logstash-advanced-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
index ee8c01fcf..9e8cf703e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-advanced-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-advanced-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Advanced configuration [k8s-maps-advanced-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
index 846b9205c..08ce1a92f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-advanced-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-advanced-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Advanced configuration [k8s-apm-advanced-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md b/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
index f33e4630f..c94c54629 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-advanced-node-scheduling.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-advanced-node-scheduling.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Advanced {{es}} node scheduling [k8s-advanced-node-scheduling]
diff --git a/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md b/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
index 1ece3c00c..122b0ad6b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
+++ b/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
@@ -1,11 +1,13 @@
 ---
 navigation_title: Air-gapped environments
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/elastic-stack/current/air-gapped-install.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-air-gapped.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Running in air-gapped environments [k8s-air-gapped]
diff --git a/deploy-manage/deploy/cloud-on-k8s/apm-server.md b/deploy-manage/deploy/cloud-on-k8s/apm-server.md
index 1fc8758ba..74e23adcb 100644
--- a/deploy-manage/deploy/cloud-on-k8s/apm-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/apm-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-server.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-server.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # APM server [k8s-apm-server]
diff --git a/deploy-manage/deploy/cloud-on-k8s/beats.md b/deploy-manage/deploy/cloud-on-k8s/beats.md
index d6494cb83..bd0040eb2 100644
--- a/deploy-manage/deploy/cloud-on-k8s/beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Beats [k8s-beat]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md b/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
index 27b8c7f0e..9fbd8b794 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration [k8s-beat-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
index 36ce4f476..7a5dbd685 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-configuration-examples.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-configuration-examples.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration Examples [k8s-beat-configuration-examples]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
index 0be6417fe..311566427 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-configuration-examples.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-configuration-examples.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration Examples [k8s-elastic-agent-fleet-configuration-examples]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
index 7a1a0ce40..a1ab9caf4 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-configuration-examples.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-configuration-examples.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration examples [k8s-logstash-configuration-examples]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
index c667cef8b..d60c16bcb 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-examples-standalone.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-configuration-examples.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-configuration-examples.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration examples [k8s-elastic-agent-configuration-examples]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
index 93cb5402e..58d5ded5d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration [k8s-elastic-agent-fleet-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md b/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
index 4191441d8..9e5636e4c 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration [k8s-logstash-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md b/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
index d7e63d824..1a097ce77 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configuration [k8s-elastic-agent-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md b/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
index 49da27ea1..e1c0eb65d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-orchestrating-elastic-stack-applications.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-deployment.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configure deployments [k8s-orchestrating-elastic-stack-applications]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configure-eck.md b/deploy-manage/deploy/cloud-on-k8s/configure-eck.md
index ec6b3eb55..d052cfa38 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configure-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configure-eck.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Apply configuration settings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-operator-config.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-operator-config.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Apply ECK configuration settings [k8s-operator-config]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md b/deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
index 7eb9d74c7..92647504c 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configure-validating-webhook.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-webhook.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-webhook.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configure the validating webhook [k8s-webhook]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configure.md b/deploy-manage/deploy/cloud-on-k8s/configure.md
index a437766ad..b1387b9bf 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configure.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configure.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Configure
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-operating-eck.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-operating-eck.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Configure ECK [k8s-operating-eck]
diff --git a/deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md b/deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
index 78eaef562..808cb90f6 100644
--- a/deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-connecting.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-connecting.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Connect to the APM Server [k8s-apm-connecting]
diff --git a/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md b/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
index 8b2427e50..aa76c2bcd 100644
--- a/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
+++ b/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-connect-to-unmanaged-resources.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-connect-to-unmanaged-resources.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Connect to external Elastic resources [k8s-connect-to-unmanaged-resources]
diff --git a/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md b/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
index 8644ea33f..02a6b553a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
+++ b/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-custom-images.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-custom-images.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Create custom images [k8s-custom-images]
diff --git a/deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md b/deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
index e756e49d0..4dbdf3c6c 100644
--- a/deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
+++ b/deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-bundles-plugins.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-bundles-plugins.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Custom configuration files and plugins [k8s-bundles-plugins]
diff --git a/deploy-manage/deploy/cloud-on-k8s/customize-pods.md b/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
index bccc90d6f..f06621ce3 100644
--- a/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
+++ b/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-customize-pods.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-customize-pods.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Customize pods [k8s-customize-pods]
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md b/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
index f91d8a9e6..b4655483b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy an orchestrator [k8s-quickstart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
index 04ead2b45..7f365f98b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autopilot.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autopilot-setting-virtual-memory.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autopilot-deploy-the-operator.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autopilot-deploy-elasticsearch.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-autopilot-deploy-agent-beats.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy ECK on GKE Autopilot [k8s-autopilot]
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
index 08f4cf8bf..966a0cb8e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-openshift.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy ECK on Openshift [k8s-openshift]
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md b/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
index 3c0ec28c3..cda31214a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-es.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-es.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy Elastic Maps Server [k8s-maps-es]
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md b/deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
index 18f7c26f5..cb433a6fe 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-fips-compatible-version-of-eck.md
@@ -1,11 +1,13 @@
 ---
 navigation_title: FIPS compatibility
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-fips.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_installation.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy a FIPS compatible version of ECK [k8s-fips]
diff --git a/deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md b/deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
index 610cd1e5b..f1fb750a3 100644
--- a/deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/elastic-maps-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Elastic Maps Server [k8s-maps]
diff --git a/deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md b/deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
index 132a8bd80..ed3823646 100644
--- a/deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
+++ b/deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-config-policy.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-config-policy.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{stack}} configuration policies [k8s-stack-config-policy]
diff --git a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
index 9d2652cd3..c09248b9e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elasticsearch-specification.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elasticsearch-specification.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{es}} configuration [k8s-elasticsearch-specification]
diff --git a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
index ddfb0662f..780f6dc74 100644
--- a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Deploy an {{es}} cluster
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-deploy-elasticsearch.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-deploy-elasticsearch.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy an {{es}} cluster [k8s-deploy-elasticsearch]
diff --git a/deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md b/deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
index 445bbe1af..26326ae05 100644
--- a/deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
+++ b/deploy-manage/deploy/cloud-on-k8s/fleet-managed-elastic-agent.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Fleet-managed Elastic Agent [k8s-elastic-agent-fleet]
diff --git a/deploy-manage/deploy/cloud-on-k8s/http-configuration.md b/deploy-manage/deploy/cloud-on-k8s/http-configuration.md
index d8c9da3c2..402cf27e5 100644
--- a/deploy-manage/deploy/cloud-on-k8s/http-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/http-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-http-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-http-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Elastic Maps HTTP configuration [k8s-maps-http-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md b/deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
index 6a215db12..23993e393 100644
--- a/deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
+++ b/deploy-manage/deploy/cloud-on-k8s/init-containers-for-plugin-downloads.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-init-containers-plugin-downloads.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-init-containers-plugin-downloads.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Init containers for plugin downloads [k8s-init-containers-plugin-downloads]
diff --git a/deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md b/deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
index 2eaef41f0..948a3f03a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Install using a Helm chart [k8s-install-helm]
diff --git a/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
index 3686aa33a..321b21888 100644
--- a/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
@@ -6,6 +6,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Install ECK using the YAML manifests [k8s-install-yaml-manifests]
diff --git a/deploy-manage/deploy/cloud-on-k8s/install.md b/deploy-manage/deploy/cloud-on-k8s/install.md
index 487be51ea..6bae07ab7 100644
--- a/deploy-manage/deploy/cloud-on-k8s/install.md
+++ b/deploy-manage/deploy/cloud-on-k8s/install.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Install
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-installing-eck.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-installing-eck.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Install ECK [k8s-installing-eck]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
index 3e6e26c26..e7aa9f618 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-advanced-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-advanced-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Advanced configuration [k8s-kibana-advanced-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
index 05053e683..9d28b4b7f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-es.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-es.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Connect to an {{es}} cluster [k8s-kibana-es]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
index e8cfb7763..0dcbdf596 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-plugins.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-plugins.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Install {{kib}} plugins [k8s-kibana-plugins]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
index 171b4f849..e476484fe 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-agent.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-agent.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Grant host access permission to Elastic Agent [k8s-openshift-agent]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
index 8b3b92dc2..c091a961b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-anyuid-workaround.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-anyuid-workaround.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy Docker images with anyuid SCC [k8s-openshift-anyuid-workaround]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
index 2392ef860..5f513e639 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-beats.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-beats.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Grant privileged permissions to Beats [k8s-openshift-beats]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
index 256bee246..23d000a28 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-elasticsearch.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-elasticsearch.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy an {{es}} instance with a route [k8s-openshift-deploy-elasticsearch]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
index 5b96e6be6..5c2620c1c 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-kibana.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-kibana.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy a {{kib}} instance with a route [k8s-openshift-deploy-kibana]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
index f2000e252..164e2163c 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-operator.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-the-operator.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-openshift-deploy-the-operator.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy the operator [k8s-openshift-deploy-the-operator]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
index 1f4289baa..86c43ea1e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-mesh-istio.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-mesh-istio.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Istio [k8s-service-mesh-istio]
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
index 473baa79e..56b0f1f71 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-mesh-linkerd.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-mesh-linkerd.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Linkerd [k8s-service-mesh-linkerd]
diff --git a/deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md b/deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
index aaf4acae9..0731d8d13 100644
--- a/deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/kibana-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{kib}} configuration [k8s-kibana]
diff --git a/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
index ea0d7ab38..e07289444 100644
--- a/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Deploy a {{kib}} instance
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-deploy-kibana.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-deploy-kibana.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Deploy a {{kib}} instance [k8s-deploy-kibana]
diff --git a/deploy-manage/deploy/cloud-on-k8s/known-limitations.md b/deploy-manage/deploy/cloud-on-k8s/known-limitations.md
index db927f1c5..15ebb10db 100644
--- a/deploy-manage/deploy/cloud-on-k8s/known-limitations.md
+++ b/deploy-manage/deploy/cloud-on-k8s/known-limitations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-known-limitations.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-known-limitations.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Known limitations [k8s-elastic-agent-fleet-known-limitations]
diff --git a/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md b/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
index 5bae5daba..52afcd198 100644
--- a/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
+++ b/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-plugins.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-plugins.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Logstash plugins [k8s-logstash-plugins]
diff --git a/deploy-manage/deploy/cloud-on-k8s/logstash.md b/deploy-manage/deploy/cloud-on-k8s/logstash.md
index bfd6d052c..d9a068acf 100644
--- a/deploy-manage/deploy/cloud-on-k8s/logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Logstash [k8s-logstash]
diff --git a/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md b/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
index bf460c5e8..d8905dc40 100644
--- a/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
+++ b/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-managing-compute-resources.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-managing-compute-resources.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage compute resources [k8s-managing-compute-resources]
diff --git a/deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md b/deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
index c12989f76..a99e4f50d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Elastic Stack Helm chart
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-helm-chart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-helm-chart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{stack}} Helm chart [k8s-stack-helm-chart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/map-data.md b/deploy-manage/deploy/cloud-on-k8s/map-data.md
index e3f9bfc3b..ad715a0ad 100644
--- a/deploy-manage/deploy/cloud-on-k8s/map-data.md
+++ b/deploy-manage/deploy/cloud-on-k8s/map-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-data.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-maps-data.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Map data [k8s-maps-data]
diff --git a/deploy-manage/deploy/cloud-on-k8s/node-configuration.md b/deploy-manage/deploy/cloud-on-k8s/node-configuration.md
index 4a4676c01..adcf0a0ff 100644
--- a/deploy-manage/deploy/cloud-on-k8s/node-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/node-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-node-configuration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-node-configuration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Node configuration [k8s-node-configuration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md b/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
index 1f0e3c7cd..9d0661f54 100644
--- a/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-orchestration.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-orchestration.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Nodes orchestration [k8s-orchestration]
diff --git a/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md b/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
index 3c536f630..9ad648c6f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
+++ b/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-pod-disruption-budget.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-pod-disruption-budget.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Pod disruption budget [k8s-pod-disruption-budget]
diff --git a/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md b/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
index 8195f0814..98a2b6fa0 100644
--- a/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
+++ b/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-prestop.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-prestop.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Pod PreStop hook [k8s-prestop]
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
index 402a21840..4ba79a046 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-quickstart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-quickstart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Quickstart [k8s-beat-quickstart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
index da1389251..ab56b1790 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-quickstart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-fleet-quickstart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Quickstart [k8s-elastic-agent-fleet-quickstart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
index 9158076d8..55f88ec2f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-quickstart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-quickstart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Quickstart [k8s-logstash-quickstart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
index 7c86a83df..a4b290a3a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-quickstart.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent-quickstart.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Quickstart [k8s-elastic-agent-quickstart]
diff --git a/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md b/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
index f044e0ccf..0a6cecd70 100644
--- a/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
+++ b/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-readiness.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-readiness.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Readiness probe [k8s-readiness]
diff --git a/deploy-manage/deploy/cloud-on-k8s/recipes.md b/deploy-manage/deploy/cloud-on-k8s/recipes.md
index 2b9225bc4..aee20ca96 100644
--- a/deploy-manage/deploy/cloud-on-k8s/recipes.md
+++ b/deploy-manage/deploy/cloud-on-k8s/recipes.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-recipes.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-recipes.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Recipes [k8s-recipes]
diff --git a/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md b/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
index f7940dd90..065a272dd 100644
--- a/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
+++ b/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-traffic-splitting.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-traffic-splitting.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Requests routing to {{es}} nodes [k8s-traffic-splitting]
diff --git a/deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md b/deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md
index d73906709..9db763d79 100644
--- a/deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md
+++ b/deploy-manage/deploy/cloud-on-k8s/required-rbac-permissions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-eck-permissions.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-eck-permissions.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Required RBAC permissions [k8s-eck-permissions]
diff --git a/deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md b/deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
index fac827b65..f4a932ca9 100644
--- a/deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
+++ b/deploy-manage/deploy/cloud-on-k8s/restrict-cross-namespace-resource-associations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-restrict-cross-namespace-associations.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-restrict-cross-namespace-associations.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Restrict cross-namespace resource associations [k8s-restrict-cross-namespace-associations]
diff --git a/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md b/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
index 324eccf1d..5827bc166 100644
--- a/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
+++ b/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-securing-api.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-securing-api.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Securing Logstash API [k8s-logstash-securing-api]
diff --git a/deploy-manage/deploy/cloud-on-k8s/security-context.md b/deploy-manage/deploy/cloud-on-k8s/security-context.md
index 311d7ee88..2e37d0160 100644
--- a/deploy-manage/deploy/cloud-on-k8s/security-context.md
+++ b/deploy-manage/deploy/cloud-on-k8s/security-context.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-security-context.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-security-context.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Security context [k8s-security-context]
diff --git a/deploy-manage/deploy/cloud-on-k8s/service-meshes.md b/deploy-manage/deploy/cloud-on-k8s/service-meshes.md
index 2f1ed9c83..c533866d6 100644
--- a/deploy-manage/deploy/cloud-on-k8s/service-meshes.md
+++ b/deploy-manage/deploy/cloud-on-k8s/service-meshes.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-meshes.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-service-meshes.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Service meshes [k8s-service-meshes]
diff --git a/deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md b/deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
index b018e255f..a53b1b774 100644
--- a/deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/settings-managed-by-eck.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-reserved-settings.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-reserved-settings.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Settings managed by ECK [k8s-reserved-settings]
diff --git a/deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md b/deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
index 35d9ae375..45bd083f7 100644
--- a/deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
+++ b/deploy-manage/deploy/cloud-on-k8s/standalone-elastic-agent.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-elastic-agent.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Standalone Elastic Agent [k8s-elastic-agent]
diff --git a/deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md b/deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
index d0f35a5c9..e5dfdeb1e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
+++ b/deploy-manage/deploy/cloud-on-k8s/storage-recommendations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-storage-recommendations.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-storage-recommendations.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Storage recommendations [k8s-storage-recommendations]
diff --git a/deploy-manage/deploy/cloud-on-k8s/tools-apis.md b/deploy-manage/deploy/cloud-on-k8s/tools-apis.md
index e9ae578ed..14b59d714 100644
--- a/deploy-manage/deploy/cloud-on-k8s/tools-apis.md
+++ b/deploy-manage/deploy/cloud-on-k8s/tools-apis.md
@@ -2,7 +2,7 @@
 applies_to:
   deployment:
     eck: all
-navigation_title: "Tools and APIs"
+navigation_title: Tools and APIs
 ---
 
 # Tools and APIs for {{eck}}
diff --git a/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md b/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
index 3a03ee11c..c422f5003 100644
--- a/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-troubleshooting.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-beat-troubleshooting.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Troubleshooting [k8s-beat-troubleshooting]
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-deployments.md b/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
index c837ae56f..ae8872ae1 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Applying updates
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-deployment.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-deployment.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Update your deployments [k8s-update-deployment]
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md b/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
index 72ce5855b..673211db1 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-update-strategy.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-logstash-update-strategy.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Update Strategy [k8s-logstash-update-strategy]
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-strategy.md b/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
index 8beff65af..f84e82b8a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-strategy.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-update-strategy.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Update strategy [k8s-update-strategy]
diff --git a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
index 2bbc52780..653b76374 100644
--- a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-eck-managed-es.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-apm-eck-managed-es.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Use an {{es}} cluster managed by ECK [k8s-apm-eck-managed-es]
diff --git a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
index 3a0ae3350..bc11b0c4d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
+++ b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-virtual-memory.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-virtual-memory.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Virtual memory [k8s-virtual-memory]
diff --git a/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md b/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
index 77a458436..7a35a6871 100644
--- a/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
+++ b/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-volume-claim-templates.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-volume-claim-templates.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Volume claim templates [k8s-volume-claim-templates]
diff --git a/deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md b/deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
index 6f9fd8efa..5f4076904 100644
--- a/deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
+++ b/deploy-manage/deploy/cloud-on-k8s/webhook-namespace-selectors.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-webhook-namespace-selectors.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-webhook-namespace-selectors.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Webhook namespace selectors [k8s-webhook-namespace-selectors]
diff --git a/deploy-manage/deploy/elastic-cloud.md b/deploy-manage/deploy/elastic-cloud.md
index d1d3d4321..f1b4f217d 100644
--- a/deploy-manage/deploy/elastic-cloud.md
+++ b/deploy-manage/deploy/elastic-cloud.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/intro.html
 applies_to:
   serverless: ga
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/intro.html
+products:
+  - id: cloud-serverless
 ---
 
 # {{ecloud}} [intro]
diff --git a/deploy-manage/deploy/elastic-cloud/access-kibana.md b/deploy-manage/deploy/elastic-cloud/access-kibana.md
index a1033202e..a0844b626 100644
--- a/deploy-manage/deploy/elastic-cloud/access-kibana.md
+++ b/deploy-manage/deploy/elastic-cloud/access-kibana.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-access-kibana.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-access-kibana.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-enable-kibana2.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Access {{kib}} [ec-access-kibana]
diff --git a/deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md b/deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
index 03f81ba8c..ea19c6c56 100644
--- a/deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
+++ b/deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md
@@ -6,6 +6,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Add plugins and extensions [ec-adding-plugins]
diff --git a/deploy-manage/deploy/elastic-cloud/available-stack-versions.md b/deploy-manage/deploy/elastic-cloud/available-stack-versions.md
index 28d7e4860..1fac71168 100644
--- a/deploy-manage/deploy/elastic-cloud/available-stack-versions.md
+++ b/deploy-manage/deploy/elastic-cloud/available-stack-versions.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-version-policy.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-version-policy.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Available stack versions [ec-version-policy]
diff --git a/deploy-manage/deploy/elastic-cloud/aws-marketplace.md b/deploy-manage/deploy/elastic-cloud/aws-marketplace.md
index 0dd83f174..4330a8fa7 100644
--- a/deploy-manage/deploy/elastic-cloud/aws-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/aws-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-billing-aws.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-billing-aws.html
+products:
+  - id: cloud-hosted
 ---
 
 # AWS Marketplace [ec-billing-aws]
diff --git a/deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md b/deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
index 2ef40bf96..a6c5cf614 100644
--- a/deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
+++ b/deploy-manage/deploy/elastic-cloud/azure-marketplace-pricing.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-azure-marketplace-pricing.html
 applies_to:
   deployment:
     ess: ga
   serverless: preview
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-azure-marketplace-pricing.html
+products:
+  - id: cloud-hosted
 ---
 
 # Azure Marketplace pricing [ec-azure-marketplace-pricing]
diff --git a/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md b/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
index 0679c5155..39f9f4d9c 100644
--- a/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
+++ b/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-azure-marketplace-native.html
 applies_to:
   deployment:
     ess: ga
   serverless: preview
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-azure-marketplace-native.html
+products:
+  - id: cloud-hosted
 ---
 
 # Azure Native ISV Service [ec-azure-marketplace-native]
diff --git a/deploy-manage/deploy/elastic-cloud/change-hardware.md b/deploy-manage/deploy/elastic-cloud/change-hardware.md
index 0185ab235..b646b3ebd 100644
--- a/deploy-manage/deploy/elastic-cloud/change-hardware.md
+++ b/deploy-manage/deploy/elastic-cloud/change-hardware.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-change-hardware-for-a-specific-resource.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-change-hardware-for-a-specific-resource.html
+products:
+  - id: cloud-hosted
 ---
 
 # Change hardware [ec-change-hardware-for-a-specific-resource]
diff --git a/deploy-manage/deploy/elastic-cloud/cloud-hosted.md b/deploy-manage/deploy/elastic-cloud/cloud-hosted.md
index 24771704d..9669092e2 100644
--- a/deploy-manage/deploy/elastic-cloud/cloud-hosted.md
+++ b/deploy-manage/deploy/elastic-cloud/cloud-hosted.md
@@ -1,12 +1,14 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/index.html
   - https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-getting-started.html
   - https://www.elastic.co/guide/en/cloud/current/ec-about.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # {{ech}}
diff --git a/deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md b/deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
index a954513ed..5fd7c2e47 100644
--- a/deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-marketplace-aws-prepaid-signup.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-marketplace-aws-prepaid-signup.html
+products:
+  - id: cloud-hosted
 ---
 
 # Complete the registration of an annual subscription on AWS Marketplace [ec-marketplace-aws-prepaid-signup]
diff --git a/deploy-manage/deploy/elastic-cloud/configure.md b/deploy-manage/deploy/elastic-cloud/configure.md
index 828062888..fc060ad20 100644
--- a/deploy-manage/deploy/elastic-cloud/configure.md
+++ b/deploy-manage/deploy/elastic-cloud/configure.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-customize-deployment.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-configure-settings.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-configure.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Configure
diff --git a/deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md b/deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
index 405af2a7d..af1b4ad63 100644
--- a/deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
+++ b/deploy-manage/deploy/elastic-cloud/create-an-elastic-cloud-hosted-deployment.md
@@ -1,12 +1,14 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-create-deployment.html
   - https://www.elastic.co/guide/en/cloud/current/ec-prepare-production.html
   - https://www.elastic.co/guide/en/cloud/current/ec-configure-deployment-settings.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-configure-deployment-settings.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Create an {{ech}} deployment [ec-create-deployment]
@@ -23,7 +25,7 @@ You can also create a deployment using the [{{ecloud}} API](https://www.elastic.
     :alt: Log in to create a deployment
     :::
 
-1. Select a solution view for your deployment. Solution views define the navigation and set of features that will be first available in your deployment. You can change it later, or [create different spaces](/deploy-manage/manage-spaces.md) with different solution views within your deployment. 
+1. Select a solution view for your deployment. Solution views define the navigation and set of features that will be first available in your deployment. You can change it later, or [create different spaces](/deploy-manage/manage-spaces.md) with different solution views within your deployment.
 
     To learn more about what each solution offers, check [Elasticsearch](/solutions/search/get-started.md), [Observability](/solutions/observability/get-started.md), and [Security](/solutions/security/get-started.md).
 
diff --git a/deploy-manage/deploy/elastic-cloud/create-an-organization.md b/deploy-manage/deploy/elastic-cloud/create-an-organization.md
index 1f2578332..506d7688c 100644
--- a/deploy-manage/deploy/elastic-cloud/create-an-organization.md
+++ b/deploy-manage/deploy/elastic-cloud/create-an-organization.md
@@ -1,13 +1,16 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
-  serverless: ga
 navigation_title: Sign up
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-getting-started-trial.html
   - https://www.elastic.co/guide/en/serverless/current/general-sign-up-trial.html
   - https://www.elastic.co/guide/en/cloud/current/ec-getting-started-existing-email.html
+applies_to:
+  deployment:
+    ess: ga
+  serverless: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Sign up and create an organization
diff --git a/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md b/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
index 0a88b6525..141110e42 100644
--- a/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-aws-marketplace-conversion.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-aws-marketplace-conversion.html
+products:
+  - id: cloud-hosted
 ---
 
 # Create a monthly pay-as-you-go subscription on AWS Marketplace [ec-aws-marketplace-conversion]
diff --git a/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md b/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
index 1637c95e6..2e155f803 100644
--- a/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-gcp-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-gcp-marketplace-conversion.html
 applies_to:
   deployment:
     ess: ga
   serverless: unavailable
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-gcp-marketplace-conversion.html
+products:
+  - id: cloud-hosted
 ---
 
 # Create a monthly pay-as-you-go subscription on GCP Marketplace [ec-gcp-marketplace-conversion]
diff --git a/deploy-manage/deploy/elastic-cloud/create-serverless-project.md b/deploy-manage/deploy/elastic-cloud/create-serverless-project.md
index c4df87252..a0f69cf57 100644
--- a/deploy-manage/deploy/elastic-cloud/create-serverless-project.md
+++ b/deploy-manage/deploy/elastic-cloud/create-serverless-project.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/serverless-get-started.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Create a serverless project [serverless-get-started]
diff --git a/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md b/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
index 6d0e5b979..64e45b7d2 100644
--- a/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
+++ b/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-regional-deployment-aliases.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-regional-deployment-aliases.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Custom endpoint aliases
diff --git a/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md b/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
index 0c996a80c..78d51b180 100644
--- a/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
+++ b/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md
@@ -1,10 +1,13 @@
 ---
-navigation_title: "Compare Cloud Hosted and Serverless"
+navigation_title: Compare Cloud Hosted and Serverless
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-differences.html
 applies_to:
   serverless:
-  ess:
+  deployment:
+    ess:
+products:
+  - id: cloud-serverless
 ---
 
 # Compare {{ech}} and Serverless [elasticsearch-differences]
diff --git a/deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md b/deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
index 8e70d0330..f7cc41bdc 100644
--- a/deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
+++ b/deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-change-hardware-profile.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-change-hardware-profile.html
+products:
+  - id: cloud-hosted
 ---
 
 # Change hardware profiles [ec-change-hardware-profile]
diff --git a/deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md b/deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md
index efb99df9c..016fa01d8 100644
--- a/deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md
+++ b/deploy-manage/deploy/elastic-cloud/ec-customize-deployment-components.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-customize-deployment-components.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-customize-deployment-components.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Customize deployment components [ec-customize-deployment-components]
diff --git a/deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md b/deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
index 49f8c13a1..d324d2003 100644
--- a/deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
+++ b/deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # vCPU boosting and credits [ec-vcpu-boost-instance]
diff --git a/deploy-manage/deploy/elastic-cloud/edit-stack-settings.md b/deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
index 5531400f8..560cff794 100644
--- a/deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
+++ b/deploy-manage/deploy/elastic-cloud/edit-stack-settings.md
@@ -1,7 +1,4 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-add-user-settings.html
   - https://www.elastic.co/guide/en/cloud/current/ec-editing-user-settings.html
@@ -13,6 +10,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-manage-apm-settings.html
   - https://www.elastic.co/guide/en/cloud/current/ec-manage-appsearch-settings.html
   - https://www.elastic.co/guide/en/cloud/current/ec-manage-enterprise-search-settings.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Edit {{stack}} settings
@@ -29,11 +31,11 @@ If a feature requires both standard `elasticsearch.yml` settings and [secure set
 
 {{ech}} automatically rejects `elasticsearch.yml` settings that could break your cluster.
 
-For a list of supported settings, refer to the [{{es}} configuration reference](elasticsearch://reference/elasticsearch/configuration-reference/index.md). Settings supported on {{ech}} are indicated by an {{ecloud}} icon (![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on {{ecloud}}")). 
+For a list of supported settings, refer to the [{{es}} configuration reference](elasticsearch://reference/elasticsearch/configuration-reference/index.md). Settings supported on {{ech}} are indicated by an {{ecloud}} icon (![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on {{ecloud}}")).
 
 ### Kibana settings
 
-{{ech}} supports most of the standard {{kib}} settings. 
+{{ech}} supports most of the standard {{kib}} settings.
 
 Be aware that some settings that could break your cluster if set incorrectly and that the syntax might change between major versions.
 
diff --git a/deploy-manage/deploy/elastic-cloud/find-cloud-id.md b/deploy-manage/deploy/elastic-cloud/find-cloud-id.md
index bdb74e0b6..c46ff1e7c 100644
--- a/deploy-manage/deploy/elastic-cloud/find-cloud-id.md
+++ b/deploy-manage/deploy/elastic-cloud/find-cloud-id.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-cloud-id.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-cloud-id.html
+products:
+  - id: cloud-hosted
 ---
 
 # Find your Cloud ID [ec-cloud-id]
diff --git a/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md b/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
index 03e41929b..0e1b0e4bb 100644
--- a/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-billing-gcp.html
 applies_to:
   deployment:
     ess: ga
   serverless: unavailable
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-billing-gcp.html
+products:
+  - id: cloud-hosted
 ---
 
 # Google Cloud Platform Marketplace [ec-billing-gcp]
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
index b1d11dc3d..45a767916 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-accessing.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Access the console [ech-getting-started-accessing]
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
index edfe295d8..26e24d7d1 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Install the add-on [ech-getting-started-installing]
@@ -12,14 +14,14 @@ applies_to:
 These steps walk you through installing the {{heroku}} from the Heroku CLI. You can either install the latest default version of the add-on or you can install a specific version and include plugins at the same time.
 
 
-## Before you begin [echbefore_you_begin] 
+## Before you begin [echbefore_you_begin]
 
 The installation steps in this section assume that you have a basic working knowledge of the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) and are familiar with using the command line. To work with the {{heroku}} from the command line, you need to have the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) already installed.
 
 If you prefer to install the add-on through your web browser, go to the [{{es}} add-on](https://elements.heroku.com/addons/foundelasticsearch) page in the Elements Marketplace, select **Install Elasticsearch**, pick the add-on plan you want, and select **Provision add-on**.
 
 
-## Steps [echsteps] 
+## Steps [echsteps]
 
 To install the latest add-on for `MY_APP` using the Heroku CLI:
 
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
index 207b10b5b..27d5bb54e 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-removing.md
@@ -4,11 +4,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Remove the add-on [ech-getting-started-removing]
 
-::::{warning} 
+::::{warning}
 This action will destroy all associated data and cannot be undone.
 ::::
 
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-migrating.md b/deploy-manage/deploy/elastic-cloud/heroku-migrating.md
index 1edfd9305..b9a34eb33 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-migrating.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-migrating.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Migrate between plans [ech-migrating]
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md b/deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
index 439896cab..8c14a4530 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-reference-hardware.md
@@ -1,12 +1,14 @@
 ---
+navigation_title: Hardware
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-reference-hardware.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-aws-instance-configuration.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-default-aws-configurations.html
-navigation_title: Hardware
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # {{heroku}} hardware [ech-reference-hardware]
@@ -17,7 +19,7 @@ applies_to:
 All instances are set to UTC timezone.
 ::::
 
-The {{heroku}} runs exclusively on AWS. To understand the available hardware, refer to the following resources: 
+The {{heroku}} runs exclusively on AWS. To understand the available hardware, refer to the following resources:
 
 * [The {{ech}} hardware overview](cloud://reference/cloud-hosted/hardware.md)
 * [AWS hardware](cloud://reference/cloud-hosted/aws.md)
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md b/deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
index 775174376..7433f2360 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-reference-regions.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Regions
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-reference-regions.html
-navigation_title: Regions
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # {{heroku}} regions [ech-reference-regions]
@@ -16,11 +18,11 @@ A region is the geographic area where the data center of the cloud provider that
 
 {{heroku}} handles all hosting details for you, no additional accounts with the underlying cloud provider required. The region you select cannot be changed after you create a deployment. If you want to use a different region later on, you can create a new deployment and reindex your data into it.
 
-::::{tip} 
+::::{tip}
 If you are not sure what to pick, choose a region that is geographically close to you to reduce latency. You should always use HTTPS to connect to the {{stack}} components of your deployment.
 ::::
 
-## Amazon Web Services (AWS) regions [echamazon_web_services_aws_regions] 
+## Amazon Web Services (AWS) regions [echamazon_web_services_aws_regions]
 
 The following AWS regions are available:
 
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md b/deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
index f33b945c0..ddb00d961 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-working-with-elasticsearch.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Work with {{es}} [ech-working-with-elasticsearch]
diff --git a/deploy-manage/deploy/elastic-cloud/heroku.md b/deploy-manage/deploy/elastic-cloud/heroku.md
index 45ca652d4..72e0fe21c 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Heroku
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-getting-started.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-about.html
@@ -7,7 +8,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
-navigation_title: Heroku
+products:
+  - id: cloud-hosted
 ---
 
 # {{es}} Add-On for Heroku [ech-getting-started]
diff --git a/deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md b/deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
index 64fc93fc3..9072d550b 100644
--- a/deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
+++ b/deploy-manage/deploy/elastic-cloud/keep-track-of-deployment-activity.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-activity-page.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-activity-page.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Keep track of deployment activity
diff --git a/deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md b/deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
index 3c46831af..87f04b0ce 100644
--- a/deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
+++ b/deploy-manage/deploy/elastic-cloud/manage-deployments-using-elastic-cloud-api.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-api-deployment-crud.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-api-deployment-crud.html
+products:
+  - id: cloud-hosted
 ---
 
 # Manage deployments using the {{ecloud}} API [ec-api-deployment-crud]
diff --git a/deploy-manage/deploy/elastic-cloud/manage-deployments.md b/deploy-manage/deploy/elastic-cloud/manage-deployments.md
index 1a4e9f69d..4da543575 100644
--- a/deploy-manage/deploy/elastic-cloud/manage-deployments.md
+++ b/deploy-manage/deploy/elastic-cloud/manage-deployments.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-manage-deployment.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-manage-deployment.html
+products:
+  - id: cloud-hosted
 ---
 
 # Manage deployments [ec-manage-deployment]
diff --git a/deploy-manage/deploy/elastic-cloud/manage-integrations-server.md b/deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
index 8c3c1aae7..11651aa70 100644
--- a/deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
+++ b/deploy-manage/deploy/elastic-cloud/manage-integrations-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-manage-integrations-server.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-manage-integrations-server.html
+products:
+  - id: cloud-hosted
 ---
 
 # Manage your Integrations server [ec-manage-integrations-server]
diff --git a/deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md b/deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
index afb4519ad..d5a46d28d 100644
--- a/deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
+++ b/deploy-manage/deploy/elastic-cloud/manage-plugins-extensions-through-api.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-plugins-guide.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-plugins-guide.html
+products:
+  - id: cloud-hosted
 ---
 
 # Manage plugins and extensions through the API [ec-plugins-guide]
diff --git a/deploy-manage/deploy/elastic-cloud/project-settings.md b/deploy-manage/deploy/elastic-cloud/project-settings.md
index da60a7af0..9c1feb1fc 100644
--- a/deploy-manage/deploy/elastic-cloud/project-settings.md
+++ b/deploy-manage/deploy/elastic-cloud/project-settings.md
@@ -2,9 +2,10 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/project-and-management-settings.html
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-manage-project.html
-
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Project settings
diff --git a/deploy-manage/deploy/elastic-cloud/regions.md b/deploy-manage/deploy/elastic-cloud/regions.md
index 4ad13d2a7..4cbf9dc04 100644
--- a/deploy-manage/deploy/elastic-cloud/regions.md
+++ b/deploy-manage/deploy/elastic-cloud/regions.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/regions.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Regions [regions]
diff --git a/deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md b/deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
index 95dc4d188..f1ecfeed9 100644
--- a/deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
+++ b/deploy-manage/deploy/elastic-cloud/restrictions-known-problems.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-restrictions.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-restrictions.html
+products:
+  - id: cloud-hosted
 ---
 
 # Restrictions and known problems [ec-restrictions]
diff --git a/deploy-manage/deploy/elastic-cloud/serverless.md b/deploy-manage/deploy/elastic-cloud/serverless.md
index fa66cfbae..9f4304ab8 100644
--- a/deploy-manage/deploy/elastic-cloud/serverless.md
+++ b/deploy-manage/deploy/elastic-cloud/serverless.md
@@ -5,6 +5,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/general-serverless-status.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # {{serverless-full}}
diff --git a/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md b/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
index b77eab803..cea7091a0 100644
--- a/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
+++ b/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md
@@ -1,10 +1,12 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-marketplaces.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-marketplaces.html
+products:
+  - id: cloud-hosted
 ---
 
 # Subscribe from a marketplace [ec-marketplaces]
diff --git a/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md b/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
index 26171263b..2ce5bb7db 100644
--- a/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
+++ b/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-integrations-server-apm-switch.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-integrations-server-apm-switch.html
+products:
+  - id: cloud-hosted
 ---
 
 # Switch from APM to Integrations Server payload [ec-integrations-server-apm-switch]
diff --git a/deploy-manage/deploy/elastic-cloud/tools-apis.md b/deploy-manage/deploy/elastic-cloud/tools-apis.md
index d1d8e571d..916cb76d5 100644
--- a/deploy-manage/deploy/elastic-cloud/tools-apis.md
+++ b/deploy-manage/deploy/elastic-cloud/tools-apis.md
@@ -1,12 +1,15 @@
 ---
+navigation_title: Tools and APIs
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-http-apis.html
+  - https://www.elastic.co/guide/en/tpec/current/index.html
 applies_to:
   deployment:
     ess: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-http-apis.html
-  - https://www.elastic.co/guide/en/tpec/current/index.html
-navigation_title: "Tools and APIs"
+products:
+  - id: cloud-serverless
+  - id: cloud-terraform
 ---
 
 # Tools and APIs for {{ecloud}}
diff --git a/deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md b/deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
index 1a5dbb492..65e9b32f8 100644
--- a/deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
+++ b/deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-custom-bundles.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-custom-bundles.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Upload custom plugins and bundles
diff --git a/deploy-manage/deploy/self-managed.md b/deploy-manage/deploy/self-managed.md
index 6ee9bcf7d..7591b2f9a 100644
--- a/deploy-manage/deploy/self-managed.md
+++ b/deploy-manage/deploy/self-managed.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Self-managed cluster
diff --git a/deploy-manage/deploy/self-managed/access-kibana.md b/deploy-manage/deploy/self-managed/access-kibana.md
index b4584ddb0..045e7e911 100644
--- a/deploy-manage/deploy/self-managed/access-kibana.md
+++ b/deploy-manage/deploy/self-managed/access-kibana.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: kibana
 ---
 
 # Access {{kib}} [access]
diff --git a/deploy-manage/deploy/self-managed/air-gapped-install.md b/deploy-manage/deploy/self-managed/air-gapped-install.md
index 3e9657704..1226afdff 100644
--- a/deploy-manage/deploy/self-managed/air-gapped-install.md
+++ b/deploy-manage/deploy/self-managed/air-gapped-install.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: cloud-enterprise
 ---
 
 # Air gapped install
diff --git a/deploy-manage/deploy/self-managed/bootstrap-checks.md b/deploy-manage/deploy/self-managed/bootstrap-checks.md
index e72c023a1..4dd35463a 100644
--- a/deploy-manage/deploy/self-managed/bootstrap-checks.md
+++ b/deploy-manage/deploy/self-managed/bootstrap-checks.md
@@ -19,6 +19,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Bootstrap checks [bootstrap-checks]
diff --git a/deploy-manage/deploy/self-managed/configure-elasticsearch.md b/deploy-manage/deploy/self-managed/configure-elasticsearch.md
index 21b735ea2..bf8cb5c1c 100644
--- a/deploy-manage/deploy/self-managed/configure-elasticsearch.md
+++ b/deploy-manage/deploy/self-managed/configure-elasticsearch.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Configure {{es}} [settings]
diff --git a/deploy-manage/deploy/self-managed/configure-kibana.md b/deploy-manage/deploy/self-managed/configure-kibana.md
index 049419388..fbcba704a 100644
--- a/deploy-manage/deploy/self-managed/configure-kibana.md
+++ b/deploy-manage/deploy/self-managed/configure-kibana.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: kibana
 ---
 
 # Configure {{kib}} [settings]
diff --git a/deploy-manage/deploy/self-managed/executable-jna-tmpdir.md b/deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
index 4fda947bc..7dea753e4 100644
--- a/deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
+++ b/deploy-manage/deploy/self-managed/executable-jna-tmpdir.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Ensure JNA temporary directory permits executables [executable-jna-tmpdir]
diff --git a/deploy-manage/deploy/self-managed/file-descriptors.md b/deploy-manage/deploy/self-managed/file-descriptors.md
index 059ea30dd..94f4378b7 100644
--- a/deploy-manage/deploy/self-managed/file-descriptors.md
+++ b/deploy-manage/deploy/self-managed/file-descriptors.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Increase the file descriptor limit [file-descriptors]
diff --git a/deploy-manage/deploy/self-managed/important-settings-configuration.md b/deploy-manage/deploy/self-managed/important-settings-configuration.md
index 3a02c349f..00e5f1274 100644
--- a/deploy-manage/deploy/self-managed/important-settings-configuration.md
+++ b/deploy-manage/deploy/self-managed/important-settings-configuration.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Important settings configuration [important-settings]
diff --git a/deploy-manage/deploy/self-managed/important-system-configuration.md b/deploy-manage/deploy/self-managed/important-system-configuration.md
index 8e2438f8a..8be74ed3f 100644
--- a/deploy-manage/deploy/self-managed/important-system-configuration.md
+++ b/deploy-manage/deploy/self-managed/important-system-configuration.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Important system configuration [system-config]
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md b/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
index ca1f3895c..061d9e475 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
@@ -1,16 +1,18 @@
 ---
+navigation_title: Install on Linux or MacOS
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/targz.html
-sub:
-  es-conf: "$ES_HOME/config"
-  slash: "/"
-  export: "export "
-  escape: "\\"
-  auto: " -d"
-navigation_title: "Install on Linux or MacOS"
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
+sub:
+  es-conf: $ES_HOME/config
+  slash: /
+  export: "export "
+  escape: \
+  auto: " -d"
 ---
 
 # Install {{es}} from archive on Linux or MacOS [targz]
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
index 14c152c1a..739a8eaeb 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
@@ -1,16 +1,18 @@
 ---
+navigation_title: Install with Debian package
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html
-sub:
-  es-conf: "/etc/elasticsearch"
-  slash: "/"
-  distro: "Debian"
-  export: "export "
-  escape: "\\"
-navigation_title: Install with Debian package
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
+sub:
+  es-conf: /etc/elasticsearch
+  slash: /
+  distro: Debian
+  export: "export "
+  escape: \
 ---
 
 # Install {{es}} with a Debian package [deb]
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
index 33ebd981c..4aaa6d3d7 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Install with Docker
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
-navigation_title: "Install with Docker"
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Install {{es}} with Docker [docker]
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
index 0f1234553..af9bd139e 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
@@ -1,16 +1,17 @@
 ---
+navigation_title: Install with RPM package
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/rpm.html
-sub:
-  es-conf: "/etc/elasticsearch"
-  slash: "/"
-  distro: "RPM"
-  export: "export"
-escape: "\\"
-navigation_title: "Install with RPM package"
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
+sub:
+  es-conf: /etc/elasticsearch
+  slash: /
+  distro: RPM
+  export: export
 ---
 
 # Install {{es}} with RPM [rpm]
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
index e1a23534a..1542a1ec7 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
@@ -1,18 +1,20 @@
 ---
+navigation_title: Install on Windows
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/zip-windows.html
-sub:
-  es-conf: "%ES_HOME%\\config"
-  slash: "\\"
-  export: "$"
-  escape: "^"
-  auto: ".bat"
-  ipcommand: "ipconfig /all"
-  ipvalue: "inet"
-navigation_title: Install on Windows
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
+sub:
+  es-conf: "%ES_HOME%\\config"
+  slash: \
+  export: $
+  escape: ^
+  auto: .bat
+  ipcommand: ipconfig /all
+  ipvalue: inet
 ---
 
 # Install {{es}} with .zip on Windows [zip-windows]
diff --git a/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md b/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
index d4e9ae510..78d20cffd 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
@@ -1,13 +1,11 @@
 ---
-navigation_title: "Install from archive on Linux or macOS"
+navigation_title: Linux and MacOS
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/targz.html
+products:
+  - id: kibana
 sub:
- ipcommand: "ifconfig"
-navigation_title: "Linux and MacOS"
-applies_to:
-  deployment:
-    self:
+  ipcommand: ifconfig
 ---
 
 # Install {{kib}} from archive on Linux or macOS [targz]
diff --git a/deploy-manage/deploy/self-managed/install-kibana-on-windows.md b/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
index ac55f2e03..597ddafe0 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
@@ -1,11 +1,9 @@
 ---
-navigation_title: "Install on Windows"
+navigation_title: Windows
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/windows.html
-navigation_title: "Windows"
-applies_to:
-  deployment:
-    self:
+products:
+  - id: kibana
 ---
 
 # Install {{kib}} on Windows [windows]
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md b/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
index 25a11d198..37e1866d2 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
@@ -1,11 +1,9 @@
 ---
-navigation_title: "Install with Debian package"
+navigation_title: Debian
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/deb.html
-navigation_title: "Debian"
-applies_to:
-  deployment:
-    self:
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-docker.md b/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
index 0510f40fc..4f18f2d29 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
@@ -1,14 +1,9 @@
 ---
-navigation_title: "Install with Docker"
+navigation_title: Docker
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/docker.html
-navigation_title: "Docker"
-applies_to:
-  deployment:
-    self:
-applies_to:
-  deployment:
-    self:
+products:
+  - id: kibana
 ---
 
 
@@ -188,10 +183,10 @@ All information that you include in environment variables is visible through the
 
 Some example translations are shown here:
 
-| Environment variable | {{kib}} setting | 
+| Environment variable | {{kib}} setting |
 | --- | --- |
 | `SERVER_NAME` | `server.name` |
-| `SERVER_BASEPATH` | `server.basePath`| 
+| `SERVER_BASEPATH` | `server.basePath`|
 | `ELASTICSEARCH_HOSTS` | `elasticsearch.hosts` |
 
 In general, any setting listed in [](configure-kibana.md) can be configured with this technique.
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md b/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
index 6e097a77c..f81e55d74 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
@@ -1,11 +1,9 @@
 ---
-navigation_title: "Install with RPM"
+navigation_title: RPM
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/rpm.html
-navigation_title: "RPM"
-applies_to:
-  deployment:
-    self:
+products:
+  - id: kibana
 ---
 
 # Install {{kib}} with RPM [rpm]
diff --git a/deploy-manage/deploy/self-managed/install-kibana.md b/deploy-manage/deploy/self-managed/install-kibana.md
index c07615923..07b4adb3d 100644
--- a/deploy-manage/deploy/self-managed/install-kibana.md
+++ b/deploy-manage/deploy/self-managed/install-kibana.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: kibana
 ---
 
 # Install {{kib}}
diff --git a/deploy-manage/deploy/self-managed/installing-elasticsearch.md b/deploy-manage/deploy/self-managed/installing-elasticsearch.md
index b75aed96a..9655bdab0 100644
--- a/deploy-manage/deploy/self-managed/installing-elasticsearch.md
+++ b/deploy-manage/deploy/self-managed/installing-elasticsearch.md
@@ -7,6 +7,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Deploy an {{es}} cluster
diff --git a/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md b/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
index 48e447d59..8b695e71d 100644
--- a/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
+++ b/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Local installation (quickstart)"
+navigation_title: Local installation (quickstart)
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/run-elasticsearch-locally.html
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Local development installation (quickstart) [run-elasticsearch-locally]
diff --git a/deploy-manage/deploy/self-managed/max-number-of-threads.md b/deploy-manage/deploy/self-managed/max-number-of-threads.md
index c7b950729..01824d3d2 100644
--- a/deploy-manage/deploy/self-managed/max-number-of-threads.md
+++ b/deploy-manage/deploy/self-managed/max-number-of-threads.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Increase max number of threads
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/max-number-of-threads.html
-navigation_title: Increase max number of threads
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Increase the maximum number of threads [max-number-of-threads]
diff --git a/deploy-manage/deploy/self-managed/networkaddress-cache-ttl.md b/deploy-manage/deploy/self-managed/networkaddress-cache-ttl.md
index 1ac03d109..d00fc5c59 100644
--- a/deploy-manage/deploy/self-managed/networkaddress-cache-ttl.md
+++ b/deploy-manage/deploy/self-managed/networkaddress-cache-ttl.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # DNS cache settings [networkaddress-cache-ttl]
diff --git a/deploy-manage/deploy/self-managed/plugins.md b/deploy-manage/deploy/self-managed/plugins.md
index e38e04d42..683726430 100644
--- a/deploy-manage/deploy/self-managed/plugins.md
+++ b/deploy-manage/deploy/self-managed/plugins.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Add plugins [modules-plugins]
diff --git a/deploy-manage/deploy/self-managed/setting-system-settings.md b/deploy-manage/deploy/self-managed/setting-system-settings.md
index 13f9f401f..368d07399 100644
--- a/deploy-manage/deploy/self-managed/setting-system-settings.md
+++ b/deploy-manage/deploy/self-managed/setting-system-settings.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Configure system settings [setting-system-settings]
diff --git a/deploy-manage/deploy/self-managed/setup-configuration-memory.md b/deploy-manage/deploy/self-managed/setup-configuration-memory.md
index 843ada444..c2978ff12 100644
--- a/deploy-manage/deploy/self-managed/setup-configuration-memory.md
+++ b/deploy-manage/deploy/self-managed/setup-configuration-memory.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Disable swapping [setup-configuration-memory]
diff --git a/deploy-manage/deploy/self-managed/system-config-tcpretries.md b/deploy-manage/deploy/self-managed/system-config-tcpretries.md
index 415133e83..30634eb6c 100644
--- a/deploy-manage/deploy/self-managed/system-config-tcpretries.md
+++ b/deploy-manage/deploy/self-managed/system-config-tcpretries.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Decrease the TCP retransmission timeout [system-config-tcpretries]
diff --git a/deploy-manage/deploy/self-managed/tools-apis.md b/deploy-manage/deploy/self-managed/tools-apis.md
index ab7fe8745..708b5659d 100644
--- a/deploy-manage/deploy/self-managed/tools-apis.md
+++ b/deploy-manage/deploy/self-managed/tools-apis.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Tools and APIs"
+navigation_title: Tools and APIs
 applies_to:
   deployment:
     self:
diff --git a/deploy-manage/deploy/self-managed/vm-max-map-count.md b/deploy-manage/deploy/self-managed/vm-max-map-count.md
index f76b7b64c..a8c54b764 100644
--- a/deploy-manage/deploy/self-managed/vm-max-map-count.md
+++ b/deploy-manage/deploy/self-managed/vm-max-map-count.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Increase virtual memory [vm-max-map-count]
diff --git a/deploy-manage/distributed-architecture.md b/deploy-manage/distributed-architecture.md
index 8553920ab..e9f5a598e 100644
--- a/deploy-manage/distributed-architecture.md
+++ b/deploy-manage/distributed-architecture.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Distributed architecture [_data_store_architecture]
diff --git a/deploy-manage/distributed-architecture/clusters-nodes-shards.md b/deploy-manage/distributed-architecture/clusters-nodes-shards.md
index 6bd772f5a..b5d3d9d72 100644
--- a/deploy-manage/distributed-architecture/clusters-nodes-shards.md
+++ b/deploy-manage/distributed-architecture/clusters-nodes-shards.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Clusters, nodes, and shards [nodes-shards]
diff --git a/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md b/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
index 5b253a394..41a9d6cce 100644
--- a/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
+++ b/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md
@@ -3,7 +3,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/node-roles-overview.html
 applies_to:
   stack:
-  self:
+  deployment:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Node roles [node-roles-overview]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation.md b/deploy-manage/distributed-architecture/discovery-cluster-formation.md
index 74683be2c..11c1b233a 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 ::::{important}
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
index bcae66167..c368d94bf 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-fault-detection.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Cluster fault detection [cluster-fault-detection]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
index 65c8df570..f53d50b02 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-state-overview.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Cluster state [cluster-state-overview]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
index 1a37d52d8..70abebaf6 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/discovery-hosts-providers.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Discovery [discovery-hosts-providers]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
index 23a6f578a..71573551c 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery-bootstrap-cluster.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Bootstrapping a cluster [modules-discovery-bootstrap-cluster]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
index ede117eae..9dd37fc70 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery-quorums.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Quorum-based decision making [modules-discovery-quorums]
diff --git a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
index 442c76042..15339ea89 100644
--- a/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
+++ b/deploy-manage/distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery-voting.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Voting configurations [modules-discovery-voting]
diff --git a/deploy-manage/distributed-architecture/kibana-tasks-management.md b/deploy-manage/distributed-architecture/kibana-tasks-management.md
index 3c64a661a..6626bca59 100644
--- a/deploy-manage/distributed-architecture/kibana-tasks-management.md
+++ b/deploy-manage/distributed-architecture/kibana-tasks-management.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/task-manager-production-considerations.html
 applies_to:
   stack:
+products:
+  - id: kibana
 ---
 
 # {{kib}} task management [task-manager-production-considerations]
diff --git a/deploy-manage/distributed-architecture/reading-and-writing-documents.md b/deploy-manage/distributed-architecture/reading-and-writing-documents.md
index d5b556d99..d481a1502 100644
--- a/deploy-manage/distributed-architecture/reading-and-writing-documents.md
+++ b/deploy-manage/distributed-architecture/reading-and-writing-documents.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Reading and writing documents [docs-replication]
diff --git a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
index 5fed712a9..c29734bbc 100644
--- a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
+++ b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/shard-allocation-relocation-recovery.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Shard allocation, relocation, and recovery [shard-allocation-relocation-recovery]
diff --git a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
index 482d39613..ba3acdc0b 100644
--- a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
+++ b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/delayed-allocation.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Delaying allocation when a node leaves [delayed-allocation]
diff --git a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
index 9fb10ec2f..1a39e792f 100644
--- a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
+++ b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
@@ -5,7 +5,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/recovery-prioritization.html
 applies_to:
   stack:
-  self:
+  deployment:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Index-level shard allocation
diff --git a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
index c8ed0e4cb..7bb939675 100644
--- a/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
+++ b/deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
@@ -3,7 +3,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/shard-allocation-awareness.html
 applies_to:
   stack:
-  self:
+  deployment:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Shard allocation awareness [shard-allocation-awareness]
diff --git a/deploy-manage/distributed-architecture/shard-request-cache.md b/deploy-manage/distributed-architecture/shard-request-cache.md
index 4a258ebae..7f91266aa 100644
--- a/deploy-manage/distributed-architecture/shard-request-cache.md
+++ b/deploy-manage/distributed-architecture/shard-request-cache.md
@@ -1,12 +1,14 @@
 ---
 mapped_pages:
-- https://www.elastic.co/guide/en/elasticsearch/reference/current/shard-request-cache.html
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/shard-request-cache.html
 applies_to:
   deployment:
     ece:
     ess:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # The shard request cache [shard-request-cache]
diff --git a/deploy-manage/index.md b/deploy-manage/index.md
index 74339f6be..6fb9aee90 100644
--- a/deploy-manage/index.md
+++ b/deploy-manage/index.md
@@ -5,6 +5,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elastic-stack/current/index.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-deployments.html
   - https://www.elastic.co/guide/en/kibana/current/management.html
+products:
+  - id: kibana
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Deploy and manage
diff --git a/deploy-manage/kibana-reporting-configuration.md b/deploy-manage/kibana-reporting-configuration.md
index e14f4a6cc..d995bc0e1 100644
--- a/deploy-manage/kibana-reporting-configuration.md
+++ b/deploy-manage/kibana-reporting-configuration.md
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     ess: all
+products:
+  - id: kibana
 ---
 
 % this anchor belongs to `kibana reporting production considerations doc`
diff --git a/deploy-manage/license/manage-your-license-in-ece.md b/deploy-manage/license/manage-your-license-in-ece.md
index 6de3d01b7..5abbd0d28 100644
--- a/deploy-manage/license/manage-your-license-in-ece.md
+++ b/deploy-manage/license/manage-your-license-in-ece.md
@@ -1,9 +1,12 @@
 ---
 navigation_title: "{{ece}}"
-applies_to:
-  ece: 
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-license.html
+applies_to:
+  deployment:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage your license in {{ece}} [ece-add-license]
diff --git a/deploy-manage/license/manage-your-license-in-eck.md b/deploy-manage/license/manage-your-license-in-eck.md
index 9751cab51..fd26cb62b 100644
--- a/deploy-manage/license/manage-your-license-in-eck.md
+++ b/deploy-manage/license/manage-your-license-in-eck.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: "{{eck}}"
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-licensing.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-licensing.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage your license in {{eck}} [k8s-licensing]
diff --git a/deploy-manage/license/manage-your-license-in-self-managed-cluster.md b/deploy-manage/license/manage-your-license-in-self-managed-cluster.md
index f765df533..114fd38fd 100644
--- a/deploy-manage/license/manage-your-license-in-self-managed-cluster.md
+++ b/deploy-manage/license/manage-your-license-in-self-managed-cluster.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Self-managed cluster"
-applies_to:
-  self:
+navigation_title: Self-managed cluster
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/managing-licenses.html
+applies_to:
+  deployment:
+    self:
+products:
+  - id: kibana
 ---
 
 # Manage your license in a self-managed cluster [managing-licenses]
@@ -15,21 +18,21 @@ To explore all of the available solutions and features, start a 30-day free tria
 To view the status of your license, start a trial, or install a new license, go to the **License Management** page using the navigation menu or the [global search field](../../explore-analyze/find-and-organize/find-apps-and-objects.md).
 
 
-## Required permissions [_required_permissions_3] 
+## Required permissions [_required_permissions_3]
 
 The `manage` cluster privilege is required to access **License Management**.
 
 To add the privilege, go to the **Roles** management page using the navigation menu or the [global search field](../../explore-analyze/find-and-organize/find-apps-and-objects.md).
 
 
-## License expiration [license-expiration] 
+## License expiration [license-expiration]
 
 Licenses are valid for a specific time period. 30 days before the license expiration date, {{es}} starts logging expiration warnings. If monitoring is enabled, expiration warnings are displayed prominently in {{kib}}.
 
 If your license expires, your subscription level reverts to Basic and you will no longer be able to use [Platinum or Enterprise features](https://www.elastic.co/subscriptions).
 
 
-## Update your license [update-license] 
+## Update your license [update-license]
 
 Licenses are provided as a *JSON* file and have an effective date and an expiration date. You cannot install a new license before its effective date. License updates take effect immediately and do not require restarting {{es}}.
 
diff --git a/deploy-manage/maintenance.md b/deploy-manage/maintenance.md
index 692f2fe3a..d31eba03c 100644
--- a/deploy-manage/maintenance.md
+++ b/deploy-manage/maintenance.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-kibana.html
 applies_to:
   deployment:
-     ess:
-     ece:
-     self:
+    ess:
+    ece:
+    self:
+products:
+  - id: cloud-enterprise
 ---
 
 # Maintenance [maintenance]
diff --git a/deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md b/deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
index 1451adf50..d58cca5f5 100644
--- a/deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
+++ b/deploy-manage/maintenance/add-and-remove-elasticsearch-nodes.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/add-elasticsearch-nodes.html
 applies_to:
   deployment:
-     self:
+    self:
+products:
+  - id: elasticsearch
 sub:
-  slash: "\\"
+  slash: \
 ---
 
 # Add and Remove {{es}} nodes [add-elasticsearch-nodes]
diff --git a/deploy-manage/maintenance/ece.md b/deploy-manage/maintenance/ece.md
index e724f8084..2f82f0ec2 100644
--- a/deploy-manage/maintenance/ece.md
+++ b/deploy-manage/maintenance/ece.md
@@ -1,7 +1,7 @@
 ---
 applies_to:
   deployment:
-     ece:
+    ece:
 ---
 
 # ECE maintenance
diff --git a/deploy-manage/maintenance/ece/delete-ece-hosts.md b/deploy-manage/maintenance/ece/delete-ece-hosts.md
index 60414a7d5..6ec50ace6 100644
--- a/deploy-manage/maintenance/ece/delete-ece-hosts.md
+++ b/deploy-manage/maintenance/ece/delete-ece-hosts.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-delete-runner.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Delete ECE hosts [ece-delete-runner]
diff --git a/deploy-manage/maintenance/ece/deployments-maintenance.md b/deploy-manage/maintenance/ece/deployments-maintenance.md
index 57cf42cbd..2943616d6 100644
--- a/deploy-manage/maintenance/ece/deployments-maintenance.md
+++ b/deploy-manage/maintenance/ece/deployments-maintenance.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-maintenance-mode-deployments.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Deployments maintenance [ece-maintenance-mode-deployments]
diff --git a/deploy-manage/maintenance/ece/enable-maintenance-mode.md b/deploy-manage/maintenance/ece/enable-maintenance-mode.md
index c94d56b56..caf00c6e4 100644
--- a/deploy-manage/maintenance/ece/enable-maintenance-mode.md
+++ b/deploy-manage/maintenance/ece/enable-maintenance-mode.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-maintenance-mode.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Enable maintenance mode [ece-maintenance-mode]
diff --git a/deploy-manage/maintenance/ece/maintenance-activities.md b/deploy-manage/maintenance/ece/maintenance-activities.md
index 36ac5839e..cbe7392b1 100644
--- a/deploy-manage/maintenance/ece/maintenance-activities.md
+++ b/deploy-manage/maintenance/ece/maintenance-activities.md
@@ -1,7 +1,7 @@
 ---
 applies_to:
   deployment:
-     ece:
+    ece:
 ---
 # Maintenance activities
 
diff --git a/deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md b/deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
index db3d3d1be..eac4c7ba5 100644
--- a/deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
+++ b/deploy-manage/maintenance/ece/move-nodes-instances-from-allocators.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-move-nodes.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Move nodes or instances from allocators [ece-move-nodes]
diff --git a/deploy-manage/maintenance/ece/pause-instance.md b/deploy-manage/maintenance/ece/pause-instance.md
index b84ef6ac6..152840bbc 100644
--- a/deploy-manage/maintenance/ece/pause-instance.md
+++ b/deploy-manage/maintenance/ece/pause-instance.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-maintenance-mode-pausing.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Pause instance [ece-maintenance-mode-pausing]
diff --git a/deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md b/deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
index a60b770fb..9a1d881e8 100644
--- a/deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
+++ b/deploy-manage/maintenance/ece/perform-ece-hosts-maintenance.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-perform-host-maintenance.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Perform ECE hosts maintenance [ece-perform-host-maintenance]
diff --git a/deploy-manage/maintenance/ece/scale-out-installation.md b/deploy-manage/maintenance/ece/scale-out-installation.md
index 9c1ffb264..d08e8c194 100644
--- a/deploy-manage/maintenance/ece/scale-out-installation.md
+++ b/deploy-manage/maintenance/ece/scale-out-installation.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-capacity.html
 applies_to:
   deployment:
-     ece:
+    ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Scale out your installation [ece-add-capacity]
diff --git a/deploy-manage/maintenance/start-stop-routing-requests.md b/deploy-manage/maintenance/start-stop-routing-requests.md
index 38c8b472a..558b233b9 100644
--- a/deploy-manage/maintenance/start-stop-routing-requests.md
+++ b/deploy-manage/maintenance/start-stop-routing-requests.md
@@ -4,8 +4,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-maintenance-mode-routing.html
 applies_to:
   deployment:
-     ece:
-     ess:
+    ece:
+    ess:
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Start and stop routing requests [maintenance-mode-routing]
diff --git a/deploy-manage/maintenance/start-stop-services.md b/deploy-manage/maintenance/start-stop-services.md
index 219f4d8c3..846c3e3f7 100644
--- a/deploy-manage/maintenance/start-stop-services.md
+++ b/deploy-manage/maintenance/start-stop-services.md
@@ -1,9 +1,9 @@
 ---
 applies_to:
   deployment:
-     ess:
-     ece:
-     self:
+    ess:
+    ece:
+    self:
 ---
 
 # Start and stop services
diff --git a/deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md b/deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
index aae81a6e0..f6a4f820c 100644
--- a/deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
+++ b/deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/restart-cluster.html
 applies_to:
   deployment:
-     self:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Full Cluster restart and rolling restart procedures [restart-cluster]
diff --git a/deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md b/deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
index 704344a09..6f23964e5 100644
--- a/deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
+++ b/deploy-manage/maintenance/start-stop-services/restart-an-ece-deployment.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-restart-deployment.html
 applies_to:
   deployment:
-     ece: all
+    ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Restart an ECE deployment [ece-restart-deployment]
diff --git a/deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md b/deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
index 1b6a0e1f0..618a351a7 100644
--- a/deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
+++ b/deploy-manage/maintenance/start-stop-services/restart-cloud-hosted-deployment.md
@@ -4,7 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-api-deployment-other.html
 applies_to:
   deployment:
-     ess:
+    ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Restart an {{ech}} deployment
diff --git a/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md b/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
index a0300c51c..d6ad0674d 100644
--- a/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
+++ b/deploy-manage/maintenance/start-stop-services/start-stop-elasticsearch.md
@@ -4,7 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/stopping-elasticsearch.html
 applies_to:
   deployment:
-     self:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Start and stop {{es}}
diff --git a/deploy-manage/maintenance/start-stop-services/start-stop-kibana.md b/deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
index 112a697a5..c77cca268 100644
--- a/deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
+++ b/deploy-manage/maintenance/start-stop-services/start-stop-kibana.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/start-stop.html
 applies_to:
   deployment:
-     self:
+    self:
+products:
+  - id: kibana
 ---
 
 # Start and stop {{kib}} [start-stop]
diff --git a/deploy-manage/manage-connectors.md b/deploy-manage/manage-connectors.md
index cb6f76509..293af88aa 100644
--- a/deploy-manage/manage-connectors.md
+++ b/deploy-manage/manage-connectors.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Connectors [connector-management]
diff --git a/deploy-manage/manage-spaces.md b/deploy-manage/manage-spaces.md
index 781fe7262..726618f2e 100644
--- a/deploy-manage/manage-spaces.md
+++ b/deploy-manage/manage-spaces.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-spaces.html
   - https://www.elastic.co/guide/en/serverless/current/spaces.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Spaces [xpack-spaces]
diff --git a/deploy-manage/monitor.md b/deploy-manage/monitor.md
index 21548c76e..a27fe14cd 100644
--- a/deploy-manage/monitor.md
+++ b/deploy-manage/monitor.md
@@ -8,6 +8,9 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
+  - id: cloud-hosted
 ---
 
 # Monitoring
diff --git a/deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md b/deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
index 19e412aa6..d1cd5bbeb 100644
--- a/deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
+++ b/deploy-manage/monitor/access-performance-metrics-on-elastic-cloud.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Performance metrics on {{ecloud}} [ec-saas-metrics-accessing]
diff --git a/deploy-manage/monitor/autoops.md b/deploy-manage/monitor/autoops.md
index 500c14fb9..4530cdcf8 100644
--- a/deploy-manage/monitor/autoops.md
+++ b/deploy-manage/monitor/autoops.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # AutoOps [ec-autoops]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-deployment-view.md b/deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
index 05153e546..b0ff672b9 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-deployment-view.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Deployment [ec-autoops-deployment-view]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md b/deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md
index 64bc4d7e2..30b6232ca 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Dismiss Events [ec-autoops-dismiss-event]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-event-settings.md b/deploy-manage/monitor/autoops/ec-autoops-event-settings.md
index 7b3910f3c..17c737512 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-event-settings.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-event-settings.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Event Settings [ec-autoops-event-settings]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-events.md b/deploy-manage/monitor/autoops/ec-autoops-events.md
index 532818c11..56a31a86b 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-events.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-events.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # AutoOps events [ec-autoops-events]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-faq.md b/deploy-manage/monitor/autoops/ec-autoops-faq.md
index 5e26cfd27..8c7c7725f 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-faq.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-faq.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # AutoOps FAQ [ec-autoops-faq]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md b/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
index 6d105da0a..bf96c6daa 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # How to access AutoOps [ec-autoops-how-to-access]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-index-view.md b/deploy-manage/monitor/autoops/ec-autoops-index-view.md
index a6d69d586..036a84b72 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-index-view.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-index-view.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Indices [ec-autoops-index-view]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-nodes-view.md b/deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
index 6b0077bfe..843565271 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-nodes-view.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Nodes [ec-autoops-nodes-view]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md b/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
index 422545f48..a2d1415e8 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Notifications Settings [ec-autoops-notifications-settings]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-overview-view.md b/deploy-manage/monitor/autoops/ec-autoops-overview-view.md
index 80808754b..a7c888df8 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-overview-view.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-overview-view.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Overview [ec-autoops-overview-view]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-regions.md b/deploy-manage/monitor/autoops/ec-autoops-regions.md
index 729fe87ba..abac3259d 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-regions.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-regions.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # AutoOps regions [ec-autoops-regions]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-shards-view.md b/deploy-manage/monitor/autoops/ec-autoops-shards-view.md
index 7c47ce7f2..e4b1f5440 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-shards-view.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-shards-view.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Shards [ec-autoops-shards-view]
diff --git a/deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md b/deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
index 0dae3c61f..64d824f05 100644
--- a/deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
+++ b/deploy-manage/monitor/autoops/ec-autoops-template-optimizer.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Template Optimizer [ec-autoops-template-optimizer]
diff --git a/deploy-manage/monitor/cloud-health-perf.md b/deploy-manage/monitor/cloud-health-perf.md
index 8a5436ddd..e8e7cdddb 100644
--- a/deploy-manage/monitor/cloud-health-perf.md
+++ b/deploy-manage/monitor/cloud-health-perf.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: Cloud deployment health
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/monitor-elasticsearch-cluster.html
-navigation_title: "Cloud deployment health"
 applies_to:
   deployment:
     ess: all
     ece: all
+products:
+  - id: elasticsearch
 ---
 
 # Cloud deployment health and performance metrics
diff --git a/deploy-manage/monitor/ec-memory-pressure.md b/deploy-manage/monitor/ec-memory-pressure.md
index 899d0ee63..7880b0be5 100644
--- a/deploy-manage/monitor/ec-memory-pressure.md
+++ b/deploy-manage/monitor/ec-memory-pressure.md
@@ -6,6 +6,8 @@ applies_to:
   deployment:
     ess: all
     ece: all
+products:
+  - id: cloud-hosted
 ---
 
 # JVM memory pressure indicator [ec-memory-pressure]
diff --git a/deploy-manage/monitor/kibana-task-manager-health-monitoring.md b/deploy-manage/monitor/kibana-task-manager-health-monitoring.md
index 3141318ef..17eea5005 100644
--- a/deploy-manage/monitor/kibana-task-manager-health-monitoring.md
+++ b/deploy-manage/monitor/kibana-task-manager-health-monitoring.md
@@ -4,6 +4,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/task-manager-health-monitoring.html
 applies_to:
   stack: preview
+products:
+  - id: kibana
 ---
 
 # {{kib}} task manager health monitoring [task-manager-health-monitoring]
diff --git a/deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md b/deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
index 24286d004..58d61a531 100644
--- a/deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
+++ b/deploy-manage/monitor/logging-configuration/elasticsearch-deprecation-logs.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} deprecation logs [logging]
diff --git a/deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md b/deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
index 689d0c51f..404b34de8 100644
--- a/deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
+++ b/deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} log4j configuration [logging]
diff --git a/deploy-manage/monitor/logging-configuration/kib-advanced-logging.md b/deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
index 5b94a6955..e5746ddf6 100644
--- a/deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
+++ b/deploy-manage/monitor/logging-configuration/kib-advanced-logging.md
@@ -6,6 +6,8 @@ applies_to:
     self:
     ece:
     eck:
+products:
+  - id: kibana
 ---
 
 # Advanced {{kib}} logging settings
diff --git a/deploy-manage/monitor/logging-configuration/kibana-log-levels.md b/deploy-manage/monitor/logging-configuration/kibana-log-levels.md
index 06ba60065..fcd3d7215 100644
--- a/deploy-manage/monitor/logging-configuration/kibana-log-levels.md
+++ b/deploy-manage/monitor/logging-configuration/kibana-log-levels.md
@@ -1,9 +1,9 @@
 ---
 applies_to:
   deployment:
-    self: 
+    self:
     eck:
-    ece: 
+    ece:
     ess:
 ---
 
diff --git a/deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md b/deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
index 7123d159d..0791c58e0 100644
--- a/deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
+++ b/deploy-manage/monitor/logging-configuration/kibana-log-settings-examples.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 # Examples [log-settings-examples]
diff --git a/deploy-manage/monitor/logging-configuration/kibana-logging.md b/deploy-manage/monitor/logging-configuration/kibana-logging.md
index 788f64d8a..af7be0ca8 100644
--- a/deploy-manage/monitor/logging-configuration/kibana-logging.md
+++ b/deploy-manage/monitor/logging-configuration/kibana-logging.md
@@ -3,10 +3,12 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/logging-configuration.html
 applies_to:
   deployment:
-    self: 
+    self:
     eck:
-    ece: 
+    ece:
     ess:
+products:
+  - id: kibana
 ---
 
 # {{kib}} logging [logging-configuration]
diff --git a/deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md b/deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
index f3417c0d1..590ecefcc 100644
--- a/deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
+++ b/deploy-manage/monitor/logging-configuration/update-elasticsearch-logging-levels.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Update {{es}} logging levels [logging]
diff --git a/deploy-manage/monitor/monitoring-data/beats-page.md b/deploy-manage/monitor/monitoring-data/beats-page.md
index 87f7482a0..3e01d8665 100644
--- a/deploy-manage/monitor/monitoring-data/beats-page.md
+++ b/deploy-manage/monitor/monitoring-data/beats-page.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md b/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
index 60748dcd6..466b85c6c 100644
--- a/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
+++ b/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-elastic-agent.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Configuring data streams created by Elastic Agent [config-monitoring-data-streams-elastic-agent]
diff --git a/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md b/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
index 2cbe1dcc0..cdcd2a710 100644
--- a/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
+++ b/deploy-manage/monitor/monitoring-data/config-monitoring-data-streams-metricbeat-8.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Configuring data streams created by Metricbeat 8 [config-monitoring-data-streams-metricbeat-8]
diff --git a/deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md b/deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
index ea443fff9..5f76c0244 100644
--- a/deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
+++ b/deploy-manage/monitor/monitoring-data/config-monitoring-indices-metricbeat-7-internal-collection.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Configuring indices created by Metricbeat 7 or internal collection [config-monitoring-indices-metricbeat-7-internal-collection]
diff --git a/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md b/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
index 549819e86..ef8ae826a 100644
--- a/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
+++ b/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md
@@ -8,6 +8,9 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: cloud-hosted
+  - id: kibana
 ---
 
 # Stack monitoring alerts [kibana-alerts]
diff --git a/deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md b/deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
index 98a656162..a47ca7026 100644
--- a/deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
+++ b/deploy-manage/monitor/monitoring-data/configuring-data-streamsindices-for-monitoring.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Configuring monitoring data streams and indices [config-monitoring-indices]
diff --git a/deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md b/deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
index dda0e9815..92c475465 100644
--- a/deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
+++ b/deploy-manage/monitor/monitoring-data/elasticsearch-metrics.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/monitoring-data/kibana-page.md b/deploy-manage/monitor/monitoring-data/kibana-page.md
index d631408bf..abe257805 100644
--- a/deploy-manage/monitor/monitoring-data/kibana-page.md
+++ b/deploy-manage/monitor/monitoring-data/kibana-page.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/monitoring-data/logstash-page.md b/deploy-manage/monitor/monitoring-data/logstash-page.md
index ed49ac1de..fb7b31dcd 100644
--- a/deploy-manage/monitor/monitoring-data/logstash-page.md
+++ b/deploy-manage/monitor/monitoring-data/logstash-page.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md b/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
index 4bdfbfb38..af7cb6579 100644
--- a/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
+++ b/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Troubleshooting"
+navigation_title: Troubleshooting
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/monitor-troubleshooting.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 % this page probably needs to be moved
diff --git a/deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md b/deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
index 08e1fe4aa..c843419be 100644
--- a/deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
+++ b/deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 # Visualizing monitoring data [xpack-monitoring]
diff --git a/deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md b/deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
index 113434ef2..40c70e2b0 100644
--- a/deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
+++ b/deploy-manage/monitor/orchestrators/ece-monitoring-ece-access.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Platform monitoring deployment logs and metrics [ece-monitoring-ece-access]
diff --git a/deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md b/deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
index 0d41177a3..972d55b5f 100644
--- a/deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
+++ b/deploy-manage/monitor/orchestrators/ece-monitoring-ece-set-retention.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Set the retention period for logging and metrics indices [ece-monitoring-ece-set-retention]
diff --git a/deploy-manage/monitor/orchestrators/ece-platform-monitoring.md b/deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
index db4e39ea7..a5a72f665 100644
--- a/deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
+++ b/deploy-manage/monitor/orchestrators/ece-platform-monitoring.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # ECE platform monitoring [ece-monitoring-ece]
diff --git a/deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md b/deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
index eaf308693..2bf9fe21e 100644
--- a/deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
+++ b/deploy-manage/monitor/orchestrators/ece-proxy-log-fields.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Proxy log fields [ece-proxy-log-fields]
diff --git a/deploy-manage/monitor/orchestrators/eck-metrics-configuration.md b/deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
index e6c656507..e55053979 100644
--- a/deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
+++ b/deploy-manage/monitor/orchestrators/eck-metrics-configuration.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # ECK operator metrics [k8s-configure-operator-metrics]
diff --git a/deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md b/deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
index f530ae73d..9d01da5ed 100644
--- a/deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
+++ b/deploy-manage/monitor/orchestrators/k8s-enabling-metrics-endpoint.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Enabling the metrics endpoint [k8s-enabling-the-metrics-endpoint]
diff --git a/deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md b/deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
index a87ef8755..82b25ae04 100644
--- a/deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
+++ b/deploy-manage/monitor/orchestrators/k8s-prometheus-requirements.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Prometheus requirements [k8s-prometheus-requirements]
diff --git a/deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md b/deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
index 6955cfc0b..2b60965cd 100644
--- a/deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
+++ b/deploy-manage/monitor/orchestrators/k8s-securing-metrics-endpoint.md
@@ -3,7 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-securing-the-metrics-endpoint.html
 applies_to:
   deployment:
-    eck: 
+    eck:
+products:
+  - id: cloud-kubernetes
 ---
 
 # Securing the metrics endpoint [k8s-securing-the-metrics-endpoint]
diff --git a/deploy-manage/monitor/stack-monitoring.md b/deploy-manage/monitor/stack-monitoring.md
index a7b8e7297..4a3bf2961 100644
--- a/deploy-manage/monitor/stack-monitoring.md
+++ b/deploy-manage/monitor/stack-monitoring.md
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Stack monitoring
diff --git a/deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md b/deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
index 6335ecdb9..8aa6f575c 100644
--- a/deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
+++ b/deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Collecting log data with {{filebeat}}"
+navigation_title: Collecting log data with {{filebeat}}
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/configuring-filebeat.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md b/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
index a32b933b3..47180bf43 100644
--- a/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
+++ b/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Collecting monitoring data with {{agent}}"
+navigation_title: Collecting monitoring data with {{agent}}
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/configuring-elastic-agent.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md b/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
index 98abde274..f15adb0f6 100644
--- a/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
+++ b/deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Collecting monitoring data with {{metricbeat}}"
+navigation_title: Collecting monitoring data with {{metricbeat}}
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/configuring-metricbeat.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md b/deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
index 2c67b8a04..06bdf8721 100644
--- a/deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
+++ b/deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Enable on ECH and ECE"
+navigation_title: Enable on ECH and ECE
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-logging-and-monitoring.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-restrictions-monitoring.html
@@ -13,6 +13,9 @@ applies_to:
   deployment:
     ece: all
     ess: all
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Enable stack monitoring on ECH and ECE deployments
@@ -26,11 +29,11 @@ Monitoring consists of two components:
 
 * A monitoring and logging agent that is installed on each node in your deployment. The agents collect and index metrics to {{es}}, either on the same deployment or by sending logs and metrics to an external monitoring deployment. Elastic manages the installation and configuration of the monitoring agent for you, and you should not modify any of the settings.
 * The stack monitoring application in {{kib}} that visualizes the monitoring metrics through a dashboard, and the logs application that allows you to search and analyze deployment logs.
-  
+
 With logging and monitoring enabled for a deployment, metrics are collected for {{es}}, {{kib}}, and APM with Fleet Server.
 
 :::{admonition} Simplify monitoring with AutoOps
-If you’re using {{ech}}, then you can use AutoOps to monitor your cluster. AutoOps significantly simplifies cluster management with performance recommendations, resource utilization visibility, real-time issue detection and resolution paths. 
+If you’re using {{ech}}, then you can use AutoOps to monitor your cluster. AutoOps significantly simplifies cluster management with performance recommendations, resource utilization visibility, real-time issue detection and resolution paths.
 
 For more information, refer to [Monitor with AutoOps](/deploy-manage/monitor/autoops.md).
 :::
diff --git a/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md b/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
index 31aa948cd..6a12ccdbe 100644
--- a/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
+++ b/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md
@@ -1,15 +1,16 @@
 ---
-navigation_title: "Enable on ECK"
+navigation_title: Enable on ECK
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-stack-monitoring.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_how_it_works.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_when_to_use_it.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_override_the_beats_pod_template.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_connect_to_an_external_monitoring_elasticsearch_cluster.html
-
 applies_to:
   deployment:
     eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Enable stack monitoring on ECK deployments [k8s-stack-monitoring]
diff --git a/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md b/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
index ea32712ff..d161058ff 100644
--- a/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
+++ b/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md
@@ -6,6 +6,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Enable stack monitoring for {{es}} on a self-managed cluster
diff --git a/deploy-manage/monitor/stack-monitoring/es-http-exporter.md b/deploy-manage/monitor/stack-monitoring/es-http-exporter.md
index 69a036a9e..cc21845f1 100644
--- a/deploy-manage/monitor/stack-monitoring/es-http-exporter.md
+++ b/deploy-manage/monitor/stack-monitoring/es-http-exporter.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md b/deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
index 4173f4b5e..4071d5bb9 100644
--- a/deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
+++ b/deploy-manage/monitor/stack-monitoring/es-legacy-collection-methods.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Legacy collection methods"
+navigation_title: Legacy collection methods
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/collecting-monitoring-data.html
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/es-local-exporter.md b/deploy-manage/monitor/stack-monitoring/es-local-exporter.md
index 744193d63..250082a9e 100644
--- a/deploy-manage/monitor/stack-monitoring/es-local-exporter.md
+++ b/deploy-manage/monitor/stack-monitoring/es-local-exporter.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 # Local exporters [local-exporter]
diff --git a/deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md b/deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
index 90083b361..6663eb7c1 100644
--- a/deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
+++ b/deploy-manage/monitor/stack-monitoring/es-monitoring-collectors.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md b/deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
index cda2cbaca..faa7cb2fb 100644
--- a/deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
+++ b/deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/es-pause-export.md b/deploy-manage/monitor/stack-monitoring/es-pause-export.md
index 03937ef6e..92cabcde1 100644
--- a/deploy-manage/monitor/stack-monitoring/es-pause-export.md
+++ b/deploy-manage/monitor/stack-monitoring/es-pause-export.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md b/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
index 5d53d673c..74a042eae 100644
--- a/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
+++ b/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Monitoring in a production environment [monitoring-production]
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
index d259df670..c741b0182 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
index 8491b9f95..f3a52c8ff 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Collect monitoring data with {{agent}}"
+navigation_title: Collect monitoring data with {{agent}}
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/monitoring-elastic-agent.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
index 900002544..f70549cf0 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-legacy.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Legacy collection methods"
+navigation_title: Legacy collection methods
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/monitoring-kibana.html
 applies_to:
   deployment:
     self: deprecated 7.16.0
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
index 8bca337f1..615a67e43 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-metricbeat.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Collect monitoring data with {{metricbeat}}"
+navigation_title: Collect monitoring data with {{metricbeat}}
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/monitoring-metricbeat.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
index 5d3885c87..04208ea25 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-self-managed.md
@@ -3,7 +3,10 @@ navigation_title: "Self-managed: {{kib}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/configuring-monitoring.html
 applies_to:
-  self: all
+  deployment:
+    self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/production-guidance.md b/deploy-manage/production-guidance.md
index 8333ef247..2c177d514 100644
--- a/deploy-manage/production-guidance.md
+++ b/deploy-manage/production-guidance.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: cloud-hosted
 ---
 
 % scope: the scope of this page is just a brief introduction to prod guidance at {{stack}} level, links to ES and KIB,
diff --git a/deploy-manage/production-guidance/availability-and-resilience.md b/deploy-manage/production-guidance/availability-and-resilience.md
index 7669684fc..633f27ff3 100644
--- a/deploy-manage/production-guidance/availability-and-resilience.md
+++ b/deploy-manage/production-guidance/availability-and-resilience.md
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Design for resilience [high-availability-cluster-design]
diff --git a/deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md b/deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
index 4f64e8d0c..73346e9f9 100644
--- a/deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
+++ b/deploy-manage/production-guidance/availability-and-resilience/resilience-in-larger-clusters.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     self: all
     eck: all
+products:
+  - id: elasticsearch
 ---
 
 # Resilience in larger clusters [high-availability-cluster-design-large-clusters]
diff --git a/deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md b/deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
index 6736ea6a6..ae5fe61cf 100644
--- a/deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
+++ b/deploy-manage/production-guidance/availability-and-resilience/resilience-in-small-clusters.md
@@ -5,6 +5,8 @@ applies_to:
   deployment:
     self: all
     eck: all
+products:
+  - id: elasticsearch
 ---
 
 # Resilience in small clusters [high-availability-cluster-small-clusters]
diff --git a/deploy-manage/production-guidance/elasticsearch-in-production-environments.md b/deploy-manage/production-guidance/elasticsearch-in-production-environments.md
index 9d4fcc21a..5695f8ab3 100644
--- a/deploy-manage/production-guidance/elasticsearch-in-production-environments.md
+++ b/deploy-manage/production-guidance/elasticsearch-in-production-environments.md
@@ -10,6 +10,9 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
+  - id: cloud-hosted
 ---
 
 # Run {{es}} in production [scalability]
@@ -60,7 +63,7 @@ The following topics, covered in other sections of the documentation, offer valu
   [Elastic integrations](https://www.elastic.co/integrations) provide default index lifecycle policies, and you can [build your own policies for your custom integrations](/manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md).
   ::::
 
-### Security and monitoring [security-and-monitoring] 
+### Security and monitoring [security-and-monitoring]
 
 As with any enterprise system, you need tools to secure, manage, and monitor your deployments. Security, monitoring, and administrative features that are integrated into {{es}} enable you to use [Kibana](/get-started/the-stack.md) as a control center for managing a cluster.
 
diff --git a/deploy-manage/production-guidance/general-recommendations.md b/deploy-manage/production-guidance/general-recommendations.md
index c149d48e4..853e71f7a 100644
--- a/deploy-manage/production-guidance/general-recommendations.md
+++ b/deploy-manage/production-guidance/general-recommendations.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # General recommendations [general-recommendations]
diff --git a/deploy-manage/production-guidance/kibana-alerting-production-considerations.md b/deploy-manage/production-guidance/kibana-alerting-production-considerations.md
index d94be048c..dcb5c5b51 100644
--- a/deploy-manage/production-guidance/kibana-alerting-production-considerations.md
+++ b/deploy-manage/production-guidance/kibana-alerting-production-considerations.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Optimize alerting performance"
+navigation_title: Optimize alerting performance
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/alerting-production-considerations.html
 applies_to:
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 
diff --git a/deploy-manage/production-guidance/kibana-configure-memory.md b/deploy-manage/production-guidance/kibana-configure-memory.md
index 9cbd4222d..56cfa13cf 100644
--- a/deploy-manage/production-guidance/kibana-configure-memory.md
+++ b/deploy-manage/production-guidance/kibana-configure-memory.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Configure memory"
+navigation_title: Configure memory
 applies_to:
   deployment:
     self: all
diff --git a/deploy-manage/production-guidance/kibana-in-production-environments.md b/deploy-manage/production-guidance/kibana-in-production-environments.md
index 68c8e15df..2090c0a01 100644
--- a/deploy-manage/production-guidance/kibana-in-production-environments.md
+++ b/deploy-manage/production-guidance/kibana-in-production-environments.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Run {{kib}} in production"
+navigation_title: Run {{kib}} in production
 applies_to:
   deployment:
     ess: all
diff --git a/deploy-manage/production-guidance/kibana-load-balance-traffic.md b/deploy-manage/production-guidance/kibana-load-balance-traffic.md
index f3afe0412..9648bd8c9 100644
--- a/deploy-manage/production-guidance/kibana-load-balance-traffic.md
+++ b/deploy-manage/production-guidance/kibana-load-balance-traffic.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "High availability and load balancing"
+navigation_title: High availability and load balancing
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/production.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 # High Availability and load balancing in Kibana
diff --git a/deploy-manage/production-guidance/kibana-reporting-production-considerations.md b/deploy-manage/production-guidance/kibana-reporting-production-considerations.md
index 8a619c67a..11b865372 100644
--- a/deploy-manage/production-guidance/kibana-reporting-production-considerations.md
+++ b/deploy-manage/production-guidance/kibana-reporting-production-considerations.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Reporting production considerations"
+navigation_title: Reporting production considerations
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/reporting-production-considerations.html
 applies_to:
   deployment:
     self: all
+products:
+  - id: kibana
 ---
 
 # {{kib}} reporting in production environments [reporting-production-considerations]
diff --git a/deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md b/deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
index ee62a1772..dca6d681a 100644
--- a/deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
+++ b/deploy-manage/production-guidance/kibana-task-manager-scaling-considerations.md
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 # {{kib}} task manager: performance and scaling guide [task-manager-production-considerations]
diff --git a/deploy-manage/production-guidance/optimize-performance.md b/deploy-manage/production-guidance/optimize-performance.md
index 49994d511..1012ca025 100644
--- a/deploy-manage/production-guidance/optimize-performance.md
+++ b/deploy-manage/production-guidance/optimize-performance.md
@@ -8,6 +8,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} performance optimizations [how-to]
diff --git a/deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md b/deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
index d0d4b6765..85f9ae8c8 100644
--- a/deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
+++ b/deploy-manage/production-guidance/optimize-performance/approximate-knn-search.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Tune approximate kNN search [tune-knn-search]
diff --git a/deploy-manage/production-guidance/optimize-performance/disk-usage.md b/deploy-manage/production-guidance/optimize-performance/disk-usage.md
index b7ff869a6..80870b816 100644
--- a/deploy-manage/production-guidance/optimize-performance/disk-usage.md
+++ b/deploy-manage/production-guidance/optimize-performance/disk-usage.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Tune for disk usage [tune-for-disk-usage]
diff --git a/deploy-manage/production-guidance/optimize-performance/indexing-speed.md b/deploy-manage/production-guidance/optimize-performance/indexing-speed.md
index f50e4ea17..394025a18 100644
--- a/deploy-manage/production-guidance/optimize-performance/indexing-speed.md
+++ b/deploy-manage/production-guidance/optimize-performance/indexing-speed.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Tune for indexing speed [tune-for-indexing-speed]
diff --git a/deploy-manage/production-guidance/optimize-performance/search-speed.md b/deploy-manage/production-guidance/optimize-performance/search-speed.md
index 056b4f0f9..fff7f0de6 100644
--- a/deploy-manage/production-guidance/optimize-performance/search-speed.md
+++ b/deploy-manage/production-guidance/optimize-performance/search-speed.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Tune for search speed [tune-for-search-speed]
diff --git a/deploy-manage/production-guidance/optimize-performance/size-shards.md b/deploy-manage/production-guidance/optimize-performance/size-shards.md
index 03948f5ec..3143608d1 100644
--- a/deploy-manage/production-guidance/optimize-performance/size-shards.md
+++ b/deploy-manage/production-guidance/optimize-performance/size-shards.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Size your shards
diff --git a/deploy-manage/reference-architectures.md b/deploy-manage/reference-architectures.md
index 3ad1abeef..088a162ee 100644
--- a/deploy-manage/reference-architectures.md
+++ b/deploy-manage/reference-architectures.md
@@ -8,6 +8,10 @@ applies_to:
     ess: all
     ece: all
     eck: all
+products:
+  - id: cloud-enterprise
+  - id: cloud-kubernetes
+  - id: cloud-hosted
 ---
 
 # Reference architectures [reference-architectures-overview]
diff --git a/deploy-manage/reference-architectures/hotfrozen-high-availability.md b/deploy-manage/reference-architectures/hotfrozen-high-availability.md
index 24cd973c4..cbf3490d0 100644
--- a/deploy-manage/reference-architectures/hotfrozen-high-availability.md
+++ b/deploy-manage/reference-architectures/hotfrozen-high-availability.md
@@ -7,6 +7,10 @@ applies_to:
     ess: all
     ece: all
     eck: all
+products:
+  - id: cloud-enterprise
+  - id: cloud-kubernetes
+  - id: cloud-hosted
 ---
 
 # Hot/Frozen - High Availability [hot-frozen-architecture]
diff --git a/deploy-manage/remote-clusters.md b/deploy-manage/remote-clusters.md
index a8fc77f59..0d69b96ef 100644
--- a/deploy-manage/remote-clusters.md
+++ b/deploy-manage/remote-clusters.md
@@ -5,7 +5,7 @@ applies_to:
     eck: ga
     ess: ga
     self: ga
-    serverless: unavailable
+  serverless: unavailable
 ---
 
 # Remote clusters [remote-clusters]
diff --git a/deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md b/deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
index 383fa133e..c79f6ccb0 100644
--- a/deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
+++ b/deploy-manage/remote-clusters/ec-edit-remove-trusted-environment.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-edit-remove-trusted-environment.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-edit-remove-trusted-environment.html
+products:
+  - id: cloud-hosted
 ---
 
 # Edit or remove a trusted environment [ec-edit-remove-trusted-environment]
diff --git a/deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md b/deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
index 25ffa5a6e..ee9bd6382 100644
--- a/deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
+++ b/deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With {{eck}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs-for-eck.html
 applies_to:
   deployment:
     ess: ga
     eck: ga
-navigation_title: With {{eck}}
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs-for-eck.html
+products:
+  - id: cloud-hosted
 ---
 
 # Remote clusters between {{ech}} and ECK [ec-enable-ccs-for-eck]
diff --git a/deploy-manage/remote-clusters/ec-enable-ccs.md b/deploy-manage/remote-clusters/ec-enable-ccs.md
index 94c1335cd..5d450b005 100644
--- a/deploy-manage/remote-clusters/ec-enable-ccs.md
+++ b/deploy-manage/remote-clusters/ec-enable-ccs.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 navigation_title: Elastic Cloud Hosted
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Remote clusters with {{ech}} [ec-enable-ccs]
diff --git a/deploy-manage/remote-clusters/ec-migrate-ccs.md b/deploy-manage/remote-clusters/ec-migrate-ccs.md
index 8c901c08e..e4bc65e53 100644
--- a/deploy-manage/remote-clusters/ec-migrate-ccs.md
+++ b/deploy-manage/remote-clusters/ec-migrate-ccs.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Migrate the CCS deployment template
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-migrate-ccs.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-migrate-ccs.html
-navigation_title: "Migrate the CCS deployment template"
+products:
+  - id: cloud-hosted
 ---
 
 # Migrate the cross-cluster search deployment template [ec-migrate-ccs]
diff --git a/deploy-manage/remote-clusters/ec-remote-cluster-ece.md b/deploy-manage/remote-clusters/ec-remote-cluster-ece.md
index 464303a64..e4bcc4785 100644
--- a/deploy-manage/remote-clusters/ec-remote-cluster-ece.md
+++ b/deploy-manage/remote-clusters/ec-remote-cluster-ece.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With {{ece}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-ece.html
 applies_to:
   deployment:
     ess: ga
     ece: ga
-navigation_title: With {{ece}}
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-ece.html
+products:
+  - id: cloud-hosted
 ---
 
 # Access deployments of an {{ece}} environment [ec-remote-cluster-ece]
diff --git a/deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md b/deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
index 94668183f..15d0daa70 100644
--- a/deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
+++ b/deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 navigation_title: With a different {{ecloud}} organization
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-other-ess.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Access deployments of another {{ecloud}} organization [ec-remote-cluster-other-ess]
diff --git a/deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md b/deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
index 3adced22d..0ea281515 100644
--- a/deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
+++ b/deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 navigation_title: Within the same {{ecloud}} organization
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-same-ess.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Access other deployments of the same {{ecloud}} organization [ec-remote-cluster-same-ess]
diff --git a/deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md b/deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
index f7c89d426..75ae3b3e8 100644
--- a/deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
+++ b/deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With a self-managed cluster
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-self-managed.html
 applies_to:
   deployment:
     ess: ga
     self: ga
-navigation_title: With a self-managed cluster
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-self-managed.html
+products:
+  - id: cloud-hosted
 ---
 
 # Access clusters of a self-managed environment [ec-remote-cluster-self-managed]
diff --git a/deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md b/deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
index 44bcd4e1d..2400457cc 100644
--- a/deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
+++ b/deploy-manage/remote-clusters/ece-edit-remove-trusted-environment.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-edit-remove-trusted-environment.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-edit-remove-trusted-environment.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Edit or remove a trusted environment [ece-edit-remove-trusted-environment]
diff --git a/deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md b/deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
index 5fbc6611c..06a14d916 100644
--- a/deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
+++ b/deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With {{eck}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-ccs-for-eck.html
 applies_to:
   deployment:
     ece: ga
     eck: ga
-navigation_title: With {{eck}}
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-ccs-for-eck.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Remote clusters between {{ece}} and ECK [ece-enable-ccs-for-eck]
diff --git a/deploy-manage/remote-clusters/ece-enable-ccs.md b/deploy-manage/remote-clusters/ece-enable-ccs.md
index eab268c98..e966138d6 100644
--- a/deploy-manage/remote-clusters/ece-enable-ccs.md
+++ b/deploy-manage/remote-clusters/ece-enable-ccs.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: ga
 navigation_title: Elastic Cloud Enterprise
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-ccs.html
+applies_to:
+  deployment:
+    ece: ga
+products:
+  - id: cloud-enterprise
 ---
 
 # Remote clusters with {{ece}} [ece-enable-ccs]
diff --git a/deploy-manage/remote-clusters/ece-migrate-ccs.md b/deploy-manage/remote-clusters/ece-migrate-ccs.md
index b54d269fc..b1929f104 100644
--- a/deploy-manage/remote-clusters/ece-migrate-ccs.md
+++ b/deploy-manage/remote-clusters/ece-migrate-ccs.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Migrate the CCS deployment template
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-ccs.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-ccs.html
-navigation_title: "Migrate the CCS deployment template"
+products:
+  - id: cloud-enterprise
 ---
 
 # Migrate the cross-cluster search deployment template [ece-migrate-ccs]
diff --git a/deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md b/deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
index 4c0805c62..617df55ed 100644
--- a/deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
+++ b/deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With {{ecloud}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-ece-ess.html
 applies_to:
   deployment:
     ece: ga
     ess: ga
-navigation_title: With {{ecloud}}
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-ece-ess.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Access deployments of an {{ecloud}} organization [ece-remote-cluster-ece-ess]
diff --git a/deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md b/deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
index 0f83c4804..c305b7559 100644
--- a/deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
+++ b/deploy-manage/remote-clusters/ece-remote-cluster-other-ece.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: ga
 navigation_title: With a different ECE environment
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-other-ece.html
+applies_to:
+  deployment:
+    ece: ga
+products:
+  - id: cloud-enterprise
 ---
 
 # Access deployments of another {{ece}} environment [ece-remote-cluster-other-ece]
diff --git a/deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md b/deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
index 3fa409911..ce88e22ce 100644
--- a/deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
+++ b/deploy-manage/remote-clusters/ece-remote-cluster-same-ece.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ece: ga
 navigation_title: Within the same ECE environment
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-same-ece.html
+applies_to:
+  deployment:
+    ece: ga
+products:
+  - id: cloud-enterprise
 ---
 
 # Access other deployments of the same {{ece}} environment [ece-remote-cluster-same-ece]
diff --git a/deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md b/deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
index cf202d3b1..43b64eb6b 100644
--- a/deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
+++ b/deploy-manage/remote-clusters/ece-remote-cluster-self-managed.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: With a self-managed cluster
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-self-managed.html
 applies_to:
   deployment:
     ece: ga
     self: ga
-navigation_title: With a self-managed cluster
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-self-managed.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Access clusters of a self-managed environment [ece-remote-cluster-self-managed]
diff --git a/deploy-manage/remote-clusters/eck-remote-clusters.md b/deploy-manage/remote-clusters/eck-remote-clusters.md
index ace4a7b53..4340e004e 100644
--- a/deploy-manage/remote-clusters/eck-remote-clusters.md
+++ b/deploy-manage/remote-clusters/eck-remote-clusters.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    eck: ga
 navigation_title: Elastic Cloud on Kubernetes
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-remote-clusters.html
+applies_to:
+  deployment:
+    eck: ga
+products:
+  - id: cloud-kubernetes
 ---
 
 # Remote clusters with {{eck}} [k8s-remote-clusters]
diff --git a/deploy-manage/remote-clusters/remote-clusters-api-key.md b/deploy-manage/remote-clusters/remote-clusters-api-key.md
index 26c70b387..1e5a3394a 100644
--- a/deploy-manage/remote-clusters/remote-clusters-api-key.md
+++ b/deploy-manage/remote-clusters/remote-clusters-api-key.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-api-key.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-api-key.html
+products:
+  - id: elasticsearch
 ---
 
 # Add remote clusters using API key authentication [remote-clusters-api-key]
diff --git a/deploy-manage/remote-clusters/remote-clusters-cert.md b/deploy-manage/remote-clusters/remote-clusters-cert.md
index b3266c84b..18c8cc945 100644
--- a/deploy-manage/remote-clusters/remote-clusters-cert.md
+++ b/deploy-manage/remote-clusters/remote-clusters-cert.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-cert.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-cert.html
+products:
+  - id: elasticsearch
 ---
 
 # Add remote clusters using TLS certificate authentication [remote-clusters-cert]
diff --git a/deploy-manage/remote-clusters/remote-clusters-migrate.md b/deploy-manage/remote-clusters/remote-clusters-migrate.md
index fd8eec424..f7cfbdb45 100644
--- a/deploy-manage/remote-clusters/remote-clusters-migrate.md
+++ b/deploy-manage/remote-clusters/remote-clusters-migrate.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Migrate from certificate to API key authentication
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-migrate.html
 applies_to:
   deployment:
     self: ga
-navigation_title: "Migrate from certificate to API key authentication"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-migrate.html
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/remote-clusters/remote-clusters-self-managed.md b/deploy-manage/remote-clusters/remote-clusters-self-managed.md
index 624fb4e0c..9dd61c2f0 100644
--- a/deploy-manage/remote-clusters/remote-clusters-self-managed.md
+++ b/deploy-manage/remote-clusters/remote-clusters-self-managed.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    self: ga
 navigation_title: Self-managed {{stack}}
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
 ---
 
 # Remote clusters with self-managed installations [remote-clusters]
diff --git a/deploy-manage/remote-clusters/remote-clusters-settings.md b/deploy-manage/remote-clusters/remote-clusters-settings.md
index 08ccce555..08860567f 100644
--- a/deploy-manage/remote-clusters/remote-clusters-settings.md
+++ b/deploy-manage/remote-clusters/remote-clusters-settings.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-settings.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-settings.html
+products:
+  - id: elasticsearch
 ---
 
 # Remote cluster settings [remote-clusters-settings]
diff --git a/deploy-manage/security.md b/deploy-manage/security.md
index 96b2aa643..82827fd47 100644
--- a/deploy-manage/security.md
+++ b/deploy-manage/security.md
@@ -1,7 +1,4 @@
 ---
-applies_to:
-  deployment: all
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-files.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/secure-cluster.html
@@ -12,6 +9,15 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/es-security-principles.html
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-technical.html
+applies_to:
+  deployment: all
+  serverless: ga
+products:
+  - id: elasticsearch
+  - id: kibana
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Security
diff --git a/deploy-manage/security/aws-privatelink-traffic-filters.md b/deploy-manage/security/aws-privatelink-traffic-filters.md
index c59da54fc..f9fa30807 100644
--- a/deploy-manage/security/aws-privatelink-traffic-filters.md
+++ b/deploy-manage/security/aws-privatelink-traffic-filters.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-vpc.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-vpc.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # AWS PrivateLink traffic filters
diff --git a/deploy-manage/security/azure-private-link-traffic-filters.md b/deploy-manage/security/azure-private-link-traffic-filters.md
index 346bee2af..f8331fb0b 100644
--- a/deploy-manage/security/azure-private-link-traffic-filters.md
+++ b/deploy-manage/security/azure-private-link-traffic-filters.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-vnet.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-vnet.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Azure Private Link traffic filters
diff --git a/deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md b/deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md
index 170b27070..bad82da34 100644
--- a/deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md
+++ b/deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-claim-traffic-filter-link-id-through-the-api.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-claim-traffic-filter-link-id-through-the-api.html
+products:
+  - id: cloud-hosted
 ---
 
 # Claim traffic filter link ID ownership through the API [ec-claim-traffic-filter-link-id-through-the-api]
diff --git a/deploy-manage/security/different-ca.md b/deploy-manage/security/different-ca.md
index f116d820a..101f0d62c 100644
--- a/deploy-manage/security/different-ca.md
+++ b/deploy-manage/security/different-ca.md
@@ -1,9 +1,12 @@
 ---
-applies_to:
-  self: ga
-navigation_title: "With a different CA"
+navigation_title: With a different CA
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/update-node-certs-different.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/security/ec-traffic-filtering-through-the-api.md b/deploy-manage/security/ec-traffic-filtering-through-the-api.md
index 0b3a352be..27f5a6970 100644
--- a/deploy-manage/security/ec-traffic-filtering-through-the-api.md
+++ b/deploy-manage/security/ec-traffic-filtering-through-the-api.md
@@ -1,11 +1,14 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-through-the-api.html
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-traffic-filtering-through-the-api.html
 applies_to:
   deployment:
     ess:
     ece:
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-through-the-api.html
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-traffic-filtering-through-the-api.html
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Manage traffic filters through the API [ec-traffic-filtering-through-the-api]
diff --git a/deploy-manage/security/eck-tls.md b/deploy-manage/security/eck-tls.md
index cf0ff4619..7d46b3aff 100644
--- a/deploy-manage/security/eck-tls.md
+++ b/deploy-manage/security/eck-tls.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 navigation_title: ECK
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-security.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage TLS certificates on ECK
diff --git a/deploy-manage/security/elastic-cloud-static-ips.md b/deploy-manage/security/elastic-cloud-static-ips.md
index 093d74788..0075aa81d 100644
--- a/deploy-manage/security/elastic-cloud-static-ips.md
+++ b/deploy-manage/security/elastic-cloud-static-ips.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-static-ips.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-static-ips.html
+products:
+  - id: cloud-hosted
 ---
 
 # {{ecloud}} Static IPs [ec-static-ips]
diff --git a/deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md b/deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
index 3fbca5c63..ed6cb98ac 100644
--- a/deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
+++ b/deploy-manage/security/enabling-cipher-suites-for-stronger-encryption.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Enabling cipher suites for stronger encryption [ciphers]
diff --git a/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md b/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
index f4174ae3b..b4ab3f7bf 100644
--- a/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
+++ b/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-encrypt-with-cmek.html
 applies_to:
   deployment:
     ess: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-encrypt-with-cmek.html
+products:
+  - id: cloud-hosted
 ---
 
 # Use a customer-managed encryption key [ec-encrypt-with-cmek]
diff --git a/deploy-manage/security/fips-140-2.md b/deploy-manage/security/fips-140-2.md
index c211feaaa..3ac5fb52a 100644
--- a/deploy-manage/security/fips-140-2.md
+++ b/deploy-manage/security/fips-140-2.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  deployment:
-    self: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fips-140-compliance.html
   - https://www.elastic.co/guide/en/kibana/current/xpack-security-fips-140-2.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # FIPS 140-2 compliance
diff --git a/deploy-manage/security/gcp-private-service-connect-traffic-filters.md b/deploy-manage/security/gcp-private-service-connect-traffic-filters.md
index e46e6b92a..f4c9a2990 100644
--- a/deploy-manage/security/gcp-private-service-connect-traffic-filters.md
+++ b/deploy-manage/security/gcp-private-service-connect-traffic-filters.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-psc.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-psc.html
+applies_to:
+  deployment:
+    ess: ga
+products:
+  - id: cloud-hosted
 ---
 
 # GCP Private Service Connect traffic filters
diff --git a/deploy-manage/security/httprest-clients-security.md b/deploy-manage/security/httprest-clients-security.md
index 9164f7e6d..cecf8c804 100644
--- a/deploy-manage/security/httprest-clients-security.md
+++ b/deploy-manage/security/httprest-clients-security.md
@@ -7,6 +7,8 @@ applies_to:
     eck: all
     ess: all
     ece: all
+products:
+  - id: elasticsearch
 ---
 
 # Securing HTTP client applications
diff --git a/deploy-manage/security/ip-filtering-basic.md b/deploy-manage/security/ip-filtering-basic.md
index 308c0bc81..2382f6376 100644
--- a/deploy-manage/security/ip-filtering-basic.md
+++ b/deploy-manage/security/ip-filtering-basic.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: In ECK and Self Managed
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ip-filtering.html
 applies_to:
   deployment:
     self:
     eck:
-navigation_title: In ECK and Self Managed
+products:
+  - id: elasticsearch
 ---
 
 # Manage IP traffic filters in ECK and self-managed clusters
diff --git a/deploy-manage/security/ip-filtering-cloud.md b/deploy-manage/security/ip-filtering-cloud.md
index 4078555ba..58c95240b 100644
--- a/deploy-manage/security/ip-filtering-cloud.md
+++ b/deploy-manage/security/ip-filtering-cloud.md
@@ -1,20 +1,23 @@
 ---
+navigation_title: In ECH or ECE
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-traffic-filtering-ip.html
   - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-ip.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-ip.html
 applies_to:
-  deployment: 
+  deployment:
     ess: ga
     ece: ga
-navigation_title: In ECH or ECE
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Manage IP traffic filters in ECH or ECE
 
-Traffic filtering, by IP address or CIDR block, is one of the security layers available in {{ece}} and {{ech}}. It allows you to limit how your deployments can be accessed. 
+Traffic filtering, by IP address or CIDR block, is one of the security layers available in {{ece}} and {{ech}}. It allows you to limit how your deployments can be accessed.
 
-There are types of filters are available for filtering by IP address or CIDR block: 
+There are types of filters are available for filtering by IP address or CIDR block:
 
 * **Ingress or inbound IP filters**: These restrict access to your deployments from a set of IP addresses or CIDR blocks. These filters are available through the UI.
 * **Egress or outbound IP filters** (ECH only): These restrict the set of IP addresses or CIDR blocks accessible from your deployment. These might be used to restrict access to a certain region or service. This feature is in beta and is currently only available through the [Traffic Filtering API](/deploy-manage/security/ec-traffic-filtering-through-the-api.md).
@@ -25,7 +28,7 @@ To learn how traffic filter rules work together, refer to [traffic filter rules]
 
 To learn how to manage IP traffic filters using the Traffic Filtering API, refer to [](/deploy-manage/security/ec-traffic-filtering-through-the-api.md).
 
-:::{note} 
+:::{note}
 To learn how to create IP traffic filters for self-managed clusters or {{eck}} deployments, refer to [](ip-filtering-basic.md).
 :::
 
@@ -35,7 +38,7 @@ deployment:
   ece:
 ```
 
-On {{ece}}, make sure your [load balancer](/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md) handles the `X-Forwarded-For` header appropriately for HTTP requests to prevent IP address spoofing. Make sure the proxy protocol v2 is enabled for HTTP and transport protocols (9243 and 9343). 
+On {{ece}}, make sure your [load balancer](/deploy-manage/deploy/cloud-enterprise/ece-load-balancers.md) handles the `X-Forwarded-For` header appropriately for HTTP requests to prevent IP address spoofing. Make sure the proxy protocol v2 is enabled for HTTP and transport protocols (9243 and 9343).
 
 This step is not required in {{ech}}.
 
@@ -73,13 +76,13 @@ To create a rule set:
 5. Select the region for the rule set.
 6. Select if this rule set should be automatically attached to new deployments.
 
-    ::::{note} 
+    ::::{note}
     Each rule set is bound to a particular region and can be only assigned to deployments in the same region.
     ::::
 
 7.  Add one or more rules using IPv4, or a range of addresses with CIDR.
 
-    ::::{note} 
+    ::::{note}
     DNS names are not supported in rules.
     ::::
 
diff --git a/deploy-manage/security/k8s-https-settings.md b/deploy-manage/security/k8s-https-settings.md
index 4f878a08a..7447eef16 100644
--- a/deploy-manage/security/k8s-https-settings.md
+++ b/deploy-manage/security/k8s-https-settings.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  deployment:
-    eck:
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-tls-certificates.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-custom-http-certificate.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-http-configuration.html
+applies_to:
+  deployment:
+    eck:
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage HTTP certificates on ECK
diff --git a/deploy-manage/security/k8s-network-policies.md b/deploy-manage/security/k8s-network-policies.md
index d785fbf0a..18cf6e9fb 100644
--- a/deploy-manage/security/k8s-network-policies.md
+++ b/deploy-manage/security/k8s-network-policies.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-network-policies.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_prerequisites.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Kubernetes network policies [k8s-network-policies]
diff --git a/deploy-manage/security/k8s-secure-settings.md b/deploy-manage/security/k8s-secure-settings.md
index d4a5490a0..fad30a461 100644
--- a/deploy-manage/security/k8s-secure-settings.md
+++ b/deploy-manage/security/k8s-secure-settings.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-kibana-secure-settings.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-es-secure-settings.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Secure settings on ECK
diff --git a/deploy-manage/security/k8s-transport-settings.md b/deploy-manage/security/k8s-transport-settings.md
index a736c710e..9f21f518b 100644
--- a/deploy-manage/security/k8s-transport-settings.md
+++ b/deploy-manage/security/k8s-transport-settings.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-transport-settings.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-transport-settings.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage transport certificates on ECK [k8s-transport-settings]
diff --git a/deploy-manage/security/kibana-es-mutual-tls.md b/deploy-manage/security/kibana-es-mutual-tls.md
index de36dded8..a0c05f76d 100644
--- a/deploy-manage/security/kibana-es-mutual-tls.md
+++ b/deploy-manage/security/kibana-es-mutual-tls.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: Mutual authentication
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/elasticsearch-mutual-tls.html
 applies_to:
   deployment:
     self: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/elasticsearch-mutual-tls.html
+products:
+  - id: kibana
 ---
 
 # Mutual TLS authentication between {{kib}} and {{es}} [elasticsearch-mutual-tls]
diff --git a/deploy-manage/security/kibana-session-management.md b/deploy-manage/security/kibana-session-management.md
index d26886828..4c3b6d363 100644
--- a/deploy-manage/security/kibana-session-management.md
+++ b/deploy-manage/security/kibana-session-management.md
@@ -1,12 +1,14 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html
 applies_to:
   deployment:
     ess: ga
     ece: ga
     eck: ga
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html
+products:
+  - id: kibana
 ---
 
 # {{kib}} session management [xpack-security-session-management]
diff --git a/deploy-manage/security/limitations.md b/deploy-manage/security/limitations.md
index 0a3cf857e..2eeac58a2 100644
--- a/deploy-manage/security/limitations.md
+++ b/deploy-manage/security/limitations.md
@@ -1,13 +1,15 @@
 ---
-mapped_pages:
-- https://www.elastic.co/guide/en/elasticsearch/reference/current/security-limitations.html
 navigation_title: Limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-limitations.html
 applies_to:
   deployment:
     self: all
     eck: all
     ess: all
     ece: all
+products:
+  - id: elasticsearch
 ---
 
 # Security limitations [security-limitations]
diff --git a/deploy-manage/security/logging-configuration/auditing-search-queries.md b/deploy-manage/security/logging-configuration/auditing-search-queries.md
index f46b1e9e0..1bf4223a6 100644
--- a/deploy-manage/security/logging-configuration/auditing-search-queries.md
+++ b/deploy-manage/security/logging-configuration/auditing-search-queries.md
@@ -8,6 +8,8 @@ applies_to:
     eck: all
     self: all
   serverless: unavailable
+products:
+  - id: elasticsearch
 ---
 
 # Audit {{es}} search queries [auditing-search-queries]
diff --git a/deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md b/deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
index 122a231dc..4f9442b9d 100644
--- a/deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
+++ b/deploy-manage/security/logging-configuration/correlating-kibana-elasticsearch-audit-logs.md
@@ -9,6 +9,8 @@ applies_to:
     eck: all
     self: all
   serverless: unavailable
+products:
+  - id: kibana
 ---
 
 # Correlating audit events [xpack-security-ecs-audit-correlation]
diff --git a/deploy-manage/security/logging-configuration/enabling-audit-logs.md b/deploy-manage/security/logging-configuration/enabling-audit-logs.md
index 278711ba5..43328f8c2 100644
--- a/deploy-manage/security/logging-configuration/enabling-audit-logs.md
+++ b/deploy-manage/security/logging-configuration/enabling-audit-logs.md
@@ -12,6 +12,12 @@ applies_to:
     eck: all
     self: all
   serverless: unavailable
+products:
+  - id: elasticsearch
+  - id: kibana
+  - id: cloud-enterprise
+  - id: cloud-kubernetes
+  - id: cloud-hosted
 ---
 
 # Enable audit logging [enable-audit-logging]
diff --git a/deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md b/deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
index 69e75a29a..e79213fcc 100644
--- a/deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
+++ b/deploy-manage/security/logging-configuration/logfile-audit-events-ignore-policies.md
@@ -9,6 +9,8 @@ applies_to:
     eck: all
     self: all
   serverless: unavailable
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} audit events ignore policies [audit-log-ignore-policy]
diff --git a/deploy-manage/security/logging-configuration/logfile-audit-output.md b/deploy-manage/security/logging-configuration/logfile-audit-output.md
index eb94f5f12..c5f79a485 100644
--- a/deploy-manage/security/logging-configuration/logfile-audit-output.md
+++ b/deploy-manage/security/logging-configuration/logfile-audit-output.md
@@ -9,6 +9,8 @@ applies_to:
     eck: all
     self: all
   serverless: unavailable
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} logfile audit output [audit-log-output]
diff --git a/deploy-manage/security/same-ca.md b/deploy-manage/security/same-ca.md
index f253b534c..a8cdef729 100644
--- a/deploy-manage/security/same-ca.md
+++ b/deploy-manage/security/same-ca.md
@@ -1,9 +1,12 @@
 ---
-applies_to:
-  self: ga
-navigation_title: "With the same CA"
+navigation_title: With the same CA
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/update-node-certs-same.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/security/secure-clients-integrations.md b/deploy-manage/security/secure-clients-integrations.md
index 82819b617..1a8a4a228 100644
--- a/deploy-manage/security/secure-clients-integrations.md
+++ b/deploy-manage/security/secure-clients-integrations.md
@@ -7,6 +7,8 @@ applies_to:
     eck: all
     ess: all
     ece: all
+products:
+  - id: elasticsearch
 ---
 
 # Secure other {{stack}} components 
diff --git a/deploy-manage/security/secure-cluster-communications.md b/deploy-manage/security/secure-cluster-communications.md
index ec0cb2903..c76140a0c 100644
--- a/deploy-manage/security/secure-cluster-communications.md
+++ b/deploy-manage/security/secure-cluster-communications.md
@@ -1,13 +1,16 @@
 ---
 navigation_title: Manage TLS encryption
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup.html
+  - https://www.elastic.co/guide/en/kibana/current/elasticsearch-mutual-tls.html
 applies_to:
   deployment:
     self:
     eck:
     ece:
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup.html
-  - https://www.elastic.co/guide/en/kibana/current/elasticsearch-mutual-tls.html
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 % Scope: landing page for manually handling TLS certificates, and for information about TLS in {{stack}} in general.
diff --git a/deploy-manage/security/secure-saved-objects.md b/deploy-manage/security/secure-saved-objects.md
index 6c48c0601..1c3751eaa 100644
--- a/deploy-manage/security/secure-saved-objects.md
+++ b/deploy-manage/security/secure-saved-objects.md
@@ -1,11 +1,13 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/xpack-security-secure-saved-objects.html
 applies_to:
   deployment:
     ece: ga
     eck: ga
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/xpack-security-secure-saved-objects.html
+products:
+  - id: kibana
 ---
 
 # Secure {{kib}} saved objects [xpack-security-secure-saved-objects]
diff --git a/deploy-manage/security/secure-settings.md b/deploy-manage/security/secure-settings.md
index 15816a683..fe78bd83b 100644
--- a/deploy-manage/security/secure-settings.md
+++ b/deploy-manage/security/secure-settings.md
@@ -1,16 +1,21 @@
 ---
-applies_to:
-  deployment:
-    ess: ga
-    ece: ga
-    eck: ga
-    self: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configuring-keystore.html
   - https://www.elastic.co/guide/en/cloud/current/ec-configuring-keystore.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-configuring-keystore.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/secure-settings.html
   - https://www.elastic.co/guide/en/kibana/current/secure-settings.html
+applies_to:
+  deployment:
+    ess: ga
+    ece: ga
+    eck: ga
+    self: ga
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # Secure your settings
diff --git a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
index 85bb4fd9e..4c10c2cc6 100644
--- a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
+++ b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation.md
@@ -1,10 +1,12 @@
 ---
 navigation_title: "{{ece}}"
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-considerations.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-considerations.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Secure your {{ece}} installation [ece-securing-considerations]
diff --git a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
index b1cf62036..c9257e389 100644
--- a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
+++ b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/allow-x509-certificates-signed-with-sha-1.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-allow-x509-sha1.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-allow-x509-sha1.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Allow x509 Certificates Signed with SHA-1 [ece-allow-x509-sha1]
diff --git a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
index 6f8a79482..74562f032 100644
--- a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
+++ b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/configure-tls-version.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-tls-version.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-tls-version.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure the TLS version [ece-configure-tls-version]
diff --git a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
index f9243d4ae..afd986c80 100644
--- a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
+++ b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-certificates.html
 applies_to:
   deployment:
     ece: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-certificates.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage security certificates [ece-manage-certificates]
diff --git a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
index f56009f9e..e4ca237ce 100644
--- a/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
+++ b/deploy-manage/security/secure-your-elastic-cloud-enterprise-installation/migrate-ece-on-podman-hosts-to-selinux-enforce.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-to-selinux-in-enforcing-mode.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-migrate-to-selinux-in-enforcing-mode.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Migrate ECE on Podman hosts to SELinux enforce [ece-migrate-to-selinux-in-enforcing-mode]
diff --git a/deploy-manage/security/self-auto-setup.md b/deploy-manage/security/self-auto-setup.md
index aba1287b6..ef82075e0 100644
--- a/deploy-manage/security/self-auto-setup.md
+++ b/deploy-manage/security/self-auto-setup.md
@@ -1,13 +1,16 @@
 ---
 navigation_title: Automatic security setup
-applies_to:
-  self: ga
-sub:
-  es-conf: "/etc/elasticsearch"
-  slash: "/"
-  escape: "\\"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/configuring-stack-security.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
+sub:
+  es-conf: /etc/elasticsearch
+  slash: /
+  escape: \
 ---
 
 % Scope: Automatic setup
@@ -21,7 +24,7 @@ mapped_pages:
 In {{es}} RPM and Debian package installations, the `elastic` user password is not output at startup and must be [manually reset](/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md#using-elasticsearch-reset-password).
 :::
 
-To learn how to start {{es}} and {{kib}} with security enabled, follow one of our installation guides. Select the product that you want to install, and then select the guide your preferred installation method: 
+To learn how to start {{es}} and {{kib}} with security enabled, follow one of our installation guides. Select the product that you want to install, and then select the guide your preferred installation method:
 
 * [Install {{es}}](/deploy-manage/deploy/self-managed/installing-elasticsearch.md#installation-methods)
 * [Install {{kib}}](/deploy-manage/deploy/self-managed/install-kibana.md#install)
diff --git a/deploy-manage/security/self-setup.md b/deploy-manage/security/self-setup.md
index 379fe8bd3..2f8236603 100644
--- a/deploy-manage/security/self-setup.md
+++ b/deploy-manage/security/self-setup.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Self-managed security setup"
-applies_to:
-  deployment:
-    self: ga
+navigation_title: Self-managed security setup
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/manually-configure-security.html
   - https://www.elastic.co/guide/en/elastic-stack/current/install-stack-demo-secure.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: elasticsearch
 ---
 
 % scope: initial security setup in self-managed deployments, following the automatic or manual (minimal, basic, https) procedures
diff --git a/deploy-manage/security/self-tls.md b/deploy-manage/security/self-tls.md
index 0690eac65..78fb95f25 100644
--- a/deploy-manage/security/self-tls.md
+++ b/deploy-manage/security/self-tls.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Self-managed"
+navigation_title: Self-managed
 applies_to:
   deployment:
     self: ga
diff --git a/deploy-manage/security/set-up-basic-security-plus-https.md b/deploy-manage/security/set-up-basic-security-plus-https.md
index 29254becb..b96e388d5 100644
--- a/deploy-manage/security/set-up-basic-security-plus-https.md
+++ b/deploy-manage/security/set-up-basic-security-plus-https.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Set up HTTPS"
+navigation_title: Set up HTTPS
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup-https.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup-https.html
+products:
+  - id: elasticsearch
 ---
 
 % Scope: HTTP certificates setup / manual configuration / multi or single node cluster
diff --git a/deploy-manage/security/set-up-basic-security.md b/deploy-manage/security/set-up-basic-security.md
index bfc064867..0da5d5abb 100644
--- a/deploy-manage/security/set-up-basic-security.md
+++ b/deploy-manage/security/set-up-basic-security.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Set up transport TLS"
+navigation_title: Set up transport TLS
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-basic-setup.html
+products:
+  - id: elasticsearch
 ---
 
 % Scope: TLS certificates setup / multi-node cluster / manual configuration
diff --git a/deploy-manage/security/set-up-minimal-security.md b/deploy-manage/security/set-up-minimal-security.md
index b4a0f122d..1b7fd95e1 100644
--- a/deploy-manage/security/set-up-minimal-security.md
+++ b/deploy-manage/security/set-up-minimal-security.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Minimal security setup"
+navigation_title: Minimal security setup
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-minimal-setup.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-minimal-setup.html
+products:
+  - id: elasticsearch
 ---
 
 % Scope: enable security, reset passwords and configure kibana to use authentication. Alternative approach to the automatic security configuration.
diff --git a/deploy-manage/security/supported-ssltls-versions-by-jdk-version.md b/deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
index 677957eae..b0640c0ce 100644
--- a/deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
+++ b/deploy-manage/security/supported-ssltls-versions-by-jdk-version.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Supported SSL/TLS versions by JDK version [jdk-tls-versions]
diff --git a/deploy-manage/security/traffic-filtering.md b/deploy-manage/security/traffic-filtering.md
index 472d95f8c..8d7dae69b 100644
--- a/deploy-manage/security/traffic-filtering.md
+++ b/deploy-manage/security/traffic-filtering.md
@@ -1,5 +1,9 @@
 ---
 navigation_title: Traffic filtering
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-traffic-filtering-deployment-configuration.html
+  - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-deployment-configuration.html
+  - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-deployment-configuration.html
 applies_to:
   deployment:
     ess: ga
@@ -7,10 +11,9 @@ applies_to:
     eck: ga
     self: ga
   serverless: unavailable
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-traffic-filtering-deployment-configuration.html
-  - https://www.elastic.co/guide/en/cloud/current/ec-traffic-filtering-deployment-configuration.html
-  - https://www.elastic.co/guide/en/cloud-heroku/current/ech-traffic-filtering-deployment-configuration.html
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Traffic filtering
diff --git a/deploy-manage/security/updating-certificates.md b/deploy-manage/security/updating-certificates.md
index 1116c4558..7b95cbc97 100644
--- a/deploy-manage/security/updating-certificates.md
+++ b/deploy-manage/security/updating-certificates.md
@@ -4,7 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/update-node-certs.html
 applies_to:
   deployment:
-    self: all  
+    self: all
+products:
+  - id: elasticsearch
 ---
 
 # Update TLS certificates [update-node-certs]
diff --git a/deploy-manage/security/using-kibana-with-security.md b/deploy-manage/security/using-kibana-with-security.md
index c52737498..3bf05ab1f 100644
--- a/deploy-manage/security/using-kibana-with-security.md
+++ b/deploy-manage/security/using-kibana-with-security.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  deployment:
-    self: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html
   - https://www.elastic.co/guide/en/kibana/current/Security-production-considerations.html
+applies_to:
+  deployment:
+    self: ga
+products:
+  - id: kibana
 ---
 
 # Configure security in {{kib}} [using-kibana-with-security]
diff --git a/deploy-manage/stack-settings.md b/deploy-manage/stack-settings.md
index 099dbba13..9877c6fa7 100644
--- a/deploy-manage/stack-settings.md
+++ b/deploy-manage/stack-settings.md
@@ -5,7 +5,11 @@ applies_to:
     eck:
     self:
     ess:
-navigation_title: "Stack settings"
+navigation_title: Stack settings
+products:
+   - id: elastic-stack
+   - id: elasticsearch
+   - id: kibana
 ---
 
 # Elastic Stack settings
diff --git a/deploy-manage/tools.md b/deploy-manage/tools.md
index 132709b20..e24da4d7a 100644
--- a/deploy-manage/tools.md
+++ b/deploy-manage/tools.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/high-availability.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/tools/cross-cluster-replication.md b/deploy-manage/tools/cross-cluster-replication.md
index dcf5e8b2c..6a308a25c 100644
--- a/deploy-manage/tools/cross-cluster-replication.md
+++ b/deploy-manage/tools/cross-cluster-replication.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Cross-cluster replication [xpack-ccr]
diff --git a/deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md b/deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
index 8e8bc8d41..2707f0e9d 100644
--- a/deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
+++ b/deploy-manage/tools/cross-cluster-replication/_configure_privileges_for_cross_cluster_replication_2.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_configure_privileges_for_cross_cluster_replication_2.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Configure privileges for cross-cluster replication [_configure_privileges_for_ccr_2]
diff --git a/deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md b/deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
index 7f27617fb..66018c5f2 100644
--- a/deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
+++ b/deploy-manage/tools/cross-cluster-replication/_connect_to_a_remote_cluster.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_connect_to_a_remote_cluster.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Connect to a remote cluster [_connect_to_a_remote_cluster]
diff --git a/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md b/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
index fe8022fd0..abc59b79b 100644
--- a/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
+++ b/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_failback_when_clustera_comes_back.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Failback when clusterA comes back [_failback_when_clustera_comes_back]
diff --git a/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md b/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
index 205b46fb6..a410f06f5 100644
--- a/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
+++ b/deploy-manage/tools/cross-cluster-replication/_failback_when_clustera_comes_back_2.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_failback_when_clustera_comes_back_2.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Failback when clusterA comes back [_failback_when_clustera_comes_back_2]
diff --git a/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md b/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
index a63b96419..1caaf5845 100644
--- a/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
+++ b/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_failover_when_clustera_is_down.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Failover when clusterA is down [_failover_when_clustera_is_down]
diff --git a/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md b/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
index 25b3a823f..b3f9313b0 100644
--- a/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
+++ b/deploy-manage/tools/cross-cluster-replication/_failover_when_clustera_is_down_2.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_failover_when_clustera_is_down_2.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Failover when clusterA is down [_failover_when_clustera_is_down_2]
diff --git a/deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md b/deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
index 4b7defb7c..7c8915e09 100644
--- a/deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
+++ b/deploy-manage/tools/cross-cluster-replication/_perform_update_or_delete_by_query.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_perform_update_or_delete_by_query.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Perform update or delete by query [_perform_update_or_delete_by_query]
diff --git a/deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md b/deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
index 56c33d736..b22f046e8 100644
--- a/deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
+++ b/deploy-manage/tools/cross-cluster-replication/_prerequisites_14.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_prerequisites_14.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Prerequisites [_prerequisites_14]
diff --git a/deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md b/deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
index d2bb69483..24950dde4 100644
--- a/deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
+++ b/deploy-manage/tools/cross-cluster-replication/bi-directional-disaster-recovery.md
@@ -1,14 +1,15 @@
 ---
-navigation_title: "Bi-directional disaster recovery"
+navigation_title: Bi-directional disaster recovery
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-disaster-recovery-bi-directional-tutorial.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
index 22224954f..fa48ebcd9 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-create.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-auto-follow-create.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Create auto-follow patterns [ccr-auto-follow-create]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
index 7857f51d8..074d09f57 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-delete.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-auto-follow-delete.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Delete auto-follow patterns [ccr-auto-follow-delete]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
index a327cbe61..d79c9f1a7 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-pause.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-auto-follow-pause.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Pause and resume auto-follow patterns [ccr-auto-follow-pause]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
index e21136f72..9d6c970fe 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-auto-follow-retrieve.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-auto-follow-retrieve.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Retrieve auto-follow patterns [ccr-auto-follow-retrieve]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md b/deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
index 4a0ecb748..affde1023 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-bi-directional-upgrade.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-bi-directional-upgrade.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Bi-directional index following [ccr-bi-directional-upgrade]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
index d0bc758b3..f870729dc 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-auto-follow.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-getting-started-auto-follow.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Create an auto-follow pattern to replicate time series indices [ccr-getting-started-auto-follow]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
index c29d3de9b..d607e7ddf 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-follower-index.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-getting-started-follower-index.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Create a follower index to replicate a specific index [ccr-getting-started-follower-index]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
index 31606ae5a..5096f83d8 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-getting-started-prerequisites.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-getting-started-prerequisites.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Prerequisites [ccr-getting-started-prerequisites]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md b/deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
index 398a1deff..919216254 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-inspect-progress.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-inspect-progress.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Inspect replication statistics [ccr-inspect-progress]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md b/deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
index 3a88098c4..ada8a222a 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-pause-replication.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-pause-replication.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Pause and resume replication [ccr-pause-replication]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md b/deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
index 92f9ae5e0..1e5af6f8d 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-recreate-follower-index.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-recreate-follower-index.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Recreate a follower index [ccr-recreate-follower-index]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md b/deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
index c5d805fdf..07c5f5497 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-terminate-replication.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-terminate-replication.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Terminate replication [ccr-terminate-replication]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md b/deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
index 100854979..a3a799cbc 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-tutorial-initial-setup.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-tutorial-initial-setup.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Initial setup [ccr-tutorial-initial-setup]
diff --git a/deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md b/deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
index 96f17fe78..3ef1bb3fc 100644
--- a/deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
+++ b/deploy-manage/tools/cross-cluster-replication/ccr-uni-directional-upgrade.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-uni-directional-upgrade.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Uni-directional index following [ccr-uni-directional-upgrade]
diff --git a/deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md b/deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
index 71c49f8ea..e539913dd 100644
--- a/deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
+++ b/deploy-manage/tools/cross-cluster-replication/manage-auto-follow-patterns.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-auto-follow.html
-
 applies_to:
   deployment:
     eck:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Manage auto-follow patterns [ccr-auto-follow]
diff --git a/deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md b/deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
index 49cd7cf19..aca47fccb 100644
--- a/deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
+++ b/deploy-manage/tools/cross-cluster-replication/manage-cross-cluster-replication.md
@@ -1,13 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-managing.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Manage cross-cluster replication [ccr-managing]
diff --git a/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md b/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
index 3622e9f34..6405a83c9 100644
--- a/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
+++ b/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md
@@ -1,14 +1,15 @@
 ---
-navigation_title: "Set up cross-cluster replication"
+navigation_title: Set up cross-cluster replication
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-getting-started-tutorial.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md b/deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
index fa643e455..17bee45d9 100644
--- a/deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
+++ b/deploy-manage/tools/cross-cluster-replication/uni-directional-disaster-recovery.md
@@ -1,14 +1,15 @@
 ---
-navigation_title: "Uni-directional disaster recovery"
+navigation_title: Uni-directional disaster recovery
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-disaster-recovery-uni-directional-tutorial.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md b/deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
index 19f3c6a8f..e2db1d422 100644
--- a/deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
+++ b/deploy-manage/tools/cross-cluster-replication/upgrading-clusters.md
@@ -1,14 +1,15 @@
 ---
-navigation_title: "Upgrading clusters"
+navigation_title: Upgrading clusters
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-upgrading.html
-
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/deploy-manage/tools/snapshot-and-restore.md b/deploy-manage/tools/snapshot-and-restore.md
index 0a62d49b0..94e17fd19 100644
--- a/deploy-manage/tools/snapshot-and-restore.md
+++ b/deploy-manage/tools/snapshot-and-restore.md
@@ -12,6 +12,10 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Snapshot and restore
diff --git a/deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md b/deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
index 6b5550a7c..6f33b9f8e 100644
--- a/deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/access-isolation-for-found-snapshots-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Access isolation for the found-snapshots repository [ec-snapshot-repository-migration]
diff --git a/deploy-manage/tools/snapshot-and-restore/azure-repository.md b/deploy-manage/tools/snapshot-and-restore/azure-repository.md
index 5cc1c161f..93d741ba6 100644
--- a/deploy-manage/tools/snapshot-and-restore/azure-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/azure-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Azure repository [repository-azure]
diff --git a/deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md b/deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
index 8fd32f80d..7289717ea 100644
--- a/deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Azure Storage repository [ece-configure-azure-snapshotting]
diff --git a/deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md b/deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
index a3a5712de..6778b84d4 100644
--- a/deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
+++ b/deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: "{{ece}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-repositories.html
-navigation_title: "{{ece}}"
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage snapshot repositories in {{ece}} [ece-manage-repositories]
diff --git a/deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md b/deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
index 493c06483..20a9cc0c6 100644
--- a/deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
+++ b/deploy-manage/tools/snapshot-and-restore/cloud-on-k8s.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: "{{eck}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-snapshots.html
-navigation_title: "{{eck}}"
 applies_to:
   deployment:
     eck:
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage snapshot repositories in {{eck}} [k8s-snapshots]
diff --git a/deploy-manage/tools/snapshot-and-restore/create-snapshots.md b/deploy-manage/tools/snapshot-and-restore/create-snapshots.md
index 4321898e9..69e20b913 100644
--- a/deploy-manage/tools/snapshot-and-restore/create-snapshots.md
+++ b/deploy-manage/tools/snapshot-and-restore/create-snapshots.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Create snapshots [snapshots-take-snapshot]
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md b/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
index f993c2535..84b8bb3e2 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
@@ -6,6 +6,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Configure a snapshot repository using AWS S3 [ec-aws-custom-repository]
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md b/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
index bce6aeccb..531a60307 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Configure a snapshot repository using Azure Blob storage [ec-azure-snapshotting]
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md b/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
index 5feedaae4..9f180cb03 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Configure a snapshot repository using GCS [ec-gcs-snapshotting]
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md b/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
index 544f6179d..7aa4b961c 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
@@ -1,6 +1,5 @@
 ---
-navigation_title: "AWS S3 repository"
-
+navigation_title: AWS S3 repository
 applies_to:
   deployment:
     ece:
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md b/deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
index 8b812e2ff..d6a0ad8d8 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-restore-across-clusters.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess:
     ece:
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Restore a snapshot across clusters [ece-restore-across-clusters]
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
index 8748af533..501d17773 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess:
     ece:
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Restore snapshots containing searchable snapshots indices across clusters [ece-restore-snapshots-containing-searchable-snapshots-indices-across-clusters]
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
index 56b97dca5..64ff1ba99 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-existing-deployment.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess:
     ece:
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Restore snapshot into an existing deployment [ece-restore-snapshots-into-existing-deployment]
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
index b24e43095..89d05ca9c 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-restore-snapshots-into-new-deployment.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess:
     ece:
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Restore snapshot into a new deployment [ece-restore-snapshots-into-new-deployment]
diff --git a/deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md b/deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
index 66ad4dc1e..e7c158a7c 100644
--- a/deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
+++ b/deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: "{{ech}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-custom-repository.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-custom-repository.html
-navigation_title: "{{ech}}"
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Manage snapshot repositories in {{ech}}
diff --git a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
index 49627b413..a7f82fe39 100644
--- a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Google Cloud Storage (GCS) repository [ece-configure-gcp-snapshotting]
diff --git a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
index 06d6580be..c7beb0678 100644
--- a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Google Cloud Storage repository [repository-gcs]
diff --git a/deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md b/deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
index 286631470..fc1bb9d22 100644
--- a/deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Minio on-premise repository [ece-configuring-minio]
diff --git a/deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md b/deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
index a29f5af09..65fdb4091 100644
--- a/deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Read-only URL repository [snapshots-read-only-repository]
diff --git a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
index e4359ba9a..5f7618cf5 100644
--- a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
+++ b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Repository isolation on AWS and GCP [ec-snapshot-repository-aws-gcp-migration]
diff --git a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
index 972f1ad43..952cc18a6 100644
--- a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
+++ b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Repository isolation on Azure [ec-snapshot-repository-azure-migration]
diff --git a/deploy-manage/tools/snapshot-and-restore/restore-snapshot.md b/deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
index bc4e507d9..b957722e6 100644
--- a/deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
+++ b/deploy-manage/tools/snapshot-and-restore/restore-snapshot.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Restore a snapshot
diff --git a/deploy-manage/tools/snapshot-and-restore/s3-repository.md b/deploy-manage/tools/snapshot-and-restore/s3-repository.md
index 65ad90f20..953666702 100644
--- a/deploy-manage/tools/snapshot-and-restore/s3-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/s3-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # S3 repository [repository-s3]
diff --git a/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md b/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
index 52d3884aa..eede8529a 100644
--- a/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
+++ b/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Searchable snapshots [searchable-snapshots]
diff --git a/deploy-manage/tools/snapshot-and-restore/self-managed.md b/deploy-manage/tools/snapshot-and-restore/self-managed.md
index 3be812f43..2d2ea49bf 100644
--- a/deploy-manage/tools/snapshot-and-restore/self-managed.md
+++ b/deploy-manage/tools/snapshot-and-restore/self-managed.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Self-managed
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/snapshots-register-repository.html
-navigation_title: "Self-managed"
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Manage snapshot repositories in self-managed deployments [snapshots-register-repository]
diff --git a/deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md b/deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
index fc22656e0..b5203a8d1 100644
--- a/deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Shared file system repository [snapshots-filesystem-repository]
diff --git a/deploy-manage/tools/snapshot-and-restore/source-only-repository.md b/deploy-manage/tools/snapshot-and-restore/source-only-repository.md
index 8f2d8b2ff..16a4260a4 100644
--- a/deploy-manage/tools/snapshot-and-restore/source-only-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/source-only-repository.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Source-only repository [snapshots-source-only-repository]
diff --git a/deploy-manage/uninstall.md b/deploy-manage/uninstall.md
index 2a4a26d4b..779b5cb86 100644
--- a/deploy-manage/uninstall.md
+++ b/deploy-manage/uninstall.md
@@ -1,10 +1,10 @@
 ---
 applies_to:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
   serverless:
 ---
 
diff --git a/deploy-manage/uninstall/delete-a-cloud-deployment.md b/deploy-manage/uninstall/delete-a-cloud-deployment.md
index 243fb08df..093cde745 100644
--- a/deploy-manage/uninstall/delete-a-cloud-deployment.md
+++ b/deploy-manage/uninstall/delete-a-cloud-deployment.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Delete an orchestrated deployment
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-delete-deployment.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-delete-deployment.html
@@ -6,13 +7,15 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-delete-deployment.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-restore-deployment.html
   - https://www.elastic.co/guide/en/cloud/current/ec-billing-stop.html
-navigation_title: "Delete an orchestrated deployment"
 applies_to:
   deployment:
     ess:
     ece:
     eck:
   serverless:
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Delete an orchestrated deployment
@@ -117,7 +120,7 @@ To delete an {{es}} cluster created with {{eck}}:
    ```shell
    kubectl delete kibana <kibana-resource-name>
    ```
-   
+
 :::{{tip}}
 To fully uninstall {{eck}} from your cluster including all managed resources and the ECK operator, refer to the [](/deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md) guide.
 :::
diff --git a/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md b/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
index 6e7ebd616..99c16cec4 100644
--- a/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
+++ b/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md
@@ -1,9 +1,11 @@
 ---
 mapped_pages:
-  -  https://www.elastic.co/guide/en/cloud-enterprise/current/ece-uninstall.html
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-uninstall.html
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 # Uninstall {{ece}} [ece-uninstall]
diff --git a/deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md b/deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
index a9cf45e2c..1cb50a0d8 100644
--- a/deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
+++ b/deploy-manage/uninstall/uninstall-elastic-cloud-on-kubernetes.md
@@ -1,9 +1,11 @@
 ---
 mapped_pages:
-  -  https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-uninstalling-eck.html
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-uninstalling-eck.html
 applies_to:
   deployment:
     eck:
+products:
+  - id: cloud-kubernetes
 ---
 
 # Uninstall {{eck}} [k8s-uninstalling-eck]
diff --git a/deploy-manage/upgrade/deployment-or-cluster.md b/deploy-manage/upgrade/deployment-or-cluster.md
index d11d10c43..0fcb4103c 100644
--- a/deploy-manage/upgrade/deployment-or-cluster.md
+++ b/deploy-manage/upgrade/deployment-or-cluster.md
@@ -18,6 +18,12 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: kibana
+  - id: cloud-enterprise
+  - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: elasticsearch
 ---
 
 # Upgrade your deployment or cluster [upgrade-deployment-cluster]
diff --git a/deploy-manage/upgrade/deployment-or-cluster/archived-settings.md b/deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
index 716761ee8..693da00a2 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/archived-settings.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/archived-settings.html
+products:
+  - id: elasticsearch
 ---
 
 # Archived settings [archived-settings]
@@ -12,7 +14,7 @@ We recommend you remove any archived settings after upgrading. Archived settings
 Archived settings start with the `archived.` prefix.
 
 
-## Archived cluster settings [archived-cluster-settings] 
+## Archived cluster settings [archived-cluster-settings]
 
 Use the following [cluster update settings](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings) request to check for archived cluster settings. If the request returns an empty object (`{ }`), there are no archived cluster settings.
 
@@ -34,9 +36,9 @@ PUT _cluster/settings
 {{es}} doesn’t archive transient cluster settings or settings in [`elasticsearch.yml`](/deploy-manage/stack-settings.md). If a node includes an unsupported setting in `elasticsearch.yml`, it will return an error at startup.
 
 
-## Archived index settings [archived-index-settings] 
+## Archived index settings [archived-index-settings]
 
-::::{important} 
+::::{important}
 Before you upgrade, remove any unsupported index settings from index and component templates. {{es}} doesn’t archive unsupported index settings in templates during an upgrade. Attempts to use a template that contains an unsupported index setting will fail and return an error. This includes automated operations, such the {{ilm-init}} rollover action.
 ::::
 
diff --git a/deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md b/deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
index 758e83afc..42e25bf13 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/kibana-roll-back.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Roll back to a previous version"
+navigation_title: Roll back to a previous version
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/upgrade-migrations-rolling-back.html
+products:
+  - id: kibana
 ---
 
 # Roll back to a previous version of {{kib}} [upgrade-migrations-rolling-back]
diff --git a/deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md b/deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
index 94bb3b5c9..ce9258483 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
@@ -6,6 +6,8 @@ applies_to:
   deployment:
     ess:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Reading indices from older {{es}} versions [archive-indices]
diff --git a/deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md b/deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
index 241c09ef6..b2bc84829 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md
@@ -8,6 +8,8 @@ applies_to:
     ess:
     ece:
     self:
+products:
+  - id: kibana
 ---
 
 # Saved object migrations [saved-object-migrations]
diff --git a/deploy-manage/upgrade/deployment-or-cluster/self-managed.md b/deploy-manage/upgrade/deployment-or-cluster/self-managed.md
index 985ab57e0..f855f3219 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/self-managed.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/self-managed.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Upgrade Elastic on a self-managed cluster"
+navigation_title: Upgrade Elastic on a self-managed cluster
 applies_to:
   stack:
   deployment:
diff --git a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
index 17de43a24..fc91767ef 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ece.md
@@ -1,9 +1,9 @@
 ---
-navigation_title: "Upgrade on {{ece}}"
+navigation_title: Upgrade on {{ece}}
 applies_to:
   stack:
   deployment:
-   ece:
+    ece:
 ---
 
 # Upgrade your deployment on {{ece}} (ECE)
diff --git a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
index 17480457e..cf02e530d 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-ech.md
@@ -1,13 +1,15 @@
 ---
+navigation_title: Upgrade on {{ech}}
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-upgrading-v7.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-upgrading-v6.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-upgrading-v5.html
-navigation_title: "Upgrade on {{ech}}"
 applies_to:
   stack:
   deployment:
     ess:
+products:
+  - id: cloud-hosted
 ---
 
 # Upgrade on {{ech}} (ECH)
@@ -16,27 +18,27 @@ Once you are [prepared to upgrade](/deploy-manage/upgrade/prepare-to-upgrade.md)
 
 You can perform minor version upgrades, upgrades from 8.18 to 9.0.0, and cluster configuration changes with no downtime. {{ecloud}} only supports upgrades to released versions. Release candidate builds and master snapshots are not supported.
 
-::::{important} 
+::::{important}
 Although it’s simple to upgrade an {{ecloud}} deployment, the new version might include breaking changes that affect your application. Ensure you review breaking changes and deprecation logs, make any necessary changes, and test against the new version before upgrading your production deployment.
 ::::
 
-## Perform the upgrade [perform-cloud-upgrade] 
+## Perform the upgrade [perform-cloud-upgrade]
 
 Log in to your {{ecloud}} environment:
 
-1. Log in to the [{{ech}} console](https://cloud.elastic.co/login). 
+1. Log in to the [{{ech}} console](https://cloud.elastic.co/login).
 2. Select your deployment on the home page in the {{ech}} card or go to the **Hosted deployments** page.
-      
+
    Narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
 
 
 To upgrade a deployment:
 
 1. In the **Deployment version** section, click **Upgrade**.
-2. Select the appropriate version you're upgrading to. 
+2. Select the appropriate version you're upgrading to.
 3. Click **Upgrade**, then **Confirm upgrade**. The new configuration takes a few minutes to create.
 
-    ::::{note} 
+    ::::{note}
     If any incompatibilities are detected when you attempt to upgrade, the UI provides a link to the Upgrade Assistant, which checks for deprecated settings in your cluster and indices and helps you resolve them. If there are any issues that would prevent a successful upgrade, the upgrade is blocked. After resolving the issues, return to the **Hosted deployments** page and restart the upgrade. Also check the [release notes](/release-notes/index.md) to stay aware of changes and known issues for the version you're upgrading to.
     ::::
 
@@ -55,4 +57,4 @@ Security realm settings
 
 ## Next steps
 
-Once you've successfully upgraded on {{ech}}, [upgrade your ingest components](/deploy-manage/upgrade/ingest-components.md), such as {{ls}}, {{agents}}, or {{beats}}. 
+Once you've successfully upgraded on {{ech}}, [upgrade your ingest components](/deploy-manage/upgrade/ingest-components.md), such as {{ls}}, {{agents}}, or {{beats}}.
diff --git a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
index 4cda6ba23..7c543807a 100644
--- a/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
+++ b/deploy-manage/upgrade/deployment-or-cluster/upgrade-on-eck.md
@@ -1,9 +1,9 @@
 ---
-navigation_title: "Upgrade on {{eck}}"
+navigation_title: Upgrade on {{eck}}
 applies_to:
   stack:
   deployment:
-   eck:
+    eck:
 ---
 
 # Upgrade your deployment on {{eck}} (ECK)
diff --git a/deploy-manage/upgrade/ingest-components.md b/deploy-manage/upgrade/ingest-components.md
index af2631bea..27375b753 100644
--- a/deploy-manage/upgrade/ingest-components.md
+++ b/deploy-manage/upgrade/ingest-components.md
@@ -2,10 +2,10 @@
 applies_to:
   stack:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self:  
+    eck:
+    ess:
+    ece:
+    self:
 ---
 # Upgrade your ingest components
 
diff --git a/deploy-manage/upgrade/orchestrator.md b/deploy-manage/upgrade/orchestrator.md
index 249249647..5cc71f3a2 100644
--- a/deploy-manage/upgrade/orchestrator.md
+++ b/deploy-manage/upgrade/orchestrator.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Upgrade your ECE or ECK orchestrator"
+navigation_title: Upgrade your ECE or ECK orchestrator
 applies_to:
   deployment:
     ece:
diff --git a/deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md b/deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
index aac5bfa17..ff28dd8b6 100644
--- a/deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
+++ b/deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece:
+products:
+  - id: cloud-enterprise
 ---
 
 % The upgrade procedure is expected to change with ECE 3.8.0 release. This document is currently a temporary draft, pending to be refined.
diff --git a/deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md b/deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
index 8a0593ed9..dd74c1f98 100644
--- a/deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
+++ b/deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck: ga 3.0.0
+products:
+  - id: cloud-kubernetes
 ---
 
 # Upgrade {{eck}} [k8s-upgrading-eck]
diff --git a/deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md b/deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
index 909089b53..ba882da47 100644
--- a/deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
+++ b/deploy-manage/upgrade/prepare-to-upgrade/upgrade-assistant.md
@@ -7,7 +7,9 @@ applies_to:
     eck:
     ess:
     ece:
-    self:  
+    self:
+products:
+  - id: kibana
 ---
 
 # Upgrade Assistant [upgrade-assistant]
diff --git a/deploy-manage/users-roles.md b/deploy-manage/users-roles.md
index e8130cf02..8cafcd3ec 100644
--- a/deploy-manage/users-roles.md
+++ b/deploy-manage/users-roles.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Users and roles"
+navigation_title: Users and roles
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/project-settings-access.html
 applies_to:
@@ -9,6 +9,8 @@ applies_to:
     eck: all
     self: all
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Users and roles
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator.md
index 6da19b4d8..19297fecd 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "ECE orchestrator"
+navigation_title: ECE orchestrator
 applies_to:
   deployment:
     ece: all
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
index ceefb557b..d165885b9 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/active-directory.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Active Directory [ece-create-ad-profiles]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
index 6c4017747..c47498125 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Configure SSO for deployments [ece-deployment-sso]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
index ca8545036..09f219dbc 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/ldap.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # LDAP [ece-create-ldap-profiles]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
index ec1263613..e142b5e5b 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-system-passwords.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage system passwords[ece-manage-system-passwords]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
index 70320be48..eb1e3000f 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/manage-users-roles.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Manage users and roles [ece-configure-rbac]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
index 9b9ffb702..51efa9c17 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/native-user-authentication.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # Native users [ece-add-native-users]
diff --git a/deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md b/deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
index f698633ca..28b3a9df6 100644
--- a/deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
+++ b/deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     ece: all
+products:
+  - id: cloud-enterprise
 ---
 
 # SAML [ece-create-saml-profiles]
diff --git a/deploy-manage/users-roles/cloud-organization.md b/deploy-manage/users-roles/cloud-organization.md
index 469fa3e2f..6d056df64 100644
--- a/deploy-manage/users-roles/cloud-organization.md
+++ b/deploy-manage/users-roles/cloud-organization.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Cloud organization"
+navigation_title: Cloud organization
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-organizations.html
 applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Cloud organization users [ec-organizations]
diff --git a/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md b/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
index d2eca106b..b2e9263b5 100644
--- a/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
+++ b/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Configure SAML SSO"
+navigation_title: Configure SAML SSO
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-saml-sso.html
 applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Configure {{ecloud}} SAML single sign-on [ec-saml-sso]
diff --git a/deploy-manage/users-roles/cloud-organization/manage-users.md b/deploy-manage/users-roles/cloud-organization/manage-users.md
index 39ff539e7..7fdd05b95 100644
--- a/deploy-manage/users-roles/cloud-organization/manage-users.md
+++ b/deploy-manage/users-roles/cloud-organization/manage-users.md
@@ -7,6 +7,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # Manage users
diff --git a/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md b/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
index 6cadd5088..4ae24b6a9 100644
--- a/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
+++ b/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-microsoft-entra-id.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: Microsoft Entra ID
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-saml-sso-entra.html
-navigation_title: "Microsoft Entra ID"
 applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Register {{ecloud}} SAML in Microsoft Entra ID [ec-saml-sso-entra]
diff --git a/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md b/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
index 48ccf57f5..d05cecddb 100644
--- a/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
+++ b/deploy-manage/users-roles/cloud-organization/register-elastic-cloud-saml-in-okta.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: Okta
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-saml-sso-okta.html
-navigation_title: Okta
 applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
 ---
 
 # Register {{ecloud}} SAML in Okta [ec-saml-sso-okta]
diff --git a/deploy-manage/users-roles/cloud-organization/user-roles.md b/deploy-manage/users-roles/cloud-organization/user-roles.md
index 537abc4cd..2b39cb5f1 100644
--- a/deploy-manage/users-roles/cloud-organization/user-roles.md
+++ b/deploy-manage/users-roles/cloud-organization/user-roles.md
@@ -6,6 +6,9 @@ applies_to:
   deployment:
     ess: all
   serverless: all
+products:
+  - id: cloud-hosted
+  - id: cloud-serverless
 ---
 
 # User roles and privileges [ec-user-privileges]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth.md b/deploy-manage/users-roles/cluster-or-deployment-auth.md
index d5f1e729c..5debe43b9 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Cluster or deployment"
+navigation_title: Cluster or deployment
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-clusters.html
   - https://www.elastic.co/guide/en/cloud/current/ec-security.html
@@ -9,6 +9,9 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Cluster or deployment users
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md b/deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
index a8c743221..9cc966adb 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/access-agreement.md
@@ -3,10 +3,12 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-security-access-agreement.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
-    self: 
+    ess:
+    ece:
+    eck:
+    self:
+products:
+  - id: kibana
 ---
 
 # {{kib}} access agreement [xpack-security-access-agreement]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md b/deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
index c8be9a6f1..de4019812 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/active-directory.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Active Directory
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/active-directory-realm.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-clusters-ad.html
@@ -7,7 +8,9 @@ applies_to:
     self:
     ece:
     eck:
-navigation_title: "Active Directory"
+products:
+  - id: elasticsearch
+  - id: cloud-enterprise
 ---
 
 # Active Directory user authentication [active-directory-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md b/deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
index 11ff7a153..68dd93a62 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/anonymous-access.md
@@ -3,10 +3,12 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/anonymous-access.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
-    self: 
+    ess:
+    ece:
+    eck:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Anonymous access [anonymous-access]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md b/deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
index ded314782..1552c2cbe 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/authentication-realms.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Authentication realms [realms]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md b/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
index 4f618ffc8..5162ebbe9 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-delegation.md
@@ -7,6 +7,8 @@ applies_to:
     eck:
     ess:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Authorization delegation [configuring-authorization-delegation]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md b/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
index a4b063b82..971e1b276 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/authorization-plugins.md
@@ -7,6 +7,8 @@ applies_to:
     eck:
     ess:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Authorization plugins [custom-roles-authorization]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
index 73b439300..49c0e3db4 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
@@ -8,6 +8,9 @@ applies_to:
     eck:
     ess:
     self:
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # Built-in roles [built-in-roles]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
index 4a5618f76..d76285e2e 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Change passwords
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/change-passwords-native-users.html
 applies_to:
   deployment:
     self:
-navigation_title: Change passwords
+products:
+  - id: elasticsearch
 ---
 # Set passwords for native and built-in users in self-managed clusters[ change-passwords-native-users]
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
index 48681fe02..f5e7a4ed1 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Built-in users
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/built-in-users.html
 applies_to:
   deployment:
     self:
-navigation_title: "Built-in users"
+products:
+  - id: elasticsearch
 ---
 
 # Built-in users in self-managed clusters [built-in-users]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md b/deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
index 4de639d1f..92e1bd013 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/configure-operator-privileges.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/configure-operator-privileges.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
+    ess:
+    ece:
+    eck:
+products:
+  - id: elasticsearch
 ---
 
 # Configure operator privileges [configure-operator-privileges]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md b/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
index 7fb9c8449..a781df0fa 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Control access at the document and field level
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/document-level-security.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/field-level-security.html
@@ -9,7 +10,8 @@ applies_to:
     eck:
     ess:
     self:
-navigation_title: Control access at the document and field level
+products:
+  - id: elasticsearch
 ---
 
 # Controlling access at the document and field level [field-and-document-access-control]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md b/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
index 6f7029fe9..9e01549a7 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-user-cache.md
@@ -7,6 +7,8 @@ applies_to:
     ece:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Controlling the user cache [controlling-user-cache]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/custom.md b/deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
index ce27e5760..b10c816c2 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/custom.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Custom realms
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
index 1c20c66e3..506d068aa 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md
@@ -11,6 +11,10 @@ applies_to:
     ess:
     eck:
     self:
+products:
+  - id: elasticsearch
+  - id: cloud-kubernetes
+  - id: kibana
 ---
 
 # Defining roles [defining-roles]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md b/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md
index 33f81e332..532fff318 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md
@@ -7,6 +7,8 @@ applies_to:
     eck:
     ess:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # {{es}} privileges [security-privileges]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md b/deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
index a4151fded..49dcc4588 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/file-based.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: File-based
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/file-realm.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-users-and-roles.html
@@ -6,7 +7,9 @@ applies_to:
   deployment:
     self: all
     eck: all
-navigation_title: "File-based"
+products:
+  - id: elasticsearch
+  - id: cloud-kubernetes
 ---
 
 # File-based user authentication [file-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md b/deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
index 34c79bb25..bf5e754c2 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
@@ -1,12 +1,15 @@
 ---
+navigation_title: For data streams and aliases
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/securing-aliases.html
-navigation_title: "For data streams and aliases"
 applies_to:
-  ece:
-  eck:
-  ess:
-  self:
+  deployment:
+    ece:
+    eck:
+    ess:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Granting privileges for data streams and aliases [securing-aliases]
@@ -45,7 +48,7 @@ GET .ds-my-data-stream-2099.03.09-000003/_doc/2
 
 Use [index privileges](/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md#privileges-list-indices) to control access to an [alias](../../../manage-data/data-store/aliases.md). Privileges on an index or data stream do not grant privileges on its aliases. For information about managing aliases, see [*Aliases*](../../../manage-data/data-store/aliases.md).
 
-::::{important} 
+::::{important}
 Don’t use [filtered aliases](../../../manage-data/data-store/aliases.md#filter-alias) in place of [document level security](controlling-access-at-document-field-level.md). {{es}} doesn’t always apply alias filters.
 ::::
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md b/deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
index dd9ce8c00..d0fed75cd 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/internal-users.md
@@ -3,10 +3,12 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/internal-users.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
-    self: 
+    ess:
+    ece:
+    eck:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Internal users [internal-users]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md b/deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
index 29a76aedf..efe8489d0 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/jwt.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: JWT
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-securing-clusters-JWT.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-clusters-JWT.html
@@ -10,7 +11,10 @@ applies_to:
     ess:
     ece:
     eck:
-navigation_title: "JWT"
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
+  - id: elasticsearch
 ---
 
 # JWT authentication [jwt-auth-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md b/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
index 4e4af5675..9098caab9 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
@@ -1,16 +1,20 @@
 ---
+navigation_title: Kerberos
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-secure-clusters-kerberos.html
   - https://www.elastic.co/guide/en/cloud/current/ec-secure-clusters-kerberos.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-secure-clusters-kerberos.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/kerberos-realm.html
-navigation_title: Kerberos
 applies_to:
   deployment:
     self:
     ess:
     ece:
     eck:
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
+  - id: elasticsearch
 ---
 
 # Kerberos authentication [kerberos-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
index 349f8e428..ce998137e 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md
@@ -7,6 +7,8 @@ applies_to:
     ess:
     eck:
     self:
+products:
+  - id: kibana
 ---
 
 # {{kib}} privileges [kibana-privileges]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
index 898365a4e..5ddef65c7 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Using Kibana
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/kibana-role-management.html
 applies_to:
@@ -7,7 +8,8 @@ applies_to:
     ess:
     eck:
     self:
-navigation_title: Using Kibana
+products:
+  - id: kibana
 ---
 
 # Role management using {{kib}} [kibana-role-management]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md b/deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
index 2c1ba71ba..616e66b39 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/ldap.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: LDAP
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ldap-realm.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-securing-clusters-ldap.html
@@ -7,7 +8,9 @@ applies_to:
     self:
     ece:
     eck:
-navigation_title: LDAP
+products:
+  - id: elasticsearch
+  - id: cloud-enterprise
 ---
 
 # LDAP user authentication [ldap-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md b/deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
index 4e4635fb7..bfa722013 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/looking-up-users-without-authentication.md
@@ -7,6 +7,8 @@ applies_to:
     ece:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Looking up users without authentication [user-lookup]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md b/deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
index b351b6969..dc254672e 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/manage-authentication-for-multiple-clusters.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   deployment:
     eck:
+products:
+  - id: cloud-kubernetes
 ---
 
 # Manage authentication for multiple clusters [k8s-auth-config-using-stack-config-policy]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md b/deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
index 1154121d7..8152b85b5 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/manage-elastic-user-cloud.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: ECH and ECE
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-password-reset-elastic.html
   - https://www.elastic.co/guide/en/cloud/current/ec-password-reset.html
@@ -7,7 +8,9 @@ applies_to:
   deployment:
     ece:
     ess:
-navigation_title: ECH and ECE
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Reset the `elastic` user password in {{ech}} and {{ece}} [ec-password-reset]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md b/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
index c463ae7cf..ffe24d25f 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: ECK managed credentials
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-users-and-roles.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-rotate-credentials.html
 applies_to:
   deployment:
     eck:
-navigation_title: ECK managed credentials
+products:
+  - id: cloud-kubernetes
 ---
 
 # {{eck}} managed credentials
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
index 1b53758b1..7fd305e1f 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Map users and groups to roles
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-roles.html
   - https://www.elastic.co/guide/en/kibana/current/role-mappings.html
@@ -8,7 +9,9 @@ applies_to:
     eck:
     ess:
     self:
-navigation_title: Map users and groups to roles
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # Map external users and groups to roles [mapping-roles]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/native.md b/deploy-manage/users-roles/cluster-or-deployment-auth/native.md
index dcc442036..a03eeac3f 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/native.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/native.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Native
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/native-realm.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-users-and-roles.html
@@ -10,7 +11,10 @@ applies_to:
     ess: all
     ece: all
     eck: all
-navigation_title: "Native"
+products:
+  - id: elasticsearch
+  - id: cloud-kubernetes
+  - id: kibana
 ---
 
 # Native user authentication [native-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md b/deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
index a694eee5d..71b829589 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/oidc-examples.md
@@ -1,13 +1,15 @@
 ---
+navigation_title: With Azure, Google, or Okta
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-securing-clusters-oidc-op.html
-navigation_title: With Azure, Google, or Okta
 applies_to:
   deployment:
     self:
     ess:
     ece:
     eck:
+products:
+  - id: cloud-hosted
 ---
 
 # Set up OpenID Connect with Azure, Google, or Okta [ec-securing-clusters-oidc-op]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md b/deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
index 3ec024b07..e07875f1f 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md
@@ -1,17 +1,21 @@
 ---
+navigation_title: OpenID Connect
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/oidc-realm.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/oidc-guide.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-secure-clusters-oidc.html
   - https://www.elastic.co/guide/en/cloud/current/ec-secure-clusters-oidc.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-secure-clusters-oidc.html
-navigation_title: OpenID Connect
 applies_to:
   deployment:
     self:
     ess:
     ece:
     eck:
+products:
+  - id: elasticsearch
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # OpenID Connect authentication [oidc-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
index 56a26cfb9..0d97d9da1 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-only-functionality.md
@@ -6,6 +6,8 @@ applies_to:
     ess:
     ece:
     eck:
+products:
+  - id: elasticsearch
 ---
 
 # Operator-only functionality [operator-only-functionality]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
index 3378ca70d..12fa0c660 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges-for-snapshot-restore.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/operator-only-snapshot-and-restore.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
+    ess:
+    ece:
+    eck:
+products:
+  - id: elasticsearch
 ---
 
 # Operator privileges for snapshot and restore [operator-only-snapshot-and-restore]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
index 1ea88cddb..fc3a6948e 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/operator-privileges.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/operator-privileges.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
+    ess:
+    ece:
+    eck:
+products:
+  - id: elasticsearch
 ---
 
 # Operator privileges [operator-privileges]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/pki.md b/deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
index e77b9d4af..76457afaf 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/pki.md
@@ -6,6 +6,8 @@ applies_to:
     self:
     ece:
     eck:
+products:
+  - id: elasticsearch
 ---
 
 # PKI [pki-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md b/deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
index 32a8fbfd4..fa407e807 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/quickstart.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: kibana
 ---
 
 # Quickstart [tutorial-secure-access-to-kibana]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md b/deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
index eae40448c..624e5478b 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/realm-chains.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Realm chains [realm-chains]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md b/deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
index 1f110db9c..77d665301 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/role-mapping-resources.md
@@ -1,13 +1,15 @@
 ---
+navigation_title: Role mapping properties
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/role-mapping-resources.html
-navigation_title: "Role mapping properties"
 applies_to:
   deployment:
     ece:
     eck:
     ess:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Role mapping resource properties [role-mapping-resources]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md b/deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
index f52541720..0cb763de4 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/role-restriction.md
@@ -2,10 +2,13 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/role-restriction.html
 applies_to:
-  ece:
-  eck:
-  ess:
-  self:
+  deployment:
+    ece:
+    eck:
+    ess:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Role restriction [role-restriction]
@@ -22,13 +25,13 @@ Workflows allow to restrict the role to be effective exclusively when calling ce
 `search_application_query`
 :   This workflow restricts the role to the [Search Application Search API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-search) only.
 
-::::{note} 
+::::{note}
 Workflow names are case-sensitive.
 ::::
 
 
 
-### Examples [_examples_5] 
+### Examples [_examples_5]
 
 The following example creates an API key with a restriction to the `search_application_query` workflow, which allows to call only [Search Application Search API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-search):
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md b/deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
index 064b3988c..ab3bc8cb6 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/saml-entra.md
@@ -1,13 +1,15 @@
 ---
+navigation_title: With Microsoft Entra ID
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-securing-clusters-saml-azure.html
-navigation_title: With Microsoft Entra ID
 applies_to:
   deployment:
     self:
     ess:
     ece:
     eck:
+products:
+  - id: cloud-hosted
 ---
 # Set up SAML with Microsoft Entra ID [ec-securing-clusters-saml-azure]
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md b/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
index 9815c65c3..82f81a58c 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: SAML
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/saml-realm.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece_sign_outgoing_saml_message.html
@@ -10,13 +11,17 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/echsign-outgoing-saml-message.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-saml-authentication.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/saml-guide-stack.html
-navigation_title: SAML
 applies_to:
   deployment:
     self:
     ess:
     ece:
     eck:
+products:
+  - id: elasticsearch
+  - id: cloud-enterprise
+  - id: cloud-hosted
+  - id: cloud-kubernetes
 ---
 
 # SAML authentication [saml-realm]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md b/deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
index 711c4ea34..aeaea11b5 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/security-domains.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # Security domains [security-domain]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md b/deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
index afad6d471..044e8f0de 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/service-accounts.md
@@ -7,6 +7,8 @@ applies_to:
     ece:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Service accounts [service-accounts]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md b/deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
index b9c8339df..ed6a87c1d 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/submitting-requests-on-behalf-of-other-users.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Submit requests on behalf of other users
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/run-as-privilege.html
 applies_to:
@@ -7,7 +8,8 @@ applies_to:
     eck:
     ess:
     self:
-navigation_title: Submit requests on behalf of other users
+products:
+  - id: elasticsearch
 ---
 
 # Submitting requests on behalf of other users [run-as-privilege]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md b/deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
index 67db6261b..cbd39636b 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/token-based-authentication-services.md
@@ -7,6 +7,8 @@ applies_to:
     ece:
     eck:
     self:
+products:
+  - id: elasticsearch
 ---
 
 # Token-based authentication services [token-authentication-services]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md b/deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
index 1e00c038e..75c1e2222 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/user-authentication.md
@@ -8,6 +8,9 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # User authentication
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
index 43268da6b..f6460c468 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/user-profiles.md
@@ -3,9 +3,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/user-profile.html
 applies_to:
   deployment:
-    ess: 
-    ece: 
-    eck: 
+    ess:
+    ece:
+    eck:
+products:
+  - id: elasticsearch
 ---
 
 # User profiles [user-profile]
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
index 29a0c2551..8a9ee3ec8 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md
@@ -7,6 +7,8 @@ applies_to:
     ece: all
     eck: all
     self: all
+products:
+  - id: elasticsearch
 ---
 
 # User roles [authorization]
diff --git a/deploy-manage/users-roles/serverless-custom-roles.md b/deploy-manage/users-roles/serverless-custom-roles.md
index 4b634a86c..83b0d738f 100644
--- a/deploy-manage/users-roles/serverless-custom-roles.md
+++ b/deploy-manage/users-roles/serverless-custom-roles.md
@@ -5,6 +5,8 @@ applies_to:
   serverless:
     elasticsearch:
     security:
+products:
+  - id: cloud-serverless
 ---
 
 # Serverless project custom roles [custom-roles]
diff --git a/explore-analyze/ai-assistant.md b/explore-analyze/ai-assistant.md
index e8f112f42..ba826abb4 100644
--- a/explore-analyze/ai-assistant.md
+++ b/explore-analyze/ai-assistant.md
@@ -1,7 +1,4 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/search-ai-assistant.html
   - https://www.elastic.co/guide/en/observability/current/obs-ai-assistant.html
@@ -9,6 +6,13 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-ai-assistant.html
   - https://www.elastic.co/guide/en/serverless/current/security-ai-assistant.html
   - https://www.elastic.co/guide/en/serverless/current/ai-assistant-knowledge-base.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # AI assistant
diff --git a/explore-analyze/alerts-cases.md b/explore-analyze/alerts-cases.md
index 57b8f2f2b..5d5f66c87 100644
--- a/explore-analyze/alerts-cases.md
+++ b/explore-analyze/alerts-cases.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/alerting-getting-started.html#alerting-concepts-differences
   - https://www.elastic.co/guide/en/serverless/current/project-settings-alerts.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Alerts and cases
diff --git a/explore-analyze/alerts-cases/alerts.md b/explore-analyze/alerts-cases/alerts.md
index df8da7b5d..9c5ce6f12 100644
--- a/explore-analyze/alerts-cases/alerts.md
+++ b/explore-analyze/alerts-cases/alerts.md
@@ -1,11 +1,15 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/alerting-getting-started.html
   - https://www.elastic.co/guide/en/serverless/current/rules.html
   - https://www.elastic.co/guide/en/cloud/current/ec-organizations-notifications-domain-allowlist.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
+  - id: cloud-hosted
 ---
 
 # Alerts
diff --git a/explore-analyze/alerts-cases/alerts/alerting-common-issues.md b/explore-analyze/alerts-cases/alerts/alerting-common-issues.md
index 5c86f9e99..114c788a2 100644
--- a/explore-analyze/alerts-cases/alerts/alerting-common-issues.md
+++ b/explore-analyze/alerts-cases/alerts/alerting-common-issues.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/alerting-common-issues.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/alerting-common-issues.html
+products:
+  - id: kibana
 ---
 
 # Common Issues [alerting-common-issues]
diff --git a/explore-analyze/alerts-cases/alerts/alerting-setup.md b/explore-analyze/alerts-cases/alerts/alerting-setup.md
index 429e1e0a8..6f7c43567 100644
--- a/explore-analyze/alerts-cases/alerts/alerting-setup.md
+++ b/explore-analyze/alerts-cases/alerts/alerting-setup.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Set up
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/alerting-setup.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Set up"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/alerting-setup.html
+products:
+  - id: kibana
 ---
 
 # Set up [alerting-setup]
diff --git a/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md b/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
index 92387ef9b..51c9ed148 100644
--- a/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
+++ b/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/alerting-troubleshooting.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/alerting-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 # Troubleshooting and limitations [alerting-troubleshooting]
diff --git a/explore-analyze/alerts-cases/alerts/create-manage-rules.md b/explore-analyze/alerts-cases/alerts/create-manage-rules.md
index 6873d6079..7a167ca2a 100644
--- a/explore-analyze/alerts-cases/alerts/create-manage-rules.md
+++ b/explore-analyze/alerts-cases/alerts/create-manage-rules.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/create-and-manage-rules.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/create-and-manage-rules.html
+products:
+  - id: kibana
 ---
 
 # Create and manage rules [create-and-manage-rules]
diff --git a/explore-analyze/alerts-cases/alerts/event-log-index.md b/explore-analyze/alerts-cases/alerts/event-log-index.md
index 88b3979ba..27a1ca301 100644
--- a/explore-analyze/alerts-cases/alerts/event-log-index.md
+++ b/explore-analyze/alerts-cases/alerts/event-log-index.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/event-log-index.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/event-log-index.html
+products:
+  - id: kibana
 ---
 
 # Event log index [event-log-index]
diff --git a/explore-analyze/alerts-cases/alerts/geo-alerting.md b/explore-analyze/alerts-cases/alerts/geo-alerting.md
index be9d1c57f..51b580363 100644
--- a/explore-analyze/alerts-cases/alerts/geo-alerting.md
+++ b/explore-analyze/alerts-cases/alerts/geo-alerting.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Tracking containment
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/geo-alerting.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Tracking containment"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/geo-alerting.html
+products:
+  - id: kibana
 ---
 
 # Tracking containment [geo-alerting]
diff --git a/explore-analyze/alerts-cases/alerts/maintenance-windows.md b/explore-analyze/alerts-cases/alerts/maintenance-windows.md
index 512deaef6..b1bdc0742 100644
--- a/explore-analyze/alerts-cases/alerts/maintenance-windows.md
+++ b/explore-analyze/alerts-cases/alerts/maintenance-windows.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/maintenance-windows.html
   - https://www.elastic.co/guide/en/serverless/current/maintenance-windows.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Maintenance windows
diff --git a/explore-analyze/alerts-cases/alerts/notifications-domain-allowlist.md b/explore-analyze/alerts-cases/alerts/notifications-domain-allowlist.md
index 4c2947500..5da326970 100644
--- a/explore-analyze/alerts-cases/alerts/notifications-domain-allowlist.md
+++ b/explore-analyze/alerts-cases/alerts/notifications-domain-allowlist.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-organizations-notifications-domain-allowlist.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-organizations-notifications-domain-allowlist.html
+products:
+  - id: cloud-hosted
 ---
 
 # Notifications domain allowlist [organizations-notifications-domain-allowlist]
diff --git a/explore-analyze/alerts-cases/alerts/rule-action-variables.md b/explore-analyze/alerts-cases/alerts/rule-action-variables.md
index 2a8fe5c47..5ff3b8e7f 100644
--- a/explore-analyze/alerts-cases/alerts/rule-action-variables.md
+++ b/explore-analyze/alerts-cases/alerts/rule-action-variables.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/rule-action-variables.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/rule-action-variables.html
+products:
+  - id: kibana
 ---
 
 # Rule action variables [rule-action-variables]
diff --git a/explore-analyze/alerts-cases/alerts/rule-type-es-query.md b/explore-analyze/alerts-cases/alerts/rule-type-es-query.md
index 66949a629..edd1f9164 100644
--- a/explore-analyze/alerts-cases/alerts/rule-type-es-query.md
+++ b/explore-analyze/alerts-cases/alerts/rule-type-es-query.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: "{{es}} query"
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/rule-type-es-query.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
 ---
 
 # Elasticsearch query [rule-type-es-query]
diff --git a/explore-analyze/alerts-cases/alerts/rule-type-index-threshold.md b/explore-analyze/alerts-cases/alerts/rule-type-index-threshold.md
index c7567ee3a..859be8e5e 100644
--- a/explore-analyze/alerts-cases/alerts/rule-type-index-threshold.md
+++ b/explore-analyze/alerts-cases/alerts/rule-type-index-threshold.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Index threshold
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/rule-type-index-threshold.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Index threshold"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/rule-type-index-threshold.html
+products:
+  - id: kibana
 ---
 
 # Index threshold [rule-type-index-threshold]
diff --git a/explore-analyze/alerts-cases/alerts/rule-types.md b/explore-analyze/alerts-cases/alerts/rule-types.md
index 9c8e3d98b..044e55fdb 100644
--- a/explore-analyze/alerts-cases/alerts/rule-types.md
+++ b/explore-analyze/alerts-cases/alerts/rule-types.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/rule-types.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/rule-types.html
+products:
+  - id: kibana
 ---
 
 # Rule types [rule-types]
diff --git a/explore-analyze/alerts-cases/alerts/testing-connectors.md b/explore-analyze/alerts-cases/alerts/testing-connectors.md
index 37d5b021d..1d00b3e11 100644
--- a/explore-analyze/alerts-cases/alerts/testing-connectors.md
+++ b/explore-analyze/alerts-cases/alerts/testing-connectors.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/testing-connectors.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/testing-connectors.html
+products:
+  - id: kibana
 ---
 
 # Test connectors [testing-connectors]
diff --git a/explore-analyze/alerts-cases/alerts/view-alerts.md b/explore-analyze/alerts-cases/alerts/view-alerts.md
index 73a8c8b85..e0b82103d 100644
--- a/explore-analyze/alerts-cases/alerts/view-alerts.md
+++ b/explore-analyze/alerts-cases/alerts/view-alerts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/view-alerts.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/view-alerts.html
+products:
+  - id: kibana
 ---
 
 # View alerts [view-alerts]
diff --git a/explore-analyze/alerts-cases/cases.md b/explore-analyze/alerts-cases/cases.md
index b1fc7ff71..b9fd21097 100644
--- a/explore-analyze/alerts-cases/cases.md
+++ b/explore-analyze/alerts-cases/cases.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/cases.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/cases.html
+products:
+  - id: kibana
 ---
 
 # Cases [cases]
diff --git a/explore-analyze/alerts-cases/cases/manage-cases-settings.md b/explore-analyze/alerts-cases/cases/manage-cases-settings.md
index 8163f60ac..bb638f5eb 100644
--- a/explore-analyze/alerts-cases/cases/manage-cases-settings.md
+++ b/explore-analyze/alerts-cases/cases/manage-cases-settings.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/manage-cases-settings.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/manage-cases-settings.html
+products:
+  - id: kibana
 ---
 
 # Configure case settings [manage-cases-settings]
diff --git a/explore-analyze/alerts-cases/cases/manage-cases.md b/explore-analyze/alerts-cases/cases/manage-cases.md
index c62fe6bb1..2feff7735 100644
--- a/explore-analyze/alerts-cases/cases/manage-cases.md
+++ b/explore-analyze/alerts-cases/cases/manage-cases.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/manage-cases.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/manage-cases.html
+products:
+  - id: kibana
 ---
 
 # Open and manage cases [manage-cases]
diff --git a/explore-analyze/alerts-cases/cases/setup-cases.md b/explore-analyze/alerts-cases/cases/setup-cases.md
index ade05ccb7..8c89966e8 100644
--- a/explore-analyze/alerts-cases/cases/setup-cases.md
+++ b/explore-analyze/alerts-cases/cases/setup-cases.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/setup-cases.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/setup-cases.html
+products:
+  - id: kibana
 ---
 
 # Configure access to cases [setup-cases]
diff --git a/explore-analyze/alerts-cases/watcher.md b/explore-analyze/alerts-cases/watcher.md
index ff75e59a1..9547288de 100644
--- a/explore-analyze/alerts-cases/watcher.md
+++ b/explore-analyze/alerts-cases/watcher.md
@@ -1,13 +1,18 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-alerting.html
   - https://www.elastic.co/guide/en/cloud/current/ec-watcher.html
   - https://www.elastic.co/guide/en/kibana/current/watcher-ui.html
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-differences.html#elasticsearch-differences-serverless-features-replaced
   - https://www.elastic.co/guide/en/kibana/current/secure-reporting.html#securing-reporting
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-hosted
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Watcher
diff --git a/explore-analyze/alerts-cases/watcher/action-conditions.md b/explore-analyze/alerts-cases/watcher/action-conditions.md
index 9a0ede60c..f129adcf8 100644
--- a/explore-analyze/alerts-cases/watcher/action-conditions.md
+++ b/explore-analyze/alerts-cases/watcher/action-conditions.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Adding conditions to actions
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/action-conditions.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Adding conditions to actions"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/action-conditions.html
+products:
+  - id: elasticsearch
 ---
 
 # Adding conditions to actions [action-conditions]
diff --git a/explore-analyze/alerts-cases/watcher/action-foreach.md b/explore-analyze/alerts-cases/watcher/action-foreach.md
index cc8abe6e1..28af652d5 100644
--- a/explore-analyze/alerts-cases/watcher/action-foreach.md
+++ b/explore-analyze/alerts-cases/watcher/action-foreach.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/action-foreach.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/action-foreach.html
+products:
+  - id: elasticsearch
 ---
 
 # Running an action for each element in an array [action-foreach]
diff --git a/explore-analyze/alerts-cases/watcher/actions-email.md b/explore-analyze/alerts-cases/watcher/actions-email.md
index 3896e4075..769140669 100644
--- a/explore-analyze/alerts-cases/watcher/actions-email.md
+++ b/explore-analyze/alerts-cases/watcher/actions-email.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Email action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-email.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Email action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-email.html
+products:
+  - id: elasticsearch
 ---
 
 # Email action [actions-email]
diff --git a/explore-analyze/alerts-cases/watcher/actions-index.md b/explore-analyze/alerts-cases/watcher/actions-index.md
index 14d52df6a..742f97b55 100644
--- a/explore-analyze/alerts-cases/watcher/actions-index.md
+++ b/explore-analyze/alerts-cases/watcher/actions-index.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Index action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-index.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Index action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-index.html
+products:
+  - id: elasticsearch
 ---
 
 # Index action [actions-index]
diff --git a/explore-analyze/alerts-cases/watcher/actions-jira.md b/explore-analyze/alerts-cases/watcher/actions-jira.md
index bad6b8957..6eb9a0ed3 100644
--- a/explore-analyze/alerts-cases/watcher/actions-jira.md
+++ b/explore-analyze/alerts-cases/watcher/actions-jira.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Jira action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-jira.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Jira action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-jira.html
+products:
+  - id: elasticsearch
 ---
 
 # Jira action [actions-jira]
diff --git a/explore-analyze/alerts-cases/watcher/actions-logging.md b/explore-analyze/alerts-cases/watcher/actions-logging.md
index e973f4657..ad6363791 100644
--- a/explore-analyze/alerts-cases/watcher/actions-logging.md
+++ b/explore-analyze/alerts-cases/watcher/actions-logging.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Logging action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-logging.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Logging action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-logging.html
+products:
+  - id: elasticsearch
 ---
 
 # Logging action [actions-logging]
diff --git a/explore-analyze/alerts-cases/watcher/actions-pagerduty.md b/explore-analyze/alerts-cases/watcher/actions-pagerduty.md
index c7177ea2f..b4ca9bb58 100644
--- a/explore-analyze/alerts-cases/watcher/actions-pagerduty.md
+++ b/explore-analyze/alerts-cases/watcher/actions-pagerduty.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: PagerDuty action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-pagerduty.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "PagerDuty action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-pagerduty.html
+products:
+  - id: elasticsearch
 ---
 
 # PagerDuty action [actions-pagerduty]
diff --git a/explore-analyze/alerts-cases/watcher/actions-slack.md b/explore-analyze/alerts-cases/watcher/actions-slack.md
index 91044a39f..24e735d48 100644
--- a/explore-analyze/alerts-cases/watcher/actions-slack.md
+++ b/explore-analyze/alerts-cases/watcher/actions-slack.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Slack action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-slack.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Slack action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-slack.html
+products:
+  - id: elasticsearch
 ---
 
 # Slack action [actions-slack]
diff --git a/explore-analyze/alerts-cases/watcher/actions-webhook.md b/explore-analyze/alerts-cases/watcher/actions-webhook.md
index 9d10b2567..3efc2e072 100644
--- a/explore-analyze/alerts-cases/watcher/actions-webhook.md
+++ b/explore-analyze/alerts-cases/watcher/actions-webhook.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Webhook action
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-webhook.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Webhook action"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-webhook.html
+products:
+  - id: elasticsearch
 ---
 
 # Webhook action [actions-webhook]
diff --git a/explore-analyze/alerts-cases/watcher/actions.md b/explore-analyze/alerts-cases/watcher/actions.md
index 4d2c5a770..f10eaf272 100644
--- a/explore-analyze/alerts-cases/watcher/actions.md
+++ b/explore-analyze/alerts-cases/watcher/actions.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Actions
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Actions"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/actions.html
+products:
+  - id: elasticsearch
 ---
 
 # Actions [actions]
diff --git a/explore-analyze/alerts-cases/watcher/condition-always.md b/explore-analyze/alerts-cases/watcher/condition-always.md
index 01552f830..9ace8fd57 100644
--- a/explore-analyze/alerts-cases/watcher/condition-always.md
+++ b/explore-analyze/alerts-cases/watcher/condition-always.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Always condition
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-always.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Always condition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-always.html
+products:
+  - id: elasticsearch
 ---
 
 # Always condition [condition-always]
diff --git a/explore-analyze/alerts-cases/watcher/condition-array-compare.md b/explore-analyze/alerts-cases/watcher/condition-array-compare.md
index d4c2453f1..8e08f1eb0 100644
--- a/explore-analyze/alerts-cases/watcher/condition-array-compare.md
+++ b/explore-analyze/alerts-cases/watcher/condition-array-compare.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Array compare condition
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-array-compare.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Array compare condition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-array-compare.html
+products:
+  - id: elasticsearch
 ---
 
 # Array compare condition [condition-array-compare]
diff --git a/explore-analyze/alerts-cases/watcher/condition-compare.md b/explore-analyze/alerts-cases/watcher/condition-compare.md
index 8e371c864..032cb8068 100644
--- a/explore-analyze/alerts-cases/watcher/condition-compare.md
+++ b/explore-analyze/alerts-cases/watcher/condition-compare.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Compare condition
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-compare.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Compare condition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-compare.html
+products:
+  - id: elasticsearch
 ---
 
 # Compare condition [condition-compare]
diff --git a/explore-analyze/alerts-cases/watcher/condition-never.md b/explore-analyze/alerts-cases/watcher/condition-never.md
index 843c176e3..de9595456 100644
--- a/explore-analyze/alerts-cases/watcher/condition-never.md
+++ b/explore-analyze/alerts-cases/watcher/condition-never.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Never condition
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-never.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Never condition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-never.html
+products:
+  - id: elasticsearch
 ---
 
 # Never condition [condition-never]
diff --git a/explore-analyze/alerts-cases/watcher/condition-script.md b/explore-analyze/alerts-cases/watcher/condition-script.md
index 937517b57..7a76baeea 100644
--- a/explore-analyze/alerts-cases/watcher/condition-script.md
+++ b/explore-analyze/alerts-cases/watcher/condition-script.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Script condition
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-script.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Script condition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition-script.html
+products:
+  - id: elasticsearch
 ---
 
 # Script condition [condition-script]
diff --git a/explore-analyze/alerts-cases/watcher/condition.md b/explore-analyze/alerts-cases/watcher/condition.md
index 1840640c2..04d0e8830 100644
--- a/explore-analyze/alerts-cases/watcher/condition.md
+++ b/explore-analyze/alerts-cases/watcher/condition.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Conditions
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Conditions"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/condition.html
+products:
+  - id: elasticsearch
 ---
 
 # Conditions [condition]
diff --git a/explore-analyze/alerts-cases/watcher/enable-watcher.md b/explore-analyze/alerts-cases/watcher/enable-watcher.md
index 56efda377..b7be829e0 100644
--- a/explore-analyze/alerts-cases/watcher/enable-watcher.md
+++ b/explore-analyze/alerts-cases/watcher/enable-watcher.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-watcher.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-watcher.html
+products:
+  - id: cloud-hosted
 ---
 
 # Enable Watcher [enable-watcher]
diff --git a/explore-analyze/alerts-cases/watcher/encrypting-data.md b/explore-analyze/alerts-cases/watcher/encrypting-data.md
index 81233df32..697fc7ca3 100644
--- a/explore-analyze/alerts-cases/watcher/encrypting-data.md
+++ b/explore-analyze/alerts-cases/watcher/encrypting-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/encrypting-data.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/encrypting-data.html
+products:
+  - id: elasticsearch
 ---
 
 # Encrypting sensitive data in Watcher [encrypting-data]
diff --git a/explore-analyze/alerts-cases/watcher/example-watches.md b/explore-analyze/alerts-cases/watcher/example-watches.md
index a434f154d..6f986c1ff 100644
--- a/explore-analyze/alerts-cases/watcher/example-watches.md
+++ b/explore-analyze/alerts-cases/watcher/example-watches.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/example-watches.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/example-watches.html
+products:
+  - id: elasticsearch
 ---
 
 # Example watches [example-watches]
diff --git a/explore-analyze/alerts-cases/watcher/how-watcher-works.md b/explore-analyze/alerts-cases/watcher/how-watcher-works.md
index 0e339a39d..4a2c43c7a 100644
--- a/explore-analyze/alerts-cases/watcher/how-watcher-works.md
+++ b/explore-analyze/alerts-cases/watcher/how-watcher-works.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/how-watcher-works.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/how-watcher-works.html
+products:
+  - id: elasticsearch
 ---
 
 # How Watcher works [how-watcher-works]
diff --git a/explore-analyze/alerts-cases/watcher/input-chain.md b/explore-analyze/alerts-cases/watcher/input-chain.md
index 470e81a17..69f34371d 100644
--- a/explore-analyze/alerts-cases/watcher/input-chain.md
+++ b/explore-analyze/alerts-cases/watcher/input-chain.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Chain input
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-chain.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Chain input"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-chain.html
+products:
+  - id: elasticsearch
 ---
 
 # Chain input [input-chain]
diff --git a/explore-analyze/alerts-cases/watcher/input-http.md b/explore-analyze/alerts-cases/watcher/input-http.md
index 596500a22..e2c5e6638 100644
--- a/explore-analyze/alerts-cases/watcher/input-http.md
+++ b/explore-analyze/alerts-cases/watcher/input-http.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: HTTP input
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-http.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "HTTP input"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-http.html
+products:
+  - id: elasticsearch
 ---
 
 # HTTP input [input-http]
diff --git a/explore-analyze/alerts-cases/watcher/input-search.md b/explore-analyze/alerts-cases/watcher/input-search.md
index e1d44fa59..9898371ce 100644
--- a/explore-analyze/alerts-cases/watcher/input-search.md
+++ b/explore-analyze/alerts-cases/watcher/input-search.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Search input
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-search.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Search input"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-search.html
+products:
+  - id: elasticsearch
 ---
 
 # Search input [input-search]
diff --git a/explore-analyze/alerts-cases/watcher/input-simple.md b/explore-analyze/alerts-cases/watcher/input-simple.md
index 536aff8e0..a34c366f3 100644
--- a/explore-analyze/alerts-cases/watcher/input-simple.md
+++ b/explore-analyze/alerts-cases/watcher/input-simple.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Simple input
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-simple.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Simple input"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input-simple.html
+products:
+  - id: elasticsearch
 ---
 
 # Simple input [input-simple]
diff --git a/explore-analyze/alerts-cases/watcher/input.md b/explore-analyze/alerts-cases/watcher/input.md
index a0b3147ef..777e21cfb 100644
--- a/explore-analyze/alerts-cases/watcher/input.md
+++ b/explore-analyze/alerts-cases/watcher/input.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Inputs
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Inputs"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/input.html
+products:
+  - id: elasticsearch
 ---
 
 # Inputs [input]
diff --git a/explore-analyze/alerts-cases/watcher/managing-watches.md b/explore-analyze/alerts-cases/watcher/managing-watches.md
index f6f11f7e6..37b505591 100644
--- a/explore-analyze/alerts-cases/watcher/managing-watches.md
+++ b/explore-analyze/alerts-cases/watcher/managing-watches.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/managing-watches.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/managing-watches.html
+products:
+  - id: elasticsearch
 ---
 
 # Managing watches [managing-watches]
diff --git a/explore-analyze/alerts-cases/watcher/schedule-types.md b/explore-analyze/alerts-cases/watcher/schedule-types.md
index af19ff38e..9ace5358c 100644
--- a/explore-analyze/alerts-cases/watcher/schedule-types.md
+++ b/explore-analyze/alerts-cases/watcher/schedule-types.md
@@ -1,11 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_schedule_types.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_schedule_types.html
-  # That link will 404 until 8.18 is current
-  # (see https://www.elastic.co/guide/en/elasticsearch/reference/8.18/_schedule_types.html)
+products:
+  - id: elasticsearch
 ---
 
 # Schedule Types [_schedule_types]
diff --git a/explore-analyze/alerts-cases/watcher/throttling.md b/explore-analyze/alerts-cases/watcher/throttling.md
index ee4f97809..6db07a0ac 100644
--- a/explore-analyze/alerts-cases/watcher/throttling.md
+++ b/explore-analyze/alerts-cases/watcher/throttling.md
@@ -1,11 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_throttling.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_throttling.html
-  # That link will 404 until 8.18 is current
-  # (see https://www.elastic.co/guide/en/elasticsearch/reference/8.18/_throttling.html)
+products:
+  - id: elasticsearch
 ---
 
 # Throttling [_throttling]
diff --git a/explore-analyze/alerts-cases/watcher/transform-chain.md b/explore-analyze/alerts-cases/watcher/transform-chain.md
index d2c5da64b..2bb6696e7 100644
--- a/explore-analyze/alerts-cases/watcher/transform-chain.md
+++ b/explore-analyze/alerts-cases/watcher/transform-chain.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Chain {{watcher-transform}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-chain.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Chain {{watcher-transform}}"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-chain.html
+products:
+  - id: elasticsearch
 ---
 
 # Chain payload transform [transform-chain]
diff --git a/explore-analyze/alerts-cases/watcher/transform-script.md b/explore-analyze/alerts-cases/watcher/transform-script.md
index 83bafafb3..135f0d76a 100644
--- a/explore-analyze/alerts-cases/watcher/transform-script.md
+++ b/explore-analyze/alerts-cases/watcher/transform-script.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Script {{watcher-transform}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-script.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Script {{watcher-transform}}"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-script.html
+products:
+  - id: elasticsearch
 ---
 
 # Script payload transform [transform-script]
diff --git a/explore-analyze/alerts-cases/watcher/transform-search.md b/explore-analyze/alerts-cases/watcher/transform-search.md
index 1dd0d73bf..744d46033 100644
--- a/explore-analyze/alerts-cases/watcher/transform-search.md
+++ b/explore-analyze/alerts-cases/watcher/transform-search.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Search {{watcher-transform}}
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-search.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Search {{watcher-transform}}"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-search.html
+products:
+  - id: elasticsearch
 ---
 
 # Search payload transform [transform-search]
diff --git a/explore-analyze/alerts-cases/watcher/transform.md b/explore-analyze/alerts-cases/watcher/transform.md
index 60a4a706c..ca05ef8b4 100644
--- a/explore-analyze/alerts-cases/watcher/transform.md
+++ b/explore-analyze/alerts-cases/watcher/transform.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Transforms
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Transforms"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform.html
+products:
+  - id: elasticsearch
 ---
 
 # Transforms [transform]
diff --git a/explore-analyze/alerts-cases/watcher/trigger-schedule.md b/explore-analyze/alerts-cases/watcher/trigger-schedule.md
index 857ff2431..a4df38678 100644
--- a/explore-analyze/alerts-cases/watcher/trigger-schedule.md
+++ b/explore-analyze/alerts-cases/watcher/trigger-schedule.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Schedule trigger
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/trigger-schedule.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Schedule trigger"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/trigger-schedule.html
+products:
+  - id: elasticsearch
 ---
 
 # Schedule trigger [trigger-schedule]
diff --git a/explore-analyze/alerts-cases/watcher/trigger.md b/explore-analyze/alerts-cases/watcher/trigger.md
index 254da0983..3bb91e593 100644
--- a/explore-analyze/alerts-cases/watcher/trigger.md
+++ b/explore-analyze/alerts-cases/watcher/trigger.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Triggers
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/trigger.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Triggers"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/trigger.html
+products:
+  - id: elasticsearch
 ---
 
 # Triggers [trigger]
diff --git a/explore-analyze/alerts-cases/watcher/watch-cluster-status.md b/explore-analyze/alerts-cases/watcher/watch-cluster-status.md
index 63468eaf7..03d939cd8 100644
--- a/explore-analyze/alerts-cases/watcher/watch-cluster-status.md
+++ b/explore-analyze/alerts-cases/watcher/watch-cluster-status.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watch-cluster-status.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watch-cluster-status.html
+products:
+  - id: elasticsearch
 ---
 
 # Watching the status of an Elasticsearch cluster [watch-cluster-status]
diff --git a/explore-analyze/alerts-cases/watcher/watcher-getting-started.md b/explore-analyze/alerts-cases/watcher/watcher-getting-started.md
index 888f5b82a..5a238a62e 100644
--- a/explore-analyze/alerts-cases/watcher/watcher-getting-started.md
+++ b/explore-analyze/alerts-cases/watcher/watcher-getting-started.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-getting-started.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-getting-started.html
+products:
+  - id: elasticsearch
 ---
 
 # Getting started with Watcher [watcher-getting-started]
diff --git a/explore-analyze/alerts-cases/watcher/watcher-limitations.md b/explore-analyze/alerts-cases/watcher/watcher-limitations.md
index e2f825bb7..f18bd98cf 100644
--- a/explore-analyze/alerts-cases/watcher/watcher-limitations.md
+++ b/explore-analyze/alerts-cases/watcher/watcher-limitations.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Limitations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-limitations.html
+products:
+  - id: elasticsearch
 ---
 
 # Limitations [watcher-limitations]
diff --git a/explore-analyze/dashboards.md b/explore-analyze/dashboards.md
index 5cc735761..e6d71ad26 100644
--- a/explore-analyze/dashboards.md
+++ b/explore-analyze/dashboards.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/dashboard.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/dashboard.html
+products:
+  - id: kibana
 ---
 
 # Dashboards [dashboard]
diff --git a/explore-analyze/dashboards/add-controls.md b/explore-analyze/dashboards/add-controls.md
index ea47d38af..90510fc72 100644
--- a/explore-analyze/dashboards/add-controls.md
+++ b/explore-analyze/dashboards/add-controls.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/add-controls.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/add-controls.html
+products:
+  - id: kibana
 ---
 
 # Add filter controls [add-controls]
diff --git a/explore-analyze/dashboards/arrange-panels.md b/explore-analyze/dashboards/arrange-panels.md
index dc27472f3..c20de43e1 100644
--- a/explore-analyze/dashboards/arrange-panels.md
+++ b/explore-analyze/dashboards/arrange-panels.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/arrange-panels.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/arrange-panels.html
+products:
+  - id: kibana
 ---
 
 # Organize dashboard panels [arrange-panels]
diff --git a/explore-analyze/dashboards/building.md b/explore-analyze/dashboards/building.md
index 0cc3be585..da5e420ec 100644
--- a/explore-analyze/dashboards/building.md
+++ b/explore-analyze/dashboards/building.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/create-dashboards.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/create-dashboards.html
+products:
+  - id: kibana
 ---
 
 # Building dashboards [create-dashboards]
diff --git a/explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md b/explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
index 2f623c9c1..a0ad112d5 100644
--- a/explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
+++ b/explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/create-a-dashboard-of-panels-with-ecommerce-data.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/create-a-dashboard-of-panels-with-ecommerce-data.html
+products:
+  - id: kibana
 ---
 
 # Create a dashboard with time series charts [create-a-dashboard-of-panels-with-ecommerce-data]
diff --git a/explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md b/explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
index d2cbcd612..0549c81a4 100644
--- a/explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
+++ b/explore-analyze/dashboards/create-dashboard-of-panels-with-web-server-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/create-a-dashboard-of-panels-with-web-server-data.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/create-a-dashboard-of-panels-with-web-server-data.html
+products:
+  - id: kibana
 ---
 
 # Create a simple dashboard to monitor website logs [create-a-dashboard-of-panels-with-web-server-data]
diff --git a/explore-analyze/dashboards/create-dashboard.md b/explore-analyze/dashboards/create-dashboard.md
index 2c84f2e12..8cdd14c77 100644
--- a/explore-analyze/dashboards/create-dashboard.md
+++ b/explore-analyze/dashboards/create-dashboard.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/create-dashboard.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/create-dashboard.html
+products:
+  - id: kibana
 ---
 
 # Create a dashboard [create-dashboard]
diff --git a/explore-analyze/dashboards/drilldowns.md b/explore-analyze/dashboards/drilldowns.md
index 5cd310353..7859ede01 100644
--- a/explore-analyze/dashboards/drilldowns.md
+++ b/explore-analyze/dashboards/drilldowns.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/drilldowns.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/drilldowns.html
+products:
+  - id: kibana
 ---
 
 # Add drilldowns [drilldowns]
diff --git a/explore-analyze/dashboards/duplicate-dashboards.md b/explore-analyze/dashboards/duplicate-dashboards.md
index ef93a80a5..1a5084a05 100644
--- a/explore-analyze/dashboards/duplicate-dashboards.md
+++ b/explore-analyze/dashboards/duplicate-dashboards.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/duplicate-dashboards.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/duplicate-dashboards.html
+products:
+  - id: kibana
 ---
 
 # Duplicate a dashboard [duplicate-dashboards]
diff --git a/explore-analyze/dashboards/import-dashboards.md b/explore-analyze/dashboards/import-dashboards.md
index b3e87f04d..75f587f5f 100644
--- a/explore-analyze/dashboards/import-dashboards.md
+++ b/explore-analyze/dashboards/import-dashboards.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/_import_dashboards.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/_import_dashboards.html
+products:
+  - id: kibana
 ---
 
 # Import a dashboard [_import_dashboards]
diff --git a/explore-analyze/dashboards/managing.md b/explore-analyze/dashboards/managing.md
index fccddc0a3..61c01a1b9 100644
--- a/explore-analyze/dashboards/managing.md
+++ b/explore-analyze/dashboards/managing.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/_manage_dashboards.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/_manage_dashboards.html
+products:
+  - id: kibana
 ---
 
 # Managing dashboards [_manage_dashboards]
diff --git a/explore-analyze/dashboards/open-dashboard.md b/explore-analyze/dashboards/open-dashboard.md
index e7e66b3e4..17cd2fe89 100644
--- a/explore-analyze/dashboards/open-dashboard.md
+++ b/explore-analyze/dashboards/open-dashboard.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/open-the-dashboard.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/open-the-dashboard.html
+products:
+  - id: kibana
 ---
 
 # Edit a dashboard [open-the-dashboard]
diff --git a/explore-analyze/dashboards/sharing.md b/explore-analyze/dashboards/sharing.md
index 1eb705399..5e9626aa6 100644
--- a/explore-analyze/dashboards/sharing.md
+++ b/explore-analyze/dashboards/sharing.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/share-the-dashboard.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/share-the-dashboard.html
+products:
+  - id: kibana
 ---
 
 # Sharing dashboards [share-the-dashboard]
diff --git a/explore-analyze/dashboards/tutorials.md b/explore-analyze/dashboards/tutorials.md
index 0b14213c4..243e75368 100644
--- a/explore-analyze/dashboards/tutorials.md
+++ b/explore-analyze/dashboards/tutorials.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/_tutorials.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/_tutorials.html
+products:
+  - id: kibana
 ---
 
 # Tutorials [_tutorials]
diff --git a/explore-analyze/dashboards/using.md b/explore-analyze/dashboards/using.md
index c62c7125f..2216f1d1e 100644
--- a/explore-analyze/dashboards/using.md
+++ b/explore-analyze/dashboards/using.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/_use_and_filter_dashboards.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/_use_and_filter_dashboards.html
+products:
+  - id: kibana
 ---
 
 # Exploring dashboards [_use_and_filter_dashboards]
diff --git a/explore-analyze/discover.md b/explore-analyze/discover.md
index 3be758f77..b32440aaf 100644
--- a/explore-analyze/discover.md
+++ b/explore-analyze/discover.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/discover.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/discover.html
+products:
+  - id: kibana
 ---
 
 # Discover [discover]
diff --git a/explore-analyze/discover/discover-get-started.md b/explore-analyze/discover/discover-get-started.md
index 8542ace81..a06ef93b6 100644
--- a/explore-analyze/discover/discover-get-started.md
+++ b/explore-analyze/discover/discover-get-started.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/discover-get-started.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/discover-get-started.html
+products:
+  - id: kibana
 ---
 
 # Explore fields and data with Discover [discover-get-started]
diff --git a/explore-analyze/discover/discover-search-for-relevance.md b/explore-analyze/discover/discover-search-for-relevance.md
index 492d0bbe2..206595106 100644
--- a/explore-analyze/discover/discover-search-for-relevance.md
+++ b/explore-analyze/discover/discover-search-for-relevance.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/discover-search-for-relevance.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/discover-search-for-relevance.html
+products:
+  - id: kibana
 ---
 
 # Search for relevance [discover-search-for-relevance]
diff --git a/explore-analyze/discover/document-explorer.md b/explore-analyze/discover/document-explorer.md
index e7d0a9632..05edfa7e8 100644
--- a/explore-analyze/discover/document-explorer.md
+++ b/explore-analyze/discover/document-explorer.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/document-explorer.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/document-explorer.html
+products:
+  - id: kibana
 ---
 
 # Customize the Discover view [document-explorer]
diff --git a/explore-analyze/discover/run-pattern-analysis-discover.md b/explore-analyze/discover/run-pattern-analysis-discover.md
index 2d92fa45d..127922d84 100644
--- a/explore-analyze/discover/run-pattern-analysis-discover.md
+++ b/explore-analyze/discover/run-pattern-analysis-discover.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/run-pattern-analysis-discover.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/run-pattern-analysis-discover.html
+products:
+  - id: kibana
 ---
 
 # Run a pattern analysis on your log data [run-pattern-analysis-discover]
diff --git a/explore-analyze/discover/save-open-search.md b/explore-analyze/discover/save-open-search.md
index e8f4fcfdd..bbdfcb743 100644
--- a/explore-analyze/discover/save-open-search.md
+++ b/explore-analyze/discover/save-open-search.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: Save a search for reuse
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/save-open-search.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
 ---
 
 # Discover sessions: Save a search for reuse [save-open-search]
diff --git a/explore-analyze/discover/search-sessions.md b/explore-analyze/discover/search-sessions.md
index fa866127f..b7bf67c0d 100644
--- a/explore-analyze/discover/search-sessions.md
+++ b/explore-analyze/discover/search-sessions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/search-sessions.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/search-sessions.html
+products:
+  - id: kibana
 ---
 
 # Run a search session in the background [search-sessions]
diff --git a/explore-analyze/discover/show-field-statistics.md b/explore-analyze/discover/show-field-statistics.md
index 250250855..cba096008 100644
--- a/explore-analyze/discover/show-field-statistics.md
+++ b/explore-analyze/discover/show-field-statistics.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/show-field-statistics.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/show-field-statistics.html
+products:
+  - id: kibana
 ---
 
 # View field statistics [show-field-statistics]
diff --git a/explore-analyze/discover/try-esql.md b/explore-analyze/discover/try-esql.md
index 18145db85..a9cd37809 100644
--- a/explore-analyze/discover/try-esql.md
+++ b/explore-analyze/discover/try-esql.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/try-esql.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/try-esql.html
+products:
+  - id: kibana
 ---
 
 # Using ES|QL [try-esql]
diff --git a/explore-analyze/elastic-inference/inference-api.md b/explore-analyze/elastic-inference/inference-api.md
index e4e5b195a..20a0b35f4 100644
--- a/explore-analyze/elastic-inference/inference-api.md
+++ b/explore-analyze/elastic-inference/inference-api.md
@@ -1,11 +1,12 @@
 ---
+navigation_title: Inference integrations
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/inference-endpoints.html
-
-navigation_title: Inference integrations
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
 ---
 
 # Integrate with third-party services
diff --git a/explore-analyze/find-and-organize.md b/explore-analyze/find-and-organize.md
index 5ef56ac43..9841b17fc 100644
--- a/explore-analyze/find-and-organize.md
+++ b/explore-analyze/find-and-organize.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/project-settings-content.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/project-settings-content.html
+products:
+  - id: cloud-serverless
 ---
 
 # Find and organize content
diff --git a/explore-analyze/find-and-organize/data-views.md b/explore-analyze/find-and-organize/data-views.md
index 572a90f80..f7a68eebd 100644
--- a/explore-analyze/find-and-organize/data-views.md
+++ b/explore-analyze/find-and-organize/data-views.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/data-views.html
   - https://www.elastic.co/guide/en/serverless/current/data-views.html
   - https://www.elastic.co/guide/en/kibana/current/managing-data-views.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Data views [data-views]
diff --git a/explore-analyze/find-and-organize/files.md b/explore-analyze/find-and-organize/files.md
index 3e8e6ea8e..a3abc1ac6 100644
--- a/explore-analyze/find-and-organize/files.md
+++ b/explore-analyze/find-and-organize/files.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/files.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/files.html
+products:
+  - id: cloud-serverless
 ---
 
 # Files [files]
diff --git a/explore-analyze/find-and-organize/find-apps-and-objects.md b/explore-analyze/find-and-organize/find-apps-and-objects.md
index 386e5b19a..69f611b09 100644
--- a/explore-analyze/find-and-organize/find-apps-and-objects.md
+++ b/explore-analyze/find-and-organize/find-apps-and-objects.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/introduction.html#kibana-navigation-search
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/introduction.html#kibana-navigation-search
+products:
+  - id: kibana
 ---
 
 # Find apps and objects [kibana-navigation-search]
diff --git a/explore-analyze/find-and-organize/reports.md b/explore-analyze/find-and-organize/reports.md
index d86b3f548..9a04311e5 100644
--- a/explore-analyze/find-and-organize/reports.md
+++ b/explore-analyze/find-and-organize/reports.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/reports.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/reports.html
+products:
+  - id: cloud-serverless
 ---
 
 # Reports [reports]
diff --git a/explore-analyze/find-and-organize/saved-objects.md b/explore-analyze/find-and-organize/saved-objects.md
index 7c622a007..b2e95a1ab 100644
--- a/explore-analyze/find-and-organize/saved-objects.md
+++ b/explore-analyze/find-and-organize/saved-objects.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/saved-objects.html
   - https://www.elastic.co/guide/en/kibana/current/managing-saved-objects.html
   - https://www.elastic.co/guide/en/kibana/current/saved-object-ids.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Saved objects [saved-objects]
diff --git a/explore-analyze/find-and-organize/tags.md b/explore-analyze/find-and-organize/tags.md
index 1f9a685bf..0d87cdb48 100644
--- a/explore-analyze/find-and-organize/tags.md
+++ b/explore-analyze/find-and-organize/tags.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/tags.html
   - https://www.elastic.co/guide/en/kibana/current/managing-tags.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Tags [managing-tags]
diff --git a/explore-analyze/geospatial-analysis.md b/explore-analyze/geospatial-analysis.md
index 1a5fc2782..b48598526 100644
--- a/explore-analyze/geospatial-analysis.md
+++ b/explore-analyze/geospatial-analysis.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/geospatial-analysis.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/geospatial-analysis.html
+products:
+  - id: elasticsearch
 ---
 
 # Geospatial analysis [geospatial-analysis]
diff --git a/explore-analyze/index.md b/explore-analyze/index.md
index 5650d0089..885c33c8b 100644
--- a/explore-analyze/index.md
+++ b/explore-analyze/index.md
@@ -1,13 +1,16 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-explore-your-data.html
   - https://www.elastic.co/guide/en/kibana/current/introduction.html#visualize-and-analyze
   - https://www.elastic.co/guide/en/kibana/current/get-started.html
   - https://www.elastic.co/guide/en/kibana/current/accessibility.html
   - https://www.elastic.co/guide/en/kibana/current/introduction.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Explore and analyze
diff --git a/explore-analyze/machine-learning.md b/explore-analyze/machine-learning.md
index 33c2785e0..79e9a9ac7 100644
--- a/explore-analyze/machine-learning.md
+++ b/explore-analyze/machine-learning.md
@@ -1,12 +1,15 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: Machine learning
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/index.html
   - https://www.elastic.co/guide/en/machine-learning/current/machine-learning-intro.html
   - https://www.elastic.co/guide/en/serverless/current/machine-learning.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: machine-learning
+  - id: cloud-serverless
 ---
 
 # What is Elastic Machine Learning? [machine-learning-intro]
diff --git a/explore-analyze/machine-learning/anomaly-detection.md b/explore-analyze/machine-learning/anomaly-detection.md
index 76a0dc75f..0db903840 100644
--- a/explore-analyze/machine-learning/anomaly-detection.md
+++ b/explore-analyze/machine-learning/anomaly-detection.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-overview.html
   - https://www.elastic.co/guide/en/kibana/current/xpack-ml-anomalies.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: machine-learning
+  - id: kibana
 ---
 
 # Anomaly detection [ml-ad-overview]
diff --git a/explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md b/explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
index 33ad4329a..b4c3b4b60 100644
--- a/explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
+++ b/explore-analyze/machine-learning/anomaly-detection/anomaly-detection-scale.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/anomaly-detection-scale.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/anomaly-detection-scale.html
+products:
+  - id: machine-learning
 ---
 
 # Working with anomaly detection at scale [anomaly-detection-scale]
diff --git a/explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md b/explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
index b95b4f730..fc0df222b 100644
--- a/explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
+++ b/explore-analyze/machine-learning/anomaly-detection/anomaly-how-tos.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
-navigation_title: "How-tos"
+navigation_title: How-tos
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/anomaly-how-tos.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-tune-anomaly-detection-job.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: machine-learning
+  - id: cloud-serverless
 ---
 
 # How-tos [anomaly-how-tos]
diff --git a/explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md b/explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
index bad0afb6e..6da288a5c 100644
--- a/explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
+++ b/explore-analyze/machine-learning/anomaly-detection/geographic-anomalies.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/geographic-anomalies.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/geographic-anomalies.html
+products:
+  - id: machine-learning
 ---
 
 # Detecting anomalous locations in geographic data [geographic-anomalies]
diff --git a/explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md b/explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
index 9df2b434c..5675fe62c 100644
--- a/explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
+++ b/explore-analyze/machine-learning/anomaly-detection/mapping-anomalies.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/mapping-anomalies.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/mapping-anomalies.html
+products:
+  - id: machine-learning
 ---
 
 # Mapping anomalies by location [mapping-anomalies]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
index bea1d095f..f9a0d9b9a 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-algorithms.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-algorithms.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-algorithms.html
+products:
+  - id: machine-learning
 ---
 
 # Anomaly detection algorithms [ml-ad-algorithms]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
index f199272a0..798adb853 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-concepts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-concepts.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-concepts.html
+products:
+  - id: machine-learning
 ---
 
 # Advanced concepts [ml-ad-concepts]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
index fe9fd9164..30e2c6baa 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-explain.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-explain.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-explain.html
+products:
+  - id: machine-learning
 ---
 
 # Anomaly score explanation [ml-ad-explain]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
index 7318ae2dd..2888fb53e 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-finding-anomalies.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Finding anomalies
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-finding-anomalies.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Finding anomalies"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-finding-anomalies.html
+products:
+  - id: machine-learning
 ---
 
 # Finding anomalies [ml-ad-finding-anomalies]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
index ed0afcdd0..33444c881 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-forecast.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-forecast.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-forecast-anomalies.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: machine-learning
+  - id: cloud-serverless
 ---
 
 # Forecast future behavior [ml-ad-forecast]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
index 3cb2d710c..d330c9a4c 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-plan.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Plan your analysis
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-plan.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Plan your analysis"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-plan.html
+products:
+  - id: machine-learning
 ---
 
 # Plan your analysis [ml-ad-plan]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
index 357a6b64c..23abf01a8 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-resources.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-resources.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-resources.html
+products:
+  - id: machine-learning
 ---
 
 # Resources [ml-ad-resources]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
index 010898756..9acade4ae 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-run-jobs.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Run a job
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-run-jobs.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Run a job"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-run-jobs.html
+products:
+  - id: machine-learning
 ---
 
 # Run a job [ml-ad-run-jobs]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
index 13bfa6a85..f49bbd556 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-troubleshooting.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Troubleshooting and FAQ
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-troubleshooting.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Troubleshooting and FAQ"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-troubleshooting.html
+products:
+  - id: machine-learning
 ---
 
 # Troubleshooting and FAQ [ml-ad-troubleshooting]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md b/explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
index 0c0792aa1..9fc9d872e 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-ad-view-results.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: View the results
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-view-results.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "View the results"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-ad-view-results.html
+products:
+  - id: machine-learning
 ---
 
 # View the results [ml-ad-view-results]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md b/explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
index 5db834daf..b713bb48f 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-anomaly-detection-job-types.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Job types
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-anomaly-detection-job-types.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Job types"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-anomaly-detection-job-types.html
+products:
+  - id: machine-learning
 ---
 
 
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md b/explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
index 89dd8c62b..4ee94827c 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-api-quickref.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-api-quickref.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-api-quickref.html
+products:
+  - id: machine-learning
 ---
 
 # API quick reference [ml-api-quickref]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
index 1e559739c..efb24f043 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-aggregation.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-aggregation.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-aggregation.html
+products:
+  - id: machine-learning
 ---
 
 # Aggregating data for faster performance [ml-configuring-aggregation]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
index f57e10ee6..19fa5c2de 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-alerts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-alerts.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-alerts.html
+products:
+  - id: machine-learning
 ---
 
 # Generating alerts for anomaly detection jobs [ml-configuring-alerts]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
index 3ed9286e8..ce9a372a9 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-categories.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-categories.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-categories.html
+products:
+  - id: machine-learning
 ---
 
 # Detecting anomalous categories of data [ml-configuring-categories]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
index 244467ba6..5b300ba4b 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-detector-custom-rules.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-detector-custom-rules.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-detector-custom-rules.html
+products:
+  - id: machine-learning
 ---
 
 # Customizing detectors with custom rules [ml-configuring-detector-custom-rules]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
index 290b39b2c..20c49057a 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-populations.md
@@ -1,11 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-anomaly-detection-job-types.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-anomaly-detection-job-types.html
-  # I'm not 100% sure about this one, but https://www.elastic.co/guide/en/machine-learning/8.18/ml-configuring-populations.html
-  # points to https://www.elastic.co/guide/en/machine-learning/8.18/ml-anomaly-detection-job-types.html#population-jobs
+products:
+  - id: machine-learning
 ---
 
 # Performing population analysis [ml-configuring-populations]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
index 491aff0e0..5ef8dae9c 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-transform.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-transform.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-transform.html
+products:
+  - id: machine-learning
 ---
 
 # Altering data in your datafeed with runtime fields [ml-configuring-transform]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
index 3038039fd..d280389db 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-configuring-url.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-url.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-configuring-url.html
+products:
+  - id: machine-learning
 ---
 
 # Adding custom URLs to machine learning results [ml-configuring-url]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md b/explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
index e8ef531c9..73a01b999 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-delayed-data-detection.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-delayed-data-detection.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-delayed-data-detection.html
+products:
+  - id: machine-learning
 ---
 
 # Handling delayed data [ml-delayed-data-detection]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-functions.md b/explore-analyze/machine-learning/anomaly-detection/ml-functions.md
index d13240059..8dd6772e9 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-functions.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-functions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-functions.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Function reference [ml-functions]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md b/explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
index 86bb7ddd1..f3e9e15e3 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-getting-started.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Tutorial
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-getting-started.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Tutorial"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-getting-started.html
+products:
+  - id: machine-learning
 ---
 
 # Tutorial: Getting started with anomaly detection [ml-getting-started]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md b/explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
index eb61d3622..9ce3b244f 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-jobs-from-lens.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Anomaly detection jobs from visualizations
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-jobs-from-lens.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Anomaly detection jobs from visualizations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-jobs-from-lens.html
+products:
+  - id: machine-learning
 ---
 
 # Anomaly detection jobs from visualizations [ml-jobs-from-lens]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md b/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
index f9ff90d0e..fb8748297 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Limitations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-limitations.html
+products:
+  - id: machine-learning
 ---
 
 # Limitations [ml-limitations]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md b/explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
index a7b5c4ced..d8046a23a 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-reverting-model-snapshot.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-reverting-model-snapshot.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-reverting-model-snapshot.html
+products:
+  - id: machine-learning
 ---
 
 # Reverting to a model snapshot [ml-reverting-model-snapshot]
diff --git a/explore-analyze/machine-learning/anomaly-detection/move-jobs.md b/explore-analyze/machine-learning/anomaly-detection/move-jobs.md
index 910dd8fad..085dcf8c5 100644
--- a/explore-analyze/machine-learning/anomaly-detection/move-jobs.md
+++ b/explore-analyze/machine-learning/anomaly-detection/move-jobs.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Exporting and importing machine learning jobs
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/move-jobs.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Exporting and importing machine learning jobs"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/move-jobs.html
+products:
+  - id: machine-learning
 ---
 
 # Exporting and importing machine learning jobs [move-jobs]
diff --git a/explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md b/explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
index 45f53c8d9..19d370a86 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ootb-ml-jobs.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Supplied configurations
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Supplied configurations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs.html
+products:
+  - id: machine-learning
 ---
 
 # Supplied configurations [ootb-ml-jobs]
diff --git a/explore-analyze/machine-learning/data-frame-analytics.md b/explore-analyze/machine-learning/data-frame-analytics.md
index 66bd1749e..38a7d17dd 100644
--- a/explore-analyze/machine-learning/data-frame-analytics.md
+++ b/explore-analyze/machine-learning/data-frame-analytics.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-dfanalytics.html
   - https://www.elastic.co/guide/en/kibana/current/xpack-ml-dfanalytics.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: machine-learning
+  - id: kibana
 ---
 
 # Data frame analytics [ml-dfanalytics]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md b/explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
index e37a434e2..20740438d 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/dfa-regression-lossfunction.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/dfa-regression-lossfunction.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/dfa-regression-lossfunction.html
+products:
+  - id: machine-learning
 ---
 
 # Loss functions for regression analyses [dfa-regression-lossfunction]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md b/explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
index fbe4848ee..776edd4b1 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/hyperparameters.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/hyperparameters.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/hyperparameters.html
+products:
+  - id: machine-learning
 ---
 
 # Hyperparameter optimization [hyperparameters]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
index faad97da9..1dbfb57d6 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-classification.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-classification.html
+products:
+  - id: machine-learning
 ---
 
 # Predicting classes with classification [ml-dfa-classification]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
index 12aed85b9..bd59eb17e 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-concepts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-concepts.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-concepts.html
+products:
+  - id: machine-learning
 ---
 
 # Advanced concepts [ml-dfa-concepts]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
index 6cfdb5132..a6a2a2e3e 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-custom-urls.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-custom-urls.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-custom-urls.html
+products:
+  - id: machine-learning
 ---
 
 # Adding custom URLs to data frame analytics jobs [ml-dfa-custom-urls]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
index 06f36063e..9e61e1dd9 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-finding-outliers.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-finding-outliers.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-finding-outliers.html
+products:
+  - id: machine-learning
 ---
 
 # Finding outliers [ml-dfa-finding-outliers]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
index f5f26da76..8ef7cf647 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Limitations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-limitations.html
+products:
+  - id: machine-learning
 ---
 
 # Limitations [ml-dfa-limitations]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
index 072c5243a..ebe41a436 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-overview.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Overview
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-overview.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Overview"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-overview.html
+products:
+  - id: machine-learning
 ---
 
 # Overview [ml-dfa-overview]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
index 7a7557763..d2206838c 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-phases.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: How {{dfanalytics-jobs}} work
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-phases.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "How {{dfanalytics-jobs}} work"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-phases.html
+products:
+  - id: machine-learning
 ---
 
 
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
index 69149af5f..14e33ccaa 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-regression.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-regression.html
+products:
+  - id: machine-learning
 ---
 
 # Predicting numerical values with regression [ml-dfa-regression]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
index d5844d484..1b58ebc9e 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-resources.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-resources.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-resources.html
+products:
+  - id: machine-learning
 ---
 
 # Resources [ml-dfa-resources]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
index dc614a2c9..8abe9970b 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-scale.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-scale.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-scale.html
+products:
+  - id: machine-learning
 ---
 
 # Working with data frame analytics at scale [ml-dfa-scale]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
index 5beab1c20..534defc08 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfanalytics-apis.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfanalytics-apis.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-dfanalytics-apis.html
+products:
+  - id: machine-learning
 ---
 
 # API quick reference [ml-dfanalytics-apis]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
index cd0741bc8..3b7cf13b5 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-encoding.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-encoding.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-encoding.html
+products:
+  - id: machine-learning
 ---
 
 # Feature encoding [ml-feature-encoding]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
index 51c7c3505..acceff3df 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-importance.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-importance.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-importance.html
+products:
+  - id: machine-learning
 ---
 
 # Feature importance [ml-feature-importance]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
index 56f8b026c..a33bd9897 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-feature-processors.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Feature processors
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-processors.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Feature processors"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-feature-processors.html
+products:
+  - id: machine-learning
 ---
 
 # Feature processors [ml-feature-processors]
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md b/explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
index 5d026b2c1..0ef5ce051 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-trained-models.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-trained-models.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-trained-models.html
+products:
+  - id: machine-learning
 ---
 
 # Trained models [ml-trained-models]
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana.md b/explore-analyze/machine-learning/machine-learning-in-kibana.md
index a276a6f78..9038e189d 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: ML in Kibana
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-ml.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
 ---
 
 # Machine learning in Kibana [xpack-ml]
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md b/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
index 51a07621f..d3a3de414 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana/inference-processing.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/ingest-pipeline-search-inference.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/ingest-pipeline-search-inference.html
+products:
+  - id: elasticsearch
 ---
 
 # {{infer-cap}} processing [ingest-pipeline-search-inference]
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
index cf7e17809..cd02d6506 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-aiops.md
@@ -1,12 +1,15 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-ml-aiops.html
   - https://www.elastic.co/guide/en/serverless/current/observability-machine-learning.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-analyze-spikes.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-detect-change-points.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # AIOps Labs [xpack-ml-aiops]
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-anomalies.md b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-anomalies.md
index ee31df52f..689aa13aa 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-anomalies.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-anomalies.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-ml-anomalies.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-detect-anomalies.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Anomaly detection [xpack-ml-anomalies]
diff --git a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-dfanalytics.md b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-dfanalytics.md
index c51025390..e0bccff5e 100644
--- a/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-dfanalytics.md
+++ b/explore-analyze/machine-learning/machine-learning-in-kibana/xpack-ml-dfanalytics.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/xpack-ml-dfanalytics.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/xpack-ml-dfanalytics.html
+products:
+  - id: kibana
 ---
 
 # Data frame analytics [xpack-ml-dfanalytics]
diff --git a/explore-analyze/machine-learning/nlp.md b/explore-analyze/machine-learning/nlp.md
index ac11d7081..c4fb05564 100644
--- a/explore-analyze/machine-learning/nlp.md
+++ b/explore-analyze/machine-learning/nlp.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp.html
+products:
+  - id: machine-learning
 ---
 
 # NLP [ml-nlp]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-apis.md b/explore-analyze/machine-learning/nlp/ml-nlp-apis.md
index 236a75b53..6053bb619 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-apis.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-apis.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-apis.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-apis.html
+products:
+  - id: machine-learning
 ---
 
 # API quick reference [ml-nlp-apis]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md b/explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
index d3ba9b57a..010723898 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-built-in-models.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-built-in-models.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-built-in-models.html
+products:
+  - id: machine-learning
 ---
 
 # Built-in NLP models [ml-nlp-built-in-models]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md b/explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
index 99f1aaefd..8d21898d0 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-classify-text.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-classify-text.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-classify-text.html
+products:
+  - id: machine-learning
 ---
 
 # Classify text [ml-nlp-classify-text]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md b/explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
index d6853ec4c..6ba08e791 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-deploy-model.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-deploy-model.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-deploy-model.html
+products:
+  - id: machine-learning
 ---
 
 # Deploy the model in your cluster [ml-nlp-deploy-model]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md b/explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
index 65471b76e..d492a6b57 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-deploy-models.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-deploy-models.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-deploy-models.html
+products:
+  - id: machine-learning
 ---
 
 # Deploy trained models [ml-nlp-deploy-models]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-e5.md b/explore-analyze/machine-learning/nlp/ml-nlp-e5.md
index f64cbe150..d76a854ec 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-e5.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-e5.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: E5
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-e5.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "E5"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-e5.html
+products:
+  - id: machine-learning
 ---
 
 # E5 [ml-nlp-e5]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-elser.md b/explore-analyze/machine-learning/nlp/ml-nlp-elser.md
index a0e3755c4..e52620267 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-elser.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-elser.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: ELSER
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-elser.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "ELSER"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-elser.html
+products:
+  - id: machine-learning
 ---
 
 # ELSER [ml-nlp-elser]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-examples.md b/explore-analyze/machine-learning/nlp/ml-nlp-examples.md
index 55741eaa9..b4a604a2c 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-examples.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-examples.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-examples.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-examples.html
+products:
+  - id: machine-learning
 ---
 
 # Examples [ml-nlp-examples]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md b/explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
index 92a30b2c1..d06d6e323 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-extract-info.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-extract-info.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-extract-info.html
+products:
+  - id: machine-learning
 ---
 
 # Extract information [ml-nlp-extract-info]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-import-model.md b/explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
index 24dcb3603..b45e0fea4 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-import-model.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-import-model.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-import-model.html
+products:
+  - id: machine-learning
 ---
 
 # Import the trained model and vocabulary [ml-nlp-import-model]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-inference.md b/explore-analyze/machine-learning/nlp/ml-nlp-inference.md
index 48fc52e27..4798ce813 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-inference.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-inference.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-inference.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-inference.html
+products:
+  - id: machine-learning
 ---
 
 # Add NLP inference to ingest pipelines [ml-nlp-inference]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md b/explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
index cc6e50008..afec38960 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-lang-ident.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-lang-ident.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-lang-ident.html
+products:
+  - id: machine-learning
 ---
 
 # Language identification [ml-nlp-lang-ident]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md b/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
index c2bb25741..e0ede3195 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-limitations.html
+products:
+  - id: machine-learning
 ---
 
 # Limitations [ml-nlp-limitations]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md b/explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
index d3b9af07d..485b9505d 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-model-ref.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Compatible third party models
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-model-ref.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Compatible third party models"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-model-ref.html
+products:
+  - id: machine-learning
 ---
 
 # Compatible third party models [ml-nlp-model-ref]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md b/explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
index 163b5fa6b..66f3ab67f 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-ner-example.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Named entity recognition
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-ner-example.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Named entity recognition"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-ner-example.html
+products:
+  - id: machine-learning
 ---
 
 # Named entity recognition [ml-nlp-ner-example]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-overview.md b/explore-analyze/machine-learning/nlp/ml-nlp-overview.md
index 1912906d9..52b3f9a88 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-overview.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-overview.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-overview.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-overview.html
+products:
+  - id: machine-learning
 ---
 
 # Overview [ml-nlp-overview]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-rerank.md b/explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
index 3215e8c5c..37a49e68f 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-rerank.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-rerank.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-rerank.html
+products:
+  - id: machine-learning
 ---
 
 # Elastic Rerank [ml-nlp-rerank]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md b/explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
index 3f899165b..cb6ab2a2e 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-search-compare.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-search-compare.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-search-compare.html
+products:
+  - id: machine-learning
 ---
 
 # Search and compare text [ml-nlp-search-compare]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-select-model.md b/explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
index 0539204dd..2c57c831a 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-select-model.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-select-model.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-select-model.html
+products:
+  - id: machine-learning
 ---
 
 # Select a trained model [ml-nlp-select-model]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md b/explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
index ee0255dbd..fb25fb897 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-test-inference.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-test-inference.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-test-inference.html
+products:
+  - id: machine-learning
 ---
 
 # Try it out [ml-nlp-test-inference]
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md b/explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
index 45d04437d..4f1b7953a 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-text-emb-vector-search-example.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Text embedding and semantic search
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-text-emb-vector-search-example.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Text embedding and semantic search"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-text-emb-vector-search-example.html
+products:
+  - id: machine-learning
 ---
 
 # Text embedding and semantic search [ml-nlp-text-emb-vector-search-example]
diff --git a/explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md b/explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
index a8f9f9bba..cde5d80a1 100644
--- a/explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
+++ b/explore-analyze/machine-learning/nlp/nlp-end-to-end-tutorial.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: End-to-end tutorial
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/nlp-example.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "End-to-end tutorial"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/nlp-example.html
+products:
+  - id: elasticsearch
 ---
 
 # An NLP end-to-end tutorial [nlp-example]
diff --git a/explore-analyze/machine-learning/setting-up-machine-learning.md b/explore-analyze/machine-learning/setting-up-machine-learning.md
index e10fd4bef..193eeb091 100644
--- a/explore-analyze/machine-learning/setting-up-machine-learning.md
+++ b/explore-analyze/machine-learning/setting-up-machine-learning.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Setup and security
+mapped_pages:
+  - https://www.elastic.co/guide/en/machine-learning/current/setup.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Setup and security"
-mapped_pages:
-  - https://www.elastic.co/guide/en/machine-learning/current/setup.html
+products:
+  - id: machine-learning
 ---
 
 # Setting up machine learning [setup]
diff --git a/explore-analyze/numeral-formatting.md b/explore-analyze/numeral-formatting.md
index 7de896b5f..77e286764 100644
--- a/explore-analyze/numeral-formatting.md
+++ b/explore-analyze/numeral-formatting.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/numeral.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/numeral.html
+products:
+  - id: kibana
 ---
 
 # Numeral formatting [numeral]
diff --git a/explore-analyze/query-filter.md b/explore-analyze/query-filter.md
index 47de4ce1a..2473e95dc 100644
--- a/explore-analyze/query-filter.md
+++ b/explore-analyze/query-filter.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-analyze.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-analyze.html
+products:
+  - id: elasticsearch
 ---
 
 # Querying and filtering [search-analyze]
diff --git a/explore-analyze/query-filter/aggregations.md b/explore-analyze/query-filter/aggregations.md
index b9913ade0..5db9dd405 100644
--- a/explore-analyze/query-filter/aggregations.md
+++ b/explore-analyze/query-filter/aggregations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html
+products:
+  - id: elasticsearch
 ---
 
 # Aggregations [search-aggregations]
diff --git a/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md b/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md
index 2559d0c46..59205ecf4 100644
--- a/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md
+++ b/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Basics
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/aggregations-tutorial.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Basics"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/aggregations-tutorial.html
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Analyze eCommerce data with aggregations using Query DSL [aggregations-tutorial]
diff --git a/explore-analyze/query-filter/filtering.md b/explore-analyze/query-filter/filtering.md
index 2a3e05124..976de418a 100644
--- a/explore-analyze/query-filter/filtering.md
+++ b/explore-analyze/query-filter/filtering.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/kibana-concepts-analysts.html
   - https://www.elastic.co/guide/en/kibana/current/set-time-filter.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
 ---
 
 # Filtering in Kibana
diff --git a/explore-analyze/query-filter/languages/eql.md b/explore-analyze/query-filter/languages/eql.md
index a3fc073e5..012acd4d4 100644
--- a/explore-analyze/query-filter/languages/eql.md
+++ b/explore-analyze/query-filter/languages/eql.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: EQL
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/eql.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "EQL"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/eql.html
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/explore-analyze/query-filter/languages/esql-cross-clusters.md b/explore-analyze/query-filter/languages/esql-cross-clusters.md
index d14421df6..349501369 100644
--- a/explore-analyze/query-filter/languages/esql-cross-clusters.md
+++ b/explore-analyze/query-filter/languages/esql-cross-clusters.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Query across clusters
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-cross-clusters.html
 applies_to:
   stack: ga
   serverless: unavailable
-navigation_title: "Query across clusters"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-cross-clusters.html
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/explore-analyze/query-filter/languages/esql-elastic-security.md b/explore-analyze/query-filter/languages/esql-elastic-security.md
index c66b952bc..78cc8709d 100644
--- a/explore-analyze/query-filter/languages/esql-elastic-security.md
+++ b/explore-analyze/query-filter/languages/esql-elastic-security.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: "{{elastic-sec}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-elastic-security.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Use ES|QL in {{elastic-sec}} [esql-elastic-security]
diff --git a/explore-analyze/query-filter/languages/esql-examples.md b/explore-analyze/query-filter/languages/esql-examples.md
index fa16e09c2..1f16e8e03 100644
--- a/explore-analyze/query-filter/languages/esql-examples.md
+++ b/explore-analyze/query-filter/languages/esql-examples.md
@@ -2,7 +2,7 @@
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Examples"
+navigation_title: Examples
 ---
 
 # {{esql}} examples [esql-examples]
diff --git a/explore-analyze/query-filter/languages/esql-getting-started.md b/explore-analyze/query-filter/languages/esql-getting-started.md
index e59e28096..2b944998f 100644
--- a/explore-analyze/query-filter/languages/esql-getting-started.md
+++ b/explore-analyze/query-filter/languages/esql-getting-started.md
@@ -2,7 +2,7 @@
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Get started"
+navigation_title: Get started
 ---
 
 # Get started with {{esql}} queries [esql-getting-started]
diff --git a/explore-analyze/query-filter/languages/esql-kibana.md b/explore-analyze/query-filter/languages/esql-kibana.md
index f229fc643..025490b8c 100644
--- a/explore-analyze/query-filter/languages/esql-kibana.md
+++ b/explore-analyze/query-filter/languages/esql-kibana.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: "{{kib}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-kibana.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Use ES|QL in Kibana [esql-kibana]
diff --git a/explore-analyze/query-filter/languages/esql-multi-index.md b/explore-analyze/query-filter/languages/esql-multi-index.md
index e5ca7aae7..1b3ba8768 100644
--- a/explore-analyze/query-filter/languages/esql-multi-index.md
+++ b/explore-analyze/query-filter/languages/esql-multi-index.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Query multiple indices
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-multi-index.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Query multiple indices"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-multi-index.html
+products:
+  - id: elasticsearch
 ---
 
 # Use ES|QL to query multiple indices [esql-multi-index]
diff --git a/explore-analyze/query-filter/languages/esql-multi.md b/explore-analyze/query-filter/languages/esql-multi.md
index 39750df51..c419703ed 100644
--- a/explore-analyze/query-filter/languages/esql-multi.md
+++ b/explore-analyze/query-filter/languages/esql-multi.md
@@ -2,7 +2,7 @@
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Query multiple sources"
+navigation_title: Query multiple sources
 ---
 
 # Query multiple indices or clusters with {{esql}}
diff --git a/explore-analyze/query-filter/languages/esql-rest.md b/explore-analyze/query-filter/languages/esql-rest.md
index 5f4cda712..3a6fd5ace 100644
--- a/explore-analyze/query-filter/languages/esql-rest.md
+++ b/explore-analyze/query-filter/languages/esql-rest.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: "{{esql}} `_query` API"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-rest.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Use the {{esql}} `_query` API [esql-rest]
diff --git a/explore-analyze/query-filter/languages/esql-task-management.md b/explore-analyze/query-filter/languages/esql-task-management.md
index b8593f13e..f90ff930c 100644
--- a/explore-analyze/query-filter/languages/esql-task-management.md
+++ b/explore-analyze/query-filter/languages/esql-task-management.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Task management
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-task-management.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Task management"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-task-management.html
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/explore-analyze/query-filter/languages/esql-where.md b/explore-analyze/query-filter/languages/esql-where.md
index 0abe00b5b..827c9bad5 100644
--- a/explore-analyze/query-filter/languages/esql-where.md
+++ b/explore-analyze/query-filter/languages/esql-where.md
@@ -2,7 +2,7 @@
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Interfaces"
+navigation_title: Interfaces
 ---
 
 # Where can I use {{esql}}?
diff --git a/explore-analyze/query-filter/languages/esql.md b/explore-analyze/query-filter/languages/esql.md
index fcdeaeb3a..70b7a1c5c 100644
--- a/explore-analyze/query-filter/languages/esql.md
+++ b/explore-analyze/query-filter/languages/esql.md
@@ -5,6 +5,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-using.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-examples.html
   - https://www.elastic.co/guide/en/kibana/current/esql.html
+products:
+  - id: elasticsearch
+  - id: kibana
 ---
 
 # {{esql}} [esql]
diff --git a/explore-analyze/query-filter/languages/example-detect-threats-with-eql.md b/explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
index a8b30e66d..32610cf5b 100644
--- a/explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
+++ b/explore-analyze/query-filter/languages/example-detect-threats-with-eql.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-ex-threat-detection.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-ex-threat-detection.html
+products:
+  - id: elasticsearch
 ---
 
 # Example: Detect threats with EQL [eql-ex-threat-detection]
diff --git a/explore-analyze/query-filter/languages/kql.md b/explore-analyze/query-filter/languages/kql.md
index fbfcfbdd5..c8b58e0fe 100644
--- a/explore-analyze/query-filter/languages/kql.md
+++ b/explore-analyze/query-filter/languages/kql.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kuery-query.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kuery-query.html
+products:
+  - id: kibana
 ---
 
 # KQL [kuery-query]
diff --git a/explore-analyze/query-filter/languages/lucene-query-syntax.md b/explore-analyze/query-filter/languages/lucene-query-syntax.md
index 6b1f6ec29..a07b92a41 100644
--- a/explore-analyze/query-filter/languages/lucene-query-syntax.md
+++ b/explore-analyze/query-filter/languages/lucene-query-syntax.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/lucene-query.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/lucene-query.html
+products:
+  - id: kibana
 ---
 
 # Lucene query syntax [lucene-query]
diff --git a/explore-analyze/query-filter/languages/querydsl.md b/explore-analyze/query-filter/languages/querydsl.md
index 057baae51..4ee072620 100644
--- a/explore-analyze/query-filter/languages/querydsl.md
+++ b/explore-analyze/query-filter/languages/querydsl.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/query-filter-context.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Query DSL
diff --git a/explore-analyze/query-filter/languages/sql-async.md b/explore-analyze/query-filter/languages/sql-async.md
index 1d7d5c46d..26016ce0a 100644
--- a/explore-analyze/query-filter/languages/sql-async.md
+++ b/explore-analyze/query-filter/languages/sql-async.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-async.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-async.html
+products:
+  - id: elasticsearch
 ---
 
 # Run an async SQL search [sql-async]
diff --git a/explore-analyze/query-filter/languages/sql-cli.md b/explore-analyze/query-filter/languages/sql-cli.md
index d837bc985..93a376cff 100644
--- a/explore-analyze/query-filter/languages/sql-cli.md
+++ b/explore-analyze/query-filter/languages/sql-cli.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-cli.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-cli.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL CLI [sql-cli]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-dbeaver.md b/explore-analyze/query-filter/languages/sql-client-apps-dbeaver.md
index 366bda350..f6c7325e4 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-dbeaver.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-dbeaver.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-dbeaver.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-dbeaver.html
+products:
+  - id: elasticsearch
 ---
 
 # DBeaver [sql-client-apps-dbeaver]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-dbvis.md b/explore-analyze/query-filter/languages/sql-client-apps-dbvis.md
index 3d1367d57..a67747cdb 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-dbvis.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-dbvis.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-dbvis.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-dbvis.html
+products:
+  - id: elasticsearch
 ---
 
 # DbVisualizer [sql-client-apps-dbvis]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-excel.md b/explore-analyze/query-filter/languages/sql-client-apps-excel.md
index 774c361db..af9bcc14f 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-excel.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-excel.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-excel.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-excel.html
+products:
+  - id: elasticsearch
 ---
 
 # Microsoft Excel [sql-client-apps-excel]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-microstrat.md b/explore-analyze/query-filter/languages/sql-client-apps-microstrat.md
index 584e89859..f7edb85bf 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-microstrat.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-microstrat.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-microstrat.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-microstrat.html
+products:
+  - id: elasticsearch
 ---
 
 # MicroStrategy Desktop [sql-client-apps-microstrat]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-powerbi.md b/explore-analyze/query-filter/languages/sql-client-apps-powerbi.md
index 8b0125a21..c4ba3db47 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-powerbi.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-powerbi.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-powerbi.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-powerbi.html
+products:
+  - id: elasticsearch
 ---
 
 # Microsoft Power BI Desktop [sql-client-apps-powerbi]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-ps1.md b/explore-analyze/query-filter/languages/sql-client-apps-ps1.md
index 945b084fc..e7a3f5861 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-ps1.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-ps1.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-ps1.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-ps1.html
+products:
+  - id: elasticsearch
 ---
 
 # Microsoft PowerShell [sql-client-apps-ps1]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-qlik.md b/explore-analyze/query-filter/languages/sql-client-apps-qlik.md
index e07a4c51c..99af14343 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-qlik.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-qlik.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-qlik.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-qlik.html
+products:
+  - id: elasticsearch
 ---
 
 # Qlik Sense Desktop [sql-client-apps-qlik]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-squirrel.md b/explore-analyze/query-filter/languages/sql-client-apps-squirrel.md
index 9cadafe83..e792bedce 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-squirrel.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-squirrel.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-squirrel.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-squirrel.html
+products:
+  - id: elasticsearch
 ---
 
 # SQuirreL SQL [sql-client-apps-squirrel]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-tableau-desktop.md b/explore-analyze/query-filter/languages/sql-client-apps-tableau-desktop.md
index c24bb202e..43729ce76 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-tableau-desktop.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-tableau-desktop.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-tableau-desktop.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-tableau-desktop.html
+products:
+  - id: elasticsearch
 ---
 
 # Tableau Desktop [sql-client-apps-tableau-desktop]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-tableau-server.md b/explore-analyze/query-filter/languages/sql-client-apps-tableau-server.md
index 45977686d..e968ed29c 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-tableau-server.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-tableau-server.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-tableau-server.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-tableau-server.html
+products:
+  - id: elasticsearch
 ---
 
 # Tableau Server [sql-client-apps-tableau-server]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps-workbench.md b/explore-analyze/query-filter/languages/sql-client-apps-workbench.md
index 9fca7b3a3..b9821cf88 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps-workbench.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps-workbench.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-workbench.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps-workbench.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Workbench/J [sql-client-apps-workbench]
diff --git a/explore-analyze/query-filter/languages/sql-client-apps.md b/explore-analyze/query-filter/languages/sql-client-apps.md
index 0c922ba43..5dc59907a 100644
--- a/explore-analyze/query-filter/languages/sql-client-apps.md
+++ b/explore-analyze/query-filter/languages/sql-client-apps.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-client-apps.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Client Applications [sql-client-apps]
diff --git a/explore-analyze/query-filter/languages/sql-commands.md b/explore-analyze/query-filter/languages/sql-commands.md
index becbdd9b8..231754d74 100644
--- a/explore-analyze/query-filter/languages/sql-commands.md
+++ b/explore-analyze/query-filter/languages/sql-commands.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-commands.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-commands.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Commands [sql-commands]
diff --git a/explore-analyze/query-filter/languages/sql-concepts.md b/explore-analyze/query-filter/languages/sql-concepts.md
index 462ba1567..0f569971e 100644
--- a/explore-analyze/query-filter/languages/sql-concepts.md
+++ b/explore-analyze/query-filter/languages/sql-concepts.md
@@ -1,11 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: Conventions
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-concepts.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/_mapping_concepts_across_sql_and_elasticsearch.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Conventions and Terminology [sql-concepts]
diff --git a/explore-analyze/query-filter/languages/sql-data-types.md b/explore-analyze/query-filter/languages/sql-data-types.md
index b9d21cb09..0ced0e25b 100644
--- a/explore-analyze/query-filter/languages/sql-data-types.md
+++ b/explore-analyze/query-filter/languages/sql-data-types.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-data-types.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-data-types.html
+products:
+  - id: elasticsearch
 ---
 
 # Data Types [sql-data-types]
diff --git a/explore-analyze/query-filter/languages/sql-functions-aggs.md b/explore-analyze/query-filter/languages/sql-functions-aggs.md
index 52b005d1a..789a5b3e8 100644
--- a/explore-analyze/query-filter/languages/sql-functions-aggs.md
+++ b/explore-analyze/query-filter/languages/sql-functions-aggs.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-aggs.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-aggs.html
+products:
+  - id: elasticsearch
 ---
 
 # Aggregate Functions [sql-functions-aggs]
diff --git a/explore-analyze/query-filter/languages/sql-functions-conditional.md b/explore-analyze/query-filter/languages/sql-functions-conditional.md
index 019fd90df..64fa463ed 100644
--- a/explore-analyze/query-filter/languages/sql-functions-conditional.md
+++ b/explore-analyze/query-filter/languages/sql-functions-conditional.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-conditional.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-conditional.html
+products:
+  - id: elasticsearch
 ---
 
 # Conditional Functions And Expressions [sql-functions-conditional]
diff --git a/explore-analyze/query-filter/languages/sql-functions-datetime.md b/explore-analyze/query-filter/languages/sql-functions-datetime.md
index bb7ad9058..68c043df4 100644
--- a/explore-analyze/query-filter/languages/sql-functions-datetime.md
+++ b/explore-analyze/query-filter/languages/sql-functions-datetime.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-datetime.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-datetime.html
+products:
+  - id: elasticsearch
 ---
 
 # Date/Time and Interval Functions and Operators [sql-functions-datetime]
diff --git a/explore-analyze/query-filter/languages/sql-functions-geo.md b/explore-analyze/query-filter/languages/sql-functions-geo.md
index 4d3dda725..c43ff754c 100644
--- a/explore-analyze/query-filter/languages/sql-functions-geo.md
+++ b/explore-analyze/query-filter/languages/sql-functions-geo.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-geo.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-geo.html
+products:
+  - id: elasticsearch
 ---
 
 # Geo Functions [sql-functions-geo]
diff --git a/explore-analyze/query-filter/languages/sql-functions-grouping.md b/explore-analyze/query-filter/languages/sql-functions-grouping.md
index 94d64d38d..8d83b4ba4 100644
--- a/explore-analyze/query-filter/languages/sql-functions-grouping.md
+++ b/explore-analyze/query-filter/languages/sql-functions-grouping.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-grouping.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-grouping.html
+products:
+  - id: elasticsearch
 ---
 
 # Grouping Functions [sql-functions-grouping]
diff --git a/explore-analyze/query-filter/languages/sql-functions-math.md b/explore-analyze/query-filter/languages/sql-functions-math.md
index 9ff78c054..c7da80398 100644
--- a/explore-analyze/query-filter/languages/sql-functions-math.md
+++ b/explore-analyze/query-filter/languages/sql-functions-math.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-math.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-math.html
+products:
+  - id: elasticsearch
 ---
 
 # Mathematical Functions [sql-functions-math]
diff --git a/explore-analyze/query-filter/languages/sql-functions-search.md b/explore-analyze/query-filter/languages/sql-functions-search.md
index c721deca7..64e7105b8 100644
--- a/explore-analyze/query-filter/languages/sql-functions-search.md
+++ b/explore-analyze/query-filter/languages/sql-functions-search.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-search.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-search.html
+products:
+  - id: elasticsearch
 ---
 
 # Full-Text Search Functions [sql-functions-search]
diff --git a/explore-analyze/query-filter/languages/sql-functions-string.md b/explore-analyze/query-filter/languages/sql-functions-string.md
index bd9ce5cf8..41202913b 100644
--- a/explore-analyze/query-filter/languages/sql-functions-string.md
+++ b/explore-analyze/query-filter/languages/sql-functions-string.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-string.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-string.html
+products:
+  - id: elasticsearch
 ---
 
 # String Functions [sql-functions-string]
diff --git a/explore-analyze/query-filter/languages/sql-functions-system.md b/explore-analyze/query-filter/languages/sql-functions-system.md
index f3598a4de..d97d61da0 100644
--- a/explore-analyze/query-filter/languages/sql-functions-system.md
+++ b/explore-analyze/query-filter/languages/sql-functions-system.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-system.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-system.html
+products:
+  - id: elasticsearch
 ---
 
 # System Functions [sql-functions-system]
diff --git a/explore-analyze/query-filter/languages/sql-functions-type-conversion.md b/explore-analyze/query-filter/languages/sql-functions-type-conversion.md
index fff99681f..be0f399ce 100644
--- a/explore-analyze/query-filter/languages/sql-functions-type-conversion.md
+++ b/explore-analyze/query-filter/languages/sql-functions-type-conversion.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-type-conversion.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions-type-conversion.html
+products:
+  - id: elasticsearch
 ---
 
 # Type Conversion Functions [sql-functions-type-conversion]
diff --git a/explore-analyze/query-filter/languages/sql-functions.md b/explore-analyze/query-filter/languages/sql-functions.md
index 8966e55da..c83c79e36 100644
--- a/explore-analyze/query-filter/languages/sql-functions.md
+++ b/explore-analyze/query-filter/languages/sql-functions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-functions.html
+products:
+  - id: elasticsearch
 ---
 
 # Functions and Operators [sql-functions]
diff --git a/explore-analyze/query-filter/languages/sql-getting-started.md b/explore-analyze/query-filter/languages/sql-getting-started.md
index de1ed4f09..498ce3e6c 100644
--- a/explore-analyze/query-filter/languages/sql-getting-started.md
+++ b/explore-analyze/query-filter/languages/sql-getting-started.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: Getting started
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-getting-started.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Getting Started with SQL [sql-getting-started]
diff --git a/explore-analyze/query-filter/languages/sql-index-frozen.md b/explore-analyze/query-filter/languages/sql-index-frozen.md
index 2378fa2f4..88b45a7e3 100644
--- a/explore-analyze/query-filter/languages/sql-index-frozen.md
+++ b/explore-analyze/query-filter/languages/sql-index-frozen.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-index-frozen.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-index-frozen.html
+products:
+  - id: elasticsearch
 ---
 
 # Frozen Indices [sql-index-frozen]
diff --git a/explore-analyze/query-filter/languages/sql-index-patterns.md b/explore-analyze/query-filter/languages/sql-index-patterns.md
index 8e553e70a..8a89a795c 100644
--- a/explore-analyze/query-filter/languages/sql-index-patterns.md
+++ b/explore-analyze/query-filter/languages/sql-index-patterns.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-index-patterns.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-index-patterns.html
+products:
+  - id: elasticsearch
 ---
 
 # Index patterns [sql-index-patterns]
diff --git a/explore-analyze/query-filter/languages/sql-jdbc-api-usage.md b/explore-analyze/query-filter/languages/sql-jdbc-api-usage.md
index 64d8a967f..ba0867333 100644
--- a/explore-analyze/query-filter/languages/sql-jdbc-api-usage.md
+++ b/explore-analyze/query-filter/languages/sql-jdbc-api-usage.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_api_usage.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/_api_usage.html
+products:
+  - id: elasticsearch
 ---
 
 # API usage [_api_usage]
diff --git a/explore-analyze/query-filter/languages/sql-jdbc.md b/explore-analyze/query-filter/languages/sql-jdbc.md
index 67d947911..07fba6af5 100644
--- a/explore-analyze/query-filter/languages/sql-jdbc.md
+++ b/explore-analyze/query-filter/languages/sql-jdbc.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-jdbc.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-jdbc.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL JDBC [sql-jdbc]
diff --git a/explore-analyze/query-filter/languages/sql-lexical-structure.md b/explore-analyze/query-filter/languages/sql-lexical-structure.md
index ece76c058..b72d0e120 100644
--- a/explore-analyze/query-filter/languages/sql-lexical-structure.md
+++ b/explore-analyze/query-filter/languages/sql-lexical-structure.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-lexical-structure.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-lexical-structure.html
+products:
+  - id: elasticsearch
 ---
 
 # Lexical Structure [sql-lexical-structure]
diff --git a/explore-analyze/query-filter/languages/sql-like-rlike-operators.md b/explore-analyze/query-filter/languages/sql-like-rlike-operators.md
index 02508f74a..fd427a58d 100644
--- a/explore-analyze/query-filter/languages/sql-like-rlike-operators.md
+++ b/explore-analyze/query-filter/languages/sql-like-rlike-operators.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-like-rlike-operators.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-like-rlike-operators.html
+products:
+  - id: elasticsearch
 ---
 
 # LIKE and RLIKE Operators [sql-like-rlike-operators]
diff --git a/explore-analyze/query-filter/languages/sql-limitations.md b/explore-analyze/query-filter/languages/sql-limitations.md
index 86352db5e..ba566857b 100644
--- a/explore-analyze/query-filter/languages/sql-limitations.md
+++ b/explore-analyze/query-filter/languages/sql-limitations.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-limitations.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Limitations [sql-limitations]
diff --git a/explore-analyze/query-filter/languages/sql-odbc-installation.md b/explore-analyze/query-filter/languages/sql-odbc-installation.md
index 49a46f4dc..aef15cd36 100644
--- a/explore-analyze/query-filter/languages/sql-odbc-installation.md
+++ b/explore-analyze/query-filter/languages/sql-odbc-installation.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc-installation.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc-installation.html
+products:
+  - id: elasticsearch
 ---
 
 # Driver installation [sql-odbc-installation]
diff --git a/explore-analyze/query-filter/languages/sql-odbc-setup.md b/explore-analyze/query-filter/languages/sql-odbc-setup.md
index 8d0faef02..d7cf6bfcc 100644
--- a/explore-analyze/query-filter/languages/sql-odbc-setup.md
+++ b/explore-analyze/query-filter/languages/sql-odbc-setup.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc-setup.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc-setup.html
+products:
+  - id: elasticsearch
 ---
 
 # Configuration [sql-odbc-setup]
diff --git a/explore-analyze/query-filter/languages/sql-odbc.md b/explore-analyze/query-filter/languages/sql-odbc.md
index 8469480bf..10cb77985 100644
--- a/explore-analyze/query-filter/languages/sql-odbc.md
+++ b/explore-analyze/query-filter/languages/sql-odbc.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-odbc.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL ODBC [sql-odbc]
diff --git a/explore-analyze/query-filter/languages/sql-operators-cast.md b/explore-analyze/query-filter/languages/sql-operators-cast.md
index 2bad48805..eb1bd1c68 100644
--- a/explore-analyze/query-filter/languages/sql-operators-cast.md
+++ b/explore-analyze/query-filter/languages/sql-operators-cast.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-cast.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-cast.html
+products:
+  - id: elasticsearch
 ---
 
 # Cast Operators [sql-operators-cast]
diff --git a/explore-analyze/query-filter/languages/sql-operators-logical.md b/explore-analyze/query-filter/languages/sql-operators-logical.md
index 3fd59f3d0..d9a2930cb 100644
--- a/explore-analyze/query-filter/languages/sql-operators-logical.md
+++ b/explore-analyze/query-filter/languages/sql-operators-logical.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-logical.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-logical.html
+products:
+  - id: elasticsearch
 ---
 
 # Logical Operators [sql-operators-logical]
diff --git a/explore-analyze/query-filter/languages/sql-operators-math.md b/explore-analyze/query-filter/languages/sql-operators-math.md
index 25e5240fe..15a1dc7aa 100644
--- a/explore-analyze/query-filter/languages/sql-operators-math.md
+++ b/explore-analyze/query-filter/languages/sql-operators-math.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-math.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators-math.html
+products:
+  - id: elasticsearch
 ---
 
 # Math Operators [sql-operators-math]
diff --git a/explore-analyze/query-filter/languages/sql-operators.md b/explore-analyze/query-filter/languages/sql-operators.md
index 3b881ba65..78006ea23 100644
--- a/explore-analyze/query-filter/languages/sql-operators.md
+++ b/explore-analyze/query-filter/languages/sql-operators.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-operators.html
+products:
+  - id: elasticsearch
 ---
 
 # Comparison Operators [sql-operators]
diff --git a/explore-analyze/query-filter/languages/sql-overview.md b/explore-analyze/query-filter/languages/sql-overview.md
index 03a01c4fb..63c68ecb5 100644
--- a/explore-analyze/query-filter/languages/sql-overview.md
+++ b/explore-analyze/query-filter/languages/sql-overview.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-overview.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-overview.html
+products:
+  - id: elasticsearch
 ---
 
 # Overview [sql-overview]
diff --git a/explore-analyze/query-filter/languages/sql-pagination.md b/explore-analyze/query-filter/languages/sql-pagination.md
index fc7567c95..8de8136e6 100644
--- a/explore-analyze/query-filter/languages/sql-pagination.md
+++ b/explore-analyze/query-filter/languages/sql-pagination.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html
+products:
+  - id: elasticsearch
 ---
 
 # Paginating through a large response [sql-pagination]
diff --git a/explore-analyze/query-filter/languages/sql-rest-columnar.md b/explore-analyze/query-filter/languages/sql-rest-columnar.md
index 2b7c8e8fe..1ed024231 100644
--- a/explore-analyze/query-filter/languages/sql-rest-columnar.md
+++ b/explore-analyze/query-filter/languages/sql-rest-columnar.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-columnar.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-columnar.html
+products:
+  - id: elasticsearch
 ---
 
 # Columnar results [sql-rest-columnar]
diff --git a/explore-analyze/query-filter/languages/sql-rest-filtering.md b/explore-analyze/query-filter/languages/sql-rest-filtering.md
index 3136e2587..4bda896ca 100644
--- a/explore-analyze/query-filter/languages/sql-rest-filtering.md
+++ b/explore-analyze/query-filter/languages/sql-rest-filtering.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-filtering.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-filtering.html
+products:
+  - id: elasticsearch
 ---
 
 # Filtering using Elasticsearch Query DSL [sql-rest-filtering]
diff --git a/explore-analyze/query-filter/languages/sql-rest-format.md b/explore-analyze/query-filter/languages/sql-rest-format.md
index e65164360..49b4346de 100644
--- a/explore-analyze/query-filter/languages/sql-rest-format.md
+++ b/explore-analyze/query-filter/languages/sql-rest-format.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-format.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-format.html
+products:
+  - id: elasticsearch
 ---
 
 # Response Data Formats [sql-rest-format]
diff --git a/explore-analyze/query-filter/languages/sql-rest-overview.md b/explore-analyze/query-filter/languages/sql-rest-overview.md
index a862caab2..562cf9128 100644
--- a/explore-analyze/query-filter/languages/sql-rest-overview.md
+++ b/explore-analyze/query-filter/languages/sql-rest-overview.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html
+products:
+  - id: elasticsearch
 ---
 
 # Overview [sql-rest-overview]
diff --git a/explore-analyze/query-filter/languages/sql-rest-params.md b/explore-analyze/query-filter/languages/sql-rest-params.md
index 7472dd9d1..deab7f329 100644
--- a/explore-analyze/query-filter/languages/sql-rest-params.md
+++ b/explore-analyze/query-filter/languages/sql-rest-params.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-params.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-params.html
+products:
+  - id: elasticsearch
 ---
 
 # Passing parameters to a query [sql-rest-params]
diff --git a/explore-analyze/query-filter/languages/sql-rest.md b/explore-analyze/query-filter/languages/sql-rest.md
index b53776bbf..8692a9304 100644
--- a/explore-analyze/query-filter/languages/sql-rest.md
+++ b/explore-analyze/query-filter/languages/sql-rest.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL REST API [sql-rest]
diff --git a/explore-analyze/query-filter/languages/sql-runtime-fields.md b/explore-analyze/query-filter/languages/sql-runtime-fields.md
index e9349e4f4..3dc46ea04 100644
--- a/explore-analyze/query-filter/languages/sql-runtime-fields.md
+++ b/explore-analyze/query-filter/languages/sql-runtime-fields.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-runtime-fields.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-runtime-fields.html
+products:
+  - id: elasticsearch
 ---
 
 # Use runtime fields [sql-runtime-fields]
diff --git a/explore-analyze/query-filter/languages/sql-security.md b/explore-analyze/query-filter/languages/sql-security.md
index 1bbb85d21..d6ec7eeb1 100644
--- a/explore-analyze/query-filter/languages/sql-security.md
+++ b/explore-analyze/query-filter/languages/sql-security.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-security.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-security.html
+products:
+  - id: elasticsearch
 ---
 
 # Security [sql-security]
diff --git a/explore-analyze/query-filter/languages/sql-spec.md b/explore-analyze/query-filter/languages/sql-spec.md
index c81099cfe..03374ae74 100644
--- a/explore-analyze/query-filter/languages/sql-spec.md
+++ b/explore-analyze/query-filter/languages/sql-spec.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-spec.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-spec.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Language [sql-spec]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-describe-table.md b/explore-analyze/query-filter/languages/sql-syntax-describe-table.md
index 29e2377dd..167b9e450 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-describe-table.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-describe-table.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-describe-table.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-describe-table.html
+products:
+  - id: elasticsearch
 ---
 
 # DESCRIBE TABLE [sql-syntax-describe-table]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-reserved.md b/explore-analyze/query-filter/languages/sql-syntax-reserved.md
index a8325cad5..43ac61ac8 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-reserved.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-reserved.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-reserved.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-reserved.html
+products:
+  - id: elasticsearch
 ---
 
 # Reserved keywords [sql-syntax-reserved]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-select.md b/explore-analyze/query-filter/languages/sql-syntax-select.md
index fa71d7f61..4485abb3b 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-select.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-select.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-select.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-select.html
+products:
+  - id: elasticsearch
 ---
 
 # SELECT [sql-syntax-select]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-show-catalogs.md b/explore-analyze/query-filter/languages/sql-syntax-show-catalogs.md
index f08a4332d..393199f55 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-show-catalogs.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-show-catalogs.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-catalogs.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-catalogs.html
+products:
+  - id: elasticsearch
 ---
 
 # SHOW CATALOGS [sql-syntax-show-catalogs]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-show-columns.md b/explore-analyze/query-filter/languages/sql-syntax-show-columns.md
index 717bfb567..c8567dead 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-show-columns.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-show-columns.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-columns.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-columns.html
+products:
+  - id: elasticsearch
 ---
 
 # SHOW COLUMNS [sql-syntax-show-columns]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-show-functions.md b/explore-analyze/query-filter/languages/sql-syntax-show-functions.md
index 908dc55f6..ab7899d88 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-show-functions.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-show-functions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html
+products:
+  - id: elasticsearch
 ---
 
 # SHOW FUNCTIONS [sql-syntax-show-functions]
diff --git a/explore-analyze/query-filter/languages/sql-syntax-show-tables.md b/explore-analyze/query-filter/languages/sql-syntax-show-tables.md
index 65173078b..f611ddc1d 100644
--- a/explore-analyze/query-filter/languages/sql-syntax-show-tables.md
+++ b/explore-analyze/query-filter/languages/sql-syntax-show-tables.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-tables.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-tables.html
+products:
+  - id: elasticsearch
 ---
 
 # SHOW TABLES [sql-syntax-show-tables]
diff --git a/explore-analyze/query-filter/languages/sql-translate.md b/explore-analyze/query-filter/languages/sql-translate.md
index dbd6dac7f..ef0d246cf 100644
--- a/explore-analyze/query-filter/languages/sql-translate.md
+++ b/explore-analyze/query-filter/languages/sql-translate.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL Translate API [sql-translate]
diff --git a/explore-analyze/query-filter/languages/sql.md b/explore-analyze/query-filter/languages/sql.md
index 2a57180e8..cd6b537e9 100644
--- a/explore-analyze/query-filter/languages/sql.md
+++ b/explore-analyze/query-filter/languages/sql.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-sql.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-sql.html
+products:
+  - id: elasticsearch
 ---
 
 # SQL [xpack-sql]
diff --git a/explore-analyze/query-filter/tools.md b/explore-analyze/query-filter/tools.md
index 56232579b..25c3bdaa1 100644
--- a/explore-analyze/query-filter/tools.md
+++ b/explore-analyze/query-filter/tools.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/devtools-kibana.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/devtools-kibana.html
+products:
+  - id: kibana
 ---
 
 # Query tools [devtools-kibana]
diff --git a/explore-analyze/query-filter/tools/console.md b/explore-analyze/query-filter/tools/console.md
index efe3f19a7..8f772db55 100644
--- a/explore-analyze/query-filter/tools/console.md
+++ b/explore-analyze/query-filter/tools/console.md
@@ -1,12 +1,16 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: Console
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/console-kibana.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-api-console.html
   - https://www.elastic.co/guide/en/serverless/current/devtools-run-api-requests-in-the-console.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-enterprise
+  - id: cloud-serverless
 ---
 
 # Run API requests with Console [console-kibana]
diff --git a/explore-analyze/query-filter/tools/grok-debugger.md b/explore-analyze/query-filter/tools/grok-debugger.md
index ec19496a0..ea08a77f3 100644
--- a/explore-analyze/query-filter/tools/grok-debugger.md
+++ b/explore-analyze/query-filter/tools/grok-debugger.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-grokdebugger.html
   - https://www.elastic.co/guide/en/serverless/current/devtools-debug-grok-expressions.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Grok debugger [xpack-grokdebugger]
diff --git a/explore-analyze/query-filter/tools/playground.md b/explore-analyze/query-filter/tools/playground.md
index 0e0552439..40d1770f7 100644
--- a/explore-analyze/query-filter/tools/playground.md
+++ b/explore-analyze/query-filter/tools/playground.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-playground.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-playground.html
+products:
+  - id: cloud-serverless
 ---
 
 # Playground [elasticsearch-playground]
diff --git a/explore-analyze/query-filter/tools/saved-queries.md b/explore-analyze/query-filter/tools/saved-queries.md
index f02a748c7..2e6930ec3 100644
--- a/explore-analyze/query-filter/tools/saved-queries.md
+++ b/explore-analyze/query-filter/tools/saved-queries.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/save-load-delete-query.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/save-load-delete-query.html
+products:
+  - id: kibana
 ---
 
 # Saved queries [save-load-delete-query]
diff --git a/explore-analyze/query-filter/tools/search-profiler.md b/explore-analyze/query-filter/tools/search-profiler.md
index fb1b05f08..683492902 100644
--- a/explore-analyze/query-filter/tools/search-profiler.md
+++ b/explore-analyze/query-filter/tools/search-profiler.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/xpack-profiler.html
   - https://www.elastic.co/guide/en/serverless/current/devtools-profile-queries-and-aggregations.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Search profiler [xpack-profiler]
diff --git a/explore-analyze/report-and-share.md b/explore-analyze/report-and-share.md
index f13fc65a1..c2001de02 100644
--- a/explore-analyze/report-and-share.md
+++ b/explore-analyze/report-and-share.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reporting-getting-started.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reporting-getting-started.html
+products:
+  - id: kibana
 ---
 
 # Reporting and sharing [reporting-getting-started]
diff --git a/explore-analyze/report-and-share/automating-report-generation.md b/explore-analyze/report-and-share/automating-report-generation.md
index c6d1fed37..455ea5f70 100644
--- a/explore-analyze/report-and-share/automating-report-generation.md
+++ b/explore-analyze/report-and-share/automating-report-generation.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/automating-report-generation.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/automating-report-generation.html
+products:
+  - id: kibana
 ---
 
 # Automatically generate reports [automating-report-generation]
diff --git a/explore-analyze/report-and-share/reporting-troubleshooting-csv.md b/explore-analyze/report-and-share/reporting-troubleshooting-csv.md
index 7ae87e2b6..cddce756d 100644
--- a/explore-analyze/report-and-share/reporting-troubleshooting-csv.md
+++ b/explore-analyze/report-and-share/reporting-troubleshooting-csv.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: CSV
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting-csv.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "CSV"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting-csv.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/report-and-share/reporting-troubleshooting-pdf.md b/explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
index 3a837b287..2fc783342 100644
--- a/explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
+++ b/explore-analyze/report-and-share/reporting-troubleshooting-pdf.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: PDF/PNG
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting-pdf.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "PDF/PNG"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting-pdf.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/report-and-share/reporting-troubleshooting.md b/explore-analyze/report-and-share/reporting-troubleshooting.md
index b652f5410..78b3e73d4 100644
--- a/explore-analyze/report-and-share/reporting-troubleshooting.md
+++ b/explore-analyze/report-and-share/reporting-troubleshooting.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Troubleshooting
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Troubleshooting"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/scripting.md b/explore-analyze/scripting.md
index 52be9e50c..2e8bd3038 100644
--- a/explore-analyze/scripting.md
+++ b/explore-analyze/scripting.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html
+products:
+  - id: elasticsearch
 ---
 
 # Scripting [modules-scripting]
diff --git a/explore-analyze/scripting/common-script-uses.md b/explore-analyze/scripting/common-script-uses.md
index fc20da497..63134a191 100644
--- a/explore-analyze/scripting/common-script-uses.md
+++ b/explore-analyze/scripting/common-script-uses.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/common-script-uses.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/common-script-uses.html
+products:
+  - id: elasticsearch
 ---
 
 # Common scripting use cases [common-script-uses]
diff --git a/explore-analyze/scripting/dissect.md b/explore-analyze/scripting/dissect.md
index 4630a5fd4..502776f24 100644
--- a/explore-analyze/scripting/dissect.md
+++ b/explore-analyze/scripting/dissect.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/dissect.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/dissect.html
+products:
+  - id: elasticsearch
 ---
 
 # Dissecting data [dissect]
diff --git a/explore-analyze/scripting/grok.md b/explore-analyze/scripting/grok.md
index e3f892a6e..6a29f24cc 100644
--- a/explore-analyze/scripting/grok.md
+++ b/explore-analyze/scripting/grok.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/grok.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/grok.html
+products:
+  - id: elasticsearch
 ---
 
 # Grokking grok [grok]
diff --git a/explore-analyze/scripting/modules-scripting-engine.md b/explore-analyze/scripting/modules-scripting-engine.md
index 52093e8bd..f8552dc57 100644
--- a/explore-analyze/scripting/modules-scripting-engine.md
+++ b/explore-analyze/scripting/modules-scripting-engine.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-engine.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-engine.html
+products:
+  - id: elasticsearch
 ---
 
 # Advanced scripts using script engines [modules-scripting-engine]
diff --git a/explore-analyze/scripting/modules-scripting-expression.md b/explore-analyze/scripting/modules-scripting-expression.md
index b0f8c98f2..7a8ebae8e 100644
--- a/explore-analyze/scripting/modules-scripting-expression.md
+++ b/explore-analyze/scripting/modules-scripting-expression.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-expression.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-expression.html
+products:
+  - id: elasticsearch
 ---
 
 # Lucene expressions language [modules-scripting-expression]
diff --git a/explore-analyze/scripting/modules-scripting-fields.md b/explore-analyze/scripting/modules-scripting-fields.md
index 4d6d187e5..36c1d7867 100644
--- a/explore-analyze/scripting/modules-scripting-fields.md
+++ b/explore-analyze/scripting/modules-scripting-fields.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-fields.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-fields.html
+products:
+  - id: elasticsearch
 ---
 
 # Accessing document fields and special variables [modules-scripting-fields]
diff --git a/explore-analyze/scripting/modules-scripting-painless.md b/explore-analyze/scripting/modules-scripting-painless.md
index 99bbef45c..b1adcfed6 100644
--- a/explore-analyze/scripting/modules-scripting-painless.md
+++ b/explore-analyze/scripting/modules-scripting-painless.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-painless.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-painless.html
+products:
+  - id: elasticsearch
 ---
 
 # Painless scripting language [modules-scripting-painless]
diff --git a/explore-analyze/scripting/modules-scripting-security.md b/explore-analyze/scripting/modules-scripting-security.md
index 7135bef5e..65acd6449 100644
--- a/explore-analyze/scripting/modules-scripting-security.md
+++ b/explore-analyze/scripting/modules-scripting-security.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-security.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-security.html
+products:
+  - id: elasticsearch
 ---
 
 # Scripting and security [modules-scripting-security]
diff --git a/explore-analyze/scripting/modules-scripting-using.md b/explore-analyze/scripting/modules-scripting-using.md
index 085f7e036..d62f249b9 100644
--- a/explore-analyze/scripting/modules-scripting-using.md
+++ b/explore-analyze/scripting/modules-scripting-using.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-using.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting-using.html
+products:
+  - id: elasticsearch
 ---
 
 # How to write scripts [modules-scripting-using]
diff --git a/explore-analyze/scripting/painless-lab.md b/explore-analyze/scripting/painless-lab.md
index c1864e7bd..d0e392ccc 100644
--- a/explore-analyze/scripting/painless-lab.md
+++ b/explore-analyze/scripting/painless-lab.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/painlesslab.html
   - https://www.elastic.co/guide/en/serverless/current/devtools-debug-painless-scripts.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Painless lab [painlesslab]
diff --git a/explore-analyze/scripting/script-fields-api.md b/explore-analyze/scripting/script-fields-api.md
index 7fcfe5ba3..877e4308e 100644
--- a/explore-analyze/scripting/script-fields-api.md
+++ b/explore-analyze/scripting/script-fields-api.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Access fields in a document
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/script-fields-api.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Access fields in a document"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/script-fields-api.html
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/explore-analyze/scripting/scripting-field-extraction.md b/explore-analyze/scripting/scripting-field-extraction.md
index ad3490e90..ee6abc6d7 100644
--- a/explore-analyze/scripting/scripting-field-extraction.md
+++ b/explore-analyze/scripting/scripting-field-extraction.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scripting-field-extraction.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scripting-field-extraction.html
+products:
+  - id: elasticsearch
 ---
 
 # Field extraction [scripting-field-extraction]
diff --git a/explore-analyze/scripting/scripts-search-speed.md b/explore-analyze/scripting/scripts-search-speed.md
index f9fbdf679..5a665bfe7 100644
--- a/explore-analyze/scripting/scripts-search-speed.md
+++ b/explore-analyze/scripting/scripts-search-speed.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scripts-and-search-speed.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scripts-and-search-speed.html
+products:
+  - id: elasticsearch
 ---
 
 # Scripts, caching, and search speed [scripts-and-search-speed]
diff --git a/explore-analyze/transforms.md b/explore-analyze/transforms.md
index ce387dcaa..fefad235d 100644
--- a/explore-analyze/transforms.md
+++ b/explore-analyze/transforms.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/transforms.html
   - https://www.elastic.co/guide/en/serverless/current/transforms.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/data-rollup-transform.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 # Transforming data [transforms]
 
diff --git a/explore-analyze/transforms/ecommerce-transforms.md b/explore-analyze/transforms/ecommerce-transforms.md
index c06a2bd2f..fc1c9001b 100644
--- a/explore-analyze/transforms/ecommerce-transforms.md
+++ b/explore-analyze/transforms/ecommerce-transforms.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/ecommerce-transforms.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/ecommerce-transforms.html
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Transforming the eCommerce sample data [ecommerce-transforms]
diff --git a/explore-analyze/transforms/transform-alerts.md b/explore-analyze/transforms/transform-alerts.md
index 67c4e09d1..544d45ec6 100644
--- a/explore-analyze/transforms/transform-alerts.md
+++ b/explore-analyze/transforms/transform-alerts.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-alerts.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-alerts.html
+products:
+  - id: elasticsearch
 ---
 
 # Generating alerts for transforms [transform-alerts]
diff --git a/explore-analyze/transforms/transform-api-quickref.md b/explore-analyze/transforms/transform-api-quickref.md
index 49c94c5f0..c1ebcac80 100644
--- a/explore-analyze/transforms/transform-api-quickref.md
+++ b/explore-analyze/transforms/transform-api-quickref.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-api-quickref.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-api-quickref.html
+products:
+  - id: elasticsearch
 ---
 
 # API quick reference [transform-api-quickref]
diff --git a/explore-analyze/transforms/transform-checkpoints.md b/explore-analyze/transforms/transform-checkpoints.md
index cc479b870..ad12fa4c2 100644
--- a/explore-analyze/transforms/transform-checkpoints.md
+++ b/explore-analyze/transforms/transform-checkpoints.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: How checkpoints work
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-checkpoints.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "How checkpoints work"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-checkpoints.html
+products:
+  - id: elasticsearch
 ---
 
 # How checkpoints work [transform-checkpoints]
diff --git a/explore-analyze/transforms/transform-examples.md b/explore-analyze/transforms/transform-examples.md
index 6977f04c7..09ef9c2f4 100644
--- a/explore-analyze/transforms/transform-examples.md
+++ b/explore-analyze/transforms/transform-examples.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Examples
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-examples.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Examples"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-examples.html
+products:
+  - id: elasticsearch
 ---
 
 # Examples [transform-examples]
diff --git a/explore-analyze/transforms/transform-limitations.md b/explore-analyze/transforms/transform-limitations.md
index b19726db9..541f7fb57 100644
--- a/explore-analyze/transforms/transform-limitations.md
+++ b/explore-analyze/transforms/transform-limitations.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-limitations.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Limitations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-limitations.html
+products:
+  - id: elasticsearch
 ---
 
 # Limitations [transform-limitations]
diff --git a/explore-analyze/transforms/transform-overview.md b/explore-analyze/transforms/transform-overview.md
index 7f6d6f89e..89da1bb95 100644
--- a/explore-analyze/transforms/transform-overview.md
+++ b/explore-analyze/transforms/transform-overview.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Overview
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-overview.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Overview"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-overview.html
+products:
+  - id: elasticsearch
 ---
 
 # Overview [transform-overview]
diff --git a/explore-analyze/transforms/transform-painless-examples.md b/explore-analyze/transforms/transform-painless-examples.md
index 4ed0ecf08..d36ada8ff 100644
--- a/explore-analyze/transforms/transform-painless-examples.md
+++ b/explore-analyze/transforms/transform-painless-examples.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Painless examples
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-painless-examples.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Painless examples"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-painless-examples.html
+products:
+  - id: elasticsearch
 ---
 
 # Painless examples [transform-painless-examples]
diff --git a/explore-analyze/transforms/transform-scale.md b/explore-analyze/transforms/transform-scale.md
index 7d59b4f7e..09601b786 100644
--- a/explore-analyze/transforms/transform-scale.md
+++ b/explore-analyze/transforms/transform-scale.md
@@ -1,10 +1,12 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 navigation_title: "{{transforms-cap}} at scale"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-scale.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Transforms at scale [transform-scale]
diff --git a/explore-analyze/transforms/transform-setup.md b/explore-analyze/transforms/transform-setup.md
index 1ad4a0a30..c9dcdfc08 100644
--- a/explore-analyze/transforms/transform-setup.md
+++ b/explore-analyze/transforms/transform-setup.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Setup
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-setup.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Setup"
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-setup.html
+products:
+  - id: elasticsearch
 ---
 
 # Setup [transform-setup]
diff --git a/explore-analyze/transforms/transform-usage.md b/explore-analyze/transforms/transform-usage.md
index 789d0d55f..29f7735c2 100644
--- a/explore-analyze/transforms/transform-usage.md
+++ b/explore-analyze/transforms/transform-usage.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-usage.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-usage.html
+products:
+  - id: elasticsearch
 ---
 
 # When to use transforms [transform-usage]
diff --git a/explore-analyze/visualize.md b/explore-analyze/visualize.md
index e48d40735..09ef7f50c 100644
--- a/explore-analyze/visualize.md
+++ b/explore-analyze/visualize.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/_panels_and_visualizations.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/_panels_and_visualizations.html
+products:
+  - id: kibana
 ---
 
 # Panels and visualizations [_panels_and_visualizations]
diff --git a/explore-analyze/visualize/canvas.md b/explore-analyze/visualize/canvas.md
index 652318a12..26aa60313 100644
--- a/explore-analyze/visualize/canvas.md
+++ b/explore-analyze/visualize/canvas.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/canvas.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/canvas.html
+products:
+  - id: kibana
 ---
 
 # Canvas [canvas]
diff --git a/explore-analyze/visualize/canvas/canvas-function-reference.md b/explore-analyze/visualize/canvas/canvas-function-reference.md
index 03afafa1e..27f3e7362 100644
--- a/explore-analyze/visualize/canvas/canvas-function-reference.md
+++ b/explore-analyze/visualize/canvas/canvas-function-reference.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/canvas-function-reference.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/canvas-function-reference.html
+products:
+  - id: kibana
 ---
 
 # Canvas function reference [canvas-function-reference]
diff --git a/explore-analyze/visualize/canvas/canvas-present-workpad.md b/explore-analyze/visualize/canvas/canvas-present-workpad.md
index 7e8af079b..7a0876edb 100644
--- a/explore-analyze/visualize/canvas/canvas-present-workpad.md
+++ b/explore-analyze/visualize/canvas/canvas-present-workpad.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/canvas-present-workpad.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/canvas-present-workpad.html
+products:
+  - id: kibana
 ---
 
 # Present your workpad [canvas-present-workpad]
diff --git a/explore-analyze/visualize/canvas/canvas-tinymath-functions.md b/explore-analyze/visualize/canvas/canvas-tinymath-functions.md
index b2e7203ca..adffd4abc 100644
--- a/explore-analyze/visualize/canvas/canvas-tinymath-functions.md
+++ b/explore-analyze/visualize/canvas/canvas-tinymath-functions.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/canvas-tinymath-functions.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/canvas-tinymath-functions.html
+products:
+  - id: kibana
 ---
 
 # TinyMath functions [canvas-tinymath-functions]
diff --git a/explore-analyze/visualize/canvas/canvas-tutorial.md b/explore-analyze/visualize/canvas/canvas-tutorial.md
index dc2eb7c44..3e93918a1 100644
--- a/explore-analyze/visualize/canvas/canvas-tutorial.md
+++ b/explore-analyze/visualize/canvas/canvas-tutorial.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/canvas-tutorial.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/canvas-tutorial.html
+products:
+  - id: kibana
 ---
 
 # Tutorial: Create a workpad for monitoring sales [canvas-tutorial]
diff --git a/explore-analyze/visualize/canvas/edit-workpads.md b/explore-analyze/visualize/canvas/edit-workpads.md
index 8b2ed3753..8cd23c0b8 100644
--- a/explore-analyze/visualize/canvas/edit-workpads.md
+++ b/explore-analyze/visualize/canvas/edit-workpads.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/edit-workpads.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/edit-workpads.html
+products:
+  - id: kibana
 ---
 
 # Edit workpads [edit-workpads]
diff --git a/explore-analyze/visualize/custom-visualizations-with-vega.md b/explore-analyze/visualize/custom-visualizations-with-vega.md
index a494c2532..9051199fd 100644
--- a/explore-analyze/visualize/custom-visualizations-with-vega.md
+++ b/explore-analyze/visualize/custom-visualizations-with-vega.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/vega.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/vega.html
+products:
+  - id: kibana
 ---
 
 # Custom visualizations with Vega [vega]
diff --git a/explore-analyze/visualize/esorql.md b/explore-analyze/visualize/esorql.md
index 0640c136d..06ebc6b59 100644
--- a/explore-analyze/visualize/esorql.md
+++ b/explore-analyze/visualize/esorql.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/esql-visualizations.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/esql-visualizations.html
+products:
+  - id: kibana
 ---
 
 # ES|QL [esql-visualizations]
diff --git a/explore-analyze/visualize/field-statistics.md b/explore-analyze/visualize/field-statistics.md
index f90df3ab8..374160fa7 100644
--- a/explore-analyze/visualize/field-statistics.md
+++ b/explore-analyze/visualize/field-statistics.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/field-statistics-dashboard.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/field-statistics-dashboard.html
+products:
+  - id: kibana
 ---
 
 # Field statistics [field-statistics-dashboard]
diff --git a/explore-analyze/visualize/graph.md b/explore-analyze/visualize/graph.md
index 1c2a0a2d8..3e124bc23 100644
--- a/explore-analyze/visualize/graph.md
+++ b/explore-analyze/visualize/graph.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/xpack-graph.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/xpack-graph.html
+products:
+  - id: kibana
 ---
 
 # Graph [xpack-graph]
diff --git a/explore-analyze/visualize/graph/graph-configuration.md b/explore-analyze/visualize/graph/graph-configuration.md
index 1b8bdb212..4700edb91 100644
--- a/explore-analyze/visualize/graph/graph-configuration.md
+++ b/explore-analyze/visualize/graph/graph-configuration.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/graph-configuration.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/graph-configuration.html
+products:
+  - id: kibana
 ---
 
 # Configure Graph [graph-configuration]
diff --git a/explore-analyze/visualize/graph/graph-troubleshooting.md b/explore-analyze/visualize/graph/graph-troubleshooting.md
index e4340fe05..0eb7c50ba 100644
--- a/explore-analyze/visualize/graph/graph-troubleshooting.md
+++ b/explore-analyze/visualize/graph/graph-troubleshooting.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Troubleshooting and limitations
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/graph-troubleshooting.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Troubleshooting and limitations"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/graph-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/visualize/image-panels.md b/explore-analyze/visualize/image-panels.md
index 55a207092..86a720458 100644
--- a/explore-analyze/visualize/image-panels.md
+++ b/explore-analyze/visualize/image-panels.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/add-image.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/add-image.html
+products:
+  - id: kibana
 ---
 
 # Image panels [add-image]
diff --git a/explore-analyze/visualize/legacy-editors.md b/explore-analyze/visualize/legacy-editors.md
index 8f9fa26eb..7a679ba00 100644
--- a/explore-analyze/visualize/legacy-editors.md
+++ b/explore-analyze/visualize/legacy-editors.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/legacy-editors.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/legacy-editors.html
+products:
+  - id: kibana
 ---
 
 # Legacy editors [legacy-editors]
diff --git a/explore-analyze/visualize/lens.md b/explore-analyze/visualize/lens.md
index ceb8fee35..ba1ab0713 100644
--- a/explore-analyze/visualize/lens.md
+++ b/explore-analyze/visualize/lens.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Lens
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/lens.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Lens"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/lens.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/visualize/link-panels.md b/explore-analyze/visualize/link-panels.md
index c13bd7645..7c6650889 100644
--- a/explore-analyze/visualize/link-panels.md
+++ b/explore-analyze/visualize/link-panels.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/dashboard-links.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/dashboard-links.html
+products:
+  - id: kibana
 ---
 
 # Link panels [dashboard-links]
diff --git a/explore-analyze/visualize/manage-panels.md b/explore-analyze/visualize/manage-panels.md
index 2372106be..19e6b161b 100644
--- a/explore-analyze/visualize/manage-panels.md
+++ b/explore-analyze/visualize/manage-panels.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/manage-panels.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/manage-panels.html
+products:
+  - id: kibana
 ---
 
 # Manage panels [manage-panels]
diff --git a/explore-analyze/visualize/maps.md b/explore-analyze/visualize/maps.md
index 09b5ba68d..d8d9a7054 100644
--- a/explore-analyze/visualize/maps.md
+++ b/explore-analyze/visualize/maps.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: ga
-  serverless: ga
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/maps.html
   - https://www.elastic.co/guide/en/serverless/current/maps.html
   - https://www.elastic.co/guide/en/kibana/current/maps-visualizations.html
+applies_to:
+  stack: ga
+  serverless: ga
+products:
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Maps [maps]
diff --git a/explore-analyze/visualize/maps/asset-tracking-tutorial.md b/explore-analyze/visualize/maps/asset-tracking-tutorial.md
index 394f717a8..bfc5c2a48 100644
--- a/explore-analyze/visualize/maps/asset-tracking-tutorial.md
+++ b/explore-analyze/visualize/maps/asset-tracking-tutorial.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/asset-tracking-tutorial.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/asset-tracking-tutorial.html
+products:
+  - id: kibana
 ---
 
 # Track, visualize, and alert on assets in real time [asset-tracking-tutorial]
diff --git a/explore-analyze/visualize/maps/heatmap-layer.md b/explore-analyze/visualize/maps/heatmap-layer.md
index 8cd6612bc..3b7ddeb48 100644
--- a/explore-analyze/visualize/maps/heatmap-layer.md
+++ b/explore-analyze/visualize/maps/heatmap-layer.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/heatmap-layer.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/heatmap-layer.html
+products:
+  - id: kibana
 ---
 
 # Heat map layer [heatmap-layer]
diff --git a/explore-analyze/visualize/maps/import-geospatial-data.md b/explore-analyze/visualize/maps/import-geospatial-data.md
index 4601a1c95..f128eb4c5 100644
--- a/explore-analyze/visualize/maps/import-geospatial-data.md
+++ b/explore-analyze/visualize/maps/import-geospatial-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/import-geospatial-data.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/import-geospatial-data.html
+products:
+  - id: kibana
 ---
 
 # Import geospatial data [import-geospatial-data]
diff --git a/explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md b/explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
index ad4d77152..0d18a94ba 100644
--- a/explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
+++ b/explore-analyze/visualize/maps/indexing-geojson-data-tutorial.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/indexing-geojson-data-tutorial.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/indexing-geojson-data-tutorial.html
+products:
+  - id: kibana
 ---
 
 # Tutorial: Index GeoJSON data [indexing-geojson-data-tutorial]
diff --git a/explore-analyze/visualize/maps/maps-aggregations.md b/explore-analyze/visualize/maps/maps-aggregations.md
index a58f94045..da52ec2a8 100644
--- a/explore-analyze/visualize/maps/maps-aggregations.md
+++ b/explore-analyze/visualize/maps/maps-aggregations.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Plot big data
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-aggregations.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Plot big data"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-aggregations.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/visualize/maps/maps-clean-data.md b/explore-analyze/visualize/maps/maps-clean-data.md
index 8c33063fb..269fbd273 100644
--- a/explore-analyze/visualize/maps/maps-clean-data.md
+++ b/explore-analyze/visualize/maps/maps-clean-data.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-clean-your-data.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-clean-your-data.html
+products:
+  - id: kibana
 ---
 
 # Clean your data [maps-clean-your-data]
diff --git a/explore-analyze/visualize/maps/maps-connect-to-ems.md b/explore-analyze/visualize/maps/maps-connect-to-ems.md
index e074ffe54..047d5e3b6 100644
--- a/explore-analyze/visualize/maps/maps-connect-to-ems.md
+++ b/explore-analyze/visualize/maps/maps-connect-to-ems.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-connect-to-ems.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-connect-to-ems.html
+products:
+  - id: kibana
 ---
 
 # Connect to Elastic Maps Service [maps-connect-to-ems]
diff --git a/explore-analyze/visualize/maps/maps-create-filter-from-map.md b/explore-analyze/visualize/maps/maps-create-filter-from-map.md
index 591d8d486..9ee119f13 100644
--- a/explore-analyze/visualize/maps/maps-create-filter-from-map.md
+++ b/explore-analyze/visualize/maps/maps-create-filter-from-map.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-create-filter-from-map.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-create-filter-from-map.html
+products:
+  - id: kibana
 ---
 
 # Create filters from a map [maps-create-filter-from-map]
diff --git a/explore-analyze/visualize/maps/maps-getting-started.md b/explore-analyze/visualize/maps/maps-getting-started.md
index 06050d581..39fa80e97 100644
--- a/explore-analyze/visualize/maps/maps-getting-started.md
+++ b/explore-analyze/visualize/maps/maps-getting-started.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-getting-started.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-getting-started.html
+products:
+  - id: kibana
 ---
 
 # Build a map to compare metrics by country or region [maps-getting-started]
diff --git a/explore-analyze/visualize/maps/maps-grid-aggregation.md b/explore-analyze/visualize/maps/maps-grid-aggregation.md
index 7f5f1cba2..b02a46efa 100644
--- a/explore-analyze/visualize/maps/maps-grid-aggregation.md
+++ b/explore-analyze/visualize/maps/maps-grid-aggregation.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-grid-aggregation.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-grid-aggregation.html
+products:
+  - id: kibana
 ---
 
 # Clusters [maps-grid-aggregation]
diff --git a/explore-analyze/visualize/maps/maps-layer-based-filtering.md b/explore-analyze/visualize/maps/maps-layer-based-filtering.md
index 3abb14811..d22531e47 100644
--- a/explore-analyze/visualize/maps/maps-layer-based-filtering.md
+++ b/explore-analyze/visualize/maps/maps-layer-based-filtering.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-layer-based-filtering.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-layer-based-filtering.html
+products:
+  - id: kibana
 ---
 
 # Filter a single layer [maps-layer-based-filtering]
diff --git a/explore-analyze/visualize/maps/maps-search-across-multiple-indices.md b/explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
index cb88fed89..394ee4563 100644
--- a/explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
+++ b/explore-analyze/visualize/maps/maps-search-across-multiple-indices.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-search-across-multiple-indices.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-search-across-multiple-indices.html
+products:
+  - id: kibana
 ---
 
 # Search across multiple indices [maps-search-across-multiple-indices]
diff --git a/explore-analyze/visualize/maps/maps-search.md b/explore-analyze/visualize/maps/maps-search.md
index 21e9faf75..0c2e9e4a6 100644
--- a/explore-analyze/visualize/maps/maps-search.md
+++ b/explore-analyze/visualize/maps/maps-search.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-search.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-search.html
+products:
+  - id: kibana
 ---
 
 # Search geographic data [maps-search]
diff --git a/explore-analyze/visualize/maps/maps-settings.md b/explore-analyze/visualize/maps/maps-settings.md
index 57df8c9d1..bfbbc077c 100644
--- a/explore-analyze/visualize/maps/maps-settings.md
+++ b/explore-analyze/visualize/maps/maps-settings.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-settings.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-settings.html
+products:
+  - id: kibana
 ---
 
 # Configure map settings [maps-settings]
diff --git a/explore-analyze/visualize/maps/maps-top-hits-aggregation.md b/explore-analyze/visualize/maps/maps-top-hits-aggregation.md
index 7aed3c53b..3bcbc0c15 100644
--- a/explore-analyze/visualize/maps/maps-top-hits-aggregation.md
+++ b/explore-analyze/visualize/maps/maps-top-hits-aggregation.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-top-hits-aggregation.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-top-hits-aggregation.html
+products:
+  - id: kibana
 ---
 
 # Display the most relevant documents per entity [maps-top-hits-aggregation]
diff --git a/explore-analyze/visualize/maps/maps-troubleshooting.md b/explore-analyze/visualize/maps/maps-troubleshooting.md
index 67b3f5aa2..48d9556d3 100644
--- a/explore-analyze/visualize/maps/maps-troubleshooting.md
+++ b/explore-analyze/visualize/maps/maps-troubleshooting.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Troubleshoot
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-troubleshooting.html
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Troubleshoot"
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/explore-analyze/visualize/maps/maps-vector-style-properties.md b/explore-analyze/visualize/maps/maps-vector-style-properties.md
index 32514d0f4..210eb127a 100644
--- a/explore-analyze/visualize/maps/maps-vector-style-properties.md
+++ b/explore-analyze/visualize/maps/maps-vector-style-properties.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-vector-style-properties.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-vector-style-properties.html
+products:
+  - id: kibana
 ---
 
 # Vector style properties [maps-vector-style-properties]
diff --git a/explore-analyze/visualize/maps/point-to-point.md b/explore-analyze/visualize/maps/point-to-point.md
index f84dfb59a..5161e13a9 100644
--- a/explore-analyze/visualize/maps/point-to-point.md
+++ b/explore-analyze/visualize/maps/point-to-point.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/point-to-point.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/point-to-point.html
+products:
+  - id: kibana
 ---
 
 # Point to point [point-to-point]
diff --git a/explore-analyze/visualize/maps/reverse-geocoding-tutorial.md b/explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
index dff637ee4..fad768368 100644
--- a/explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
+++ b/explore-analyze/visualize/maps/reverse-geocoding-tutorial.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reverse-geocoding-tutorial.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reverse-geocoding-tutorial.html
+products:
+  - id: kibana
 ---
 
 # Map custom regions with reverse geocoding [reverse-geocoding-tutorial]
diff --git a/explore-analyze/visualize/maps/terms-join.md b/explore-analyze/visualize/maps/terms-join.md
index 61105eacc..dc2fcc741 100644
--- a/explore-analyze/visualize/maps/terms-join.md
+++ b/explore-analyze/visualize/maps/terms-join.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/terms-join.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/terms-join.html
+products:
+  - id: kibana
 ---
 
 # Term join [terms-join]
diff --git a/explore-analyze/visualize/maps/tile-layer.md b/explore-analyze/visualize/maps/tile-layer.md
index 706e28c41..aacaf6d67 100644
--- a/explore-analyze/visualize/maps/tile-layer.md
+++ b/explore-analyze/visualize/maps/tile-layer.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/tile-layer.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/tile-layer.html
+products:
+  - id: kibana
 ---
 
 # Tile layer [tile-layer]
diff --git a/explore-analyze/visualize/maps/vector-layer.md b/explore-analyze/visualize/maps/vector-layer.md
index 171ec72c2..1cf067266 100644
--- a/explore-analyze/visualize/maps/vector-layer.md
+++ b/explore-analyze/visualize/maps/vector-layer.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/vector-layer.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/vector-layer.html
+products:
+  - id: kibana
 ---
 
 # Vector layer [vector-layer]
diff --git a/explore-analyze/visualize/maps/vector-style.md b/explore-analyze/visualize/maps/vector-style.md
index 34fea9dd2..402f602e8 100644
--- a/explore-analyze/visualize/maps/vector-style.md
+++ b/explore-analyze/visualize/maps/vector-style.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/vector-style.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/vector-style.html
+products:
+  - id: kibana
 ---
 
 # Vector styling [vector-style]
diff --git a/explore-analyze/visualize/maps/vector-tooltip.md b/explore-analyze/visualize/maps/vector-tooltip.md
index 49fbbac72..b70dc7969 100644
--- a/explore-analyze/visualize/maps/vector-tooltip.md
+++ b/explore-analyze/visualize/maps/vector-tooltip.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/vector-tooltip.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/vector-tooltip.html
+products:
+  - id: kibana
 ---
 
 # Vector tooltips [vector-tooltip]
diff --git a/explore-analyze/visualize/supported-chart-types.md b/explore-analyze/visualize/supported-chart-types.md
index 6e41cde22..d9dbfb216 100644
--- a/explore-analyze/visualize/supported-chart-types.md
+++ b/explore-analyze/visualize/supported-chart-types.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/chart-types.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/chart-types.html
+products:
+  - id: kibana
 ---
 
 # Supported chart types [chart-types]
diff --git a/explore-analyze/visualize/text-panels.md b/explore-analyze/visualize/text-panels.md
index 95bb0459f..4a02ea2da 100644
--- a/explore-analyze/visualize/text-panels.md
+++ b/explore-analyze/visualize/text-panels.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/add-text.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/add-text.html
+products:
+  - id: kibana
 ---
 
 # Text panels [add-text]
diff --git a/explore-analyze/visualize/visualize-library.md b/explore-analyze/visualize/visualize-library.md
index 2b3775034..ac9a29438 100644
--- a/explore-analyze/visualize/visualize-library.md
+++ b/explore-analyze/visualize/visualize-library.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/serverless/current/visualize-library.html
 applies_to:
   stack: ga
   serverless: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/serverless/current/visualize-library.html
+products:
+  - id: cloud-serverless
 ---
 
 # Visualize Library [visualize-library]
diff --git a/frontmatter.config.yml b/frontmatter.config.yml
new file mode 100644
index 000000000..c9c01eb9e
--- /dev/null
+++ b/frontmatter.config.yml
@@ -0,0 +1,75 @@
+valid_items:
+  - key: layout
+    type: string
+    valid_values:
+      - archive
+      - landing-page
+      - not-found
+  - key: navigation_title
+    type: string
+  - key: description
+    type: string
+  - key: mapped_pages
+    type: array
+  - key: applies_to
+    type: object
+    children:
+      - key: stack
+        type: string
+      - key: deployment
+        type: object
+        children:
+          - key: eck
+            type: string
+          - key: ess
+            type: string
+          - key: ece
+            type: string
+          - key: self
+            type: string
+      - key: serverless
+        type: object
+        children:
+          - key: security
+            type: string
+          - key: elasticsearch
+            type: string
+          - key: observability
+            type: string
+      - key: product
+        type: string
+  - key: products
+    type: array
+    children:
+      - key: id
+        type: string
+        valid_values:
+          - apm
+          - apm-agent
+          - beats
+          - cloud-control-ecctl
+          - cloud-enterprise
+          - cloud-hosted
+          - cloud-kubernetes
+          - cloud-serverless
+          - cloud-terraform
+          - ecs
+          - ecs-logging
+          - elastic-agent
+          - elastic-serverless-forwarder
+          - elastic-stack
+          - elasticsearch
+          - elasticsearch-client
+          - elasticsearch-curator
+          - fleet
+          - ingest
+          - integrations
+          - kibana
+          - logstash
+          - machine-learning
+          - observability
+          - painless
+          - search-ui
+          - security
+  - key: sub
+    type: object
\ No newline at end of file
diff --git a/get-started/deployment-options.md b/get-started/deployment-options.md
index 48f4fb075..b6dcdf4e5 100644
--- a/get-started/deployment-options.md
+++ b/get-started/deployment-options.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro-deploy.html
+products:
+  - id: elasticsearch
 ---
 
 # Deployment options [elasticsearch-intro-deploy]
diff --git a/get-started/index.md b/get-started/index.md
index a4ab5ba08..dd3a96b4b 100644
--- a/get-started/index.md
+++ b/get-started/index.md
@@ -4,12 +4,15 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/index.html
+products:
+  - id: elasticsearch
+  - id: elastic-stack
 ---
 # Get started
 
 ## Overview [what-is-es]
 
-[{{es}}](https://github.com/elastic/elasticsearch) is a distributed search and analytics engine, scalable data store, and vector database built on Apache Lucene. It’s optimized for speed and relevance on production-scale workloads. Use {{es}} to search, index, store, and analyze data of all shapes and sizes in near real time. [{{kib}}](https://github.com/elastic/kibana) is the graphical user interface for {{es}}. It’s a powerful tool for visualizing and analyzing your data, and for managing and monitoring the Elastic Stack. 
+[{{es}}](https://github.com/elastic/elasticsearch) is a distributed search and analytics engine, scalable data store, and vector database built on Apache Lucene. It’s optimized for speed and relevance on production-scale workloads. Use {{es}} to search, index, store, and analyze data of all shapes and sizes in near real time. [{{kib}}](https://github.com/elastic/kibana) is the graphical user interface for {{es}}. It’s a powerful tool for visualizing and analyzing your data, and for managing and monitoring the Elastic Stack.
 
 {{es}} is the heart of the [Elastic Stack](the-stack.md). Combined with {{kib}}, it powers these Elastic solutions and use cases:
 
diff --git a/get-started/introduction.md b/get-started/introduction.md
index c079cc14e..3c80ce800 100644
--- a/get-started/introduction.md
+++ b/get-started/introduction.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro-what-is-es.html
+products:
+  - id: elasticsearch
 ---
 
 # Use cases [introduction]
diff --git a/get-started/the-stack.md b/get-started/the-stack.md
index 41010e419..842dfc740 100644
--- a/get-started/the-stack.md
+++ b/get-started/the-stack.md
@@ -5,6 +5,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/index.html
   - https://www.elastic.co/guide/en/elastic-stack/current/installing-elastic-stack.html
   - https://www.elastic.co/guide/en/elastic-stack/current/overview.html
+products:
+  - id: elastic-stack
+  - id: kibana
 ---
 
 # The {{stack}}
diff --git a/get-started/versioning-availability.md b/get-started/versioning-availability.md
index 77d790d6f..b5af63155 100644
--- a/get-started/versioning-availability.md
+++ b/get-started/versioning-availability.md
@@ -2,6 +2,8 @@
 navigation_title: Versioning and availability
 mapped_pages:
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/introducing-elastic-documentation.html
+products:
+  - id: elastic-stack
 ---
 
 # Understanding versioning and availability
@@ -118,7 +120,7 @@ In April 2025, we released our new documentation site. This site includes docume
 
 To access our previous documentation system, which contains the documentation for releases prior to those listed below, go to [elastic.co/guide](https://elastic.co/guide).
 
-You can access the previous version of a specific page, where available, by clicking the **View previous version** link in the sidebar. 
+You can access the previous version of a specific page, where available, by clicking the **View previous version** link in the sidebar.
 
 The following product versions are documented on this site:
 
@@ -145,9 +147,9 @@ The following product versions are documented on this site:
 | Other ECS logging libraries | All |
 | {{es}} API clients | 9.0.0+ |
 | {{es}} for Apache Hadoop | 9.0.0+ |
-| Curator | 8.0+ | 
+| Curator | 8.0+ |
 | Elastic Cloud Control (ECCTL) | 1.14+ |
-| Elastic Serverless Forwarder | All | 
+| Elastic Serverless Forwarder | All |
 | Elastic integrations | All |
 | Elastic Search UI library | All |
 
@@ -158,12 +160,12 @@ The following product versions are documented on this site:
 | APM Android agent | 1.x+ |
 | APM .NET agent | 1.x+ |
 | APM Go agent | 2.x+ |
-| APM iOS agent | 1.x+ | 
-| APM Java agent | 1.x+ | 
+| APM iOS agent | 1.x+ |
+| APM Java agent | 1.x+ |
 | APM Node.js agent | 4.x+ |
 | APM PHP agent | All |
 | APM Python agent | 6.x+ |
-| APM Ruby agent | 4.x+ | 
+| APM Ruby agent | 4.x+ |
 | APM Real User Monitoring JavaScript agent | 5.x+ |
 | APM attacher for Kubernetes | All |
 
diff --git a/index.md b/index.md
index 0a1b66861..b0b65ed52 100644
--- a/index.md
+++ b/index.md
@@ -1,7 +1,9 @@
 ---
 navigation_title: Elastic Docs
 layout: landing-page
-description: Official Elastic documentation. Explore guides for Elastic Cloud (Hosted and Serverless) or on-prem deployments. Find product documentation, how-to guides, troubleshooting tips, release notes, and more.
+description: Official Elastic documentation. Explore guides for Elastic Cloud
+  (Hosted and Serverless) or on-prem deployments. Find product documentation,
+  how-to guides, troubleshooting tips, release notes, and more.
 ---
 
 # Elastic Docs
diff --git a/manage-data/data-store.md b/manage-data/data-store.md
index bb7226134..0bd433c94 100644
--- a/manage-data/data-store.md
+++ b/manage-data/data-store.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # The Elasticsearch data store [elasticsearch-intro-what-is-es]
diff --git a/manage-data/data-store/aliases.md b/manage-data/data-store/aliases.md
index 3f8d171a9..ba3d6783a 100644
--- a/manage-data/data-store/aliases.md
+++ b/manage-data/data-store/aliases.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Aliases [aliases]
diff --git a/manage-data/data-store/data-streams.md b/manage-data/data-store/data-streams.md
index 251fe03fc..2a2e2d7a9 100644
--- a/manage-data/data-store/data-streams.md
+++ b/manage-data/data-store/data-streams.md
@@ -6,6 +6,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Data streams [data-streams]
diff --git a/manage-data/data-store/data-streams/downsampling-time-series-data-stream.md b/manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
index 6f0b72100..234c8f41d 100644
--- a/manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
+++ b/manage-data/data-store/data-streams/downsampling-time-series-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Downsampling a time series data stream [downsampling]
diff --git a/manage-data/data-store/data-streams/logs-data-stream.md b/manage-data/data-store/data-streams/logs-data-stream.md
index 1c34fb179..bbcf83093 100644
--- a/manage-data/data-store/data-streams/logs-data-stream.md
+++ b/manage-data/data-store/data-streams/logs-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Logs data stream [logs-data-stream]
diff --git a/manage-data/data-store/data-streams/modify-data-stream.md b/manage-data/data-store/data-streams/modify-data-stream.md
index 3407409ca..e77793f0b 100644
--- a/manage-data/data-store/data-streams/modify-data-stream.md
+++ b/manage-data/data-store/data-streams/modify-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Modify a data stream [modify-data-streams]
diff --git a/manage-data/data-store/data-streams/reindex-tsds.md b/manage-data/data-store/data-streams/reindex-tsds.md
index 252d59e4b..a3a95b4cf 100644
--- a/manage-data/data-store/data-streams/reindex-tsds.md
+++ b/manage-data/data-store/data-streams/reindex-tsds.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Reindex a TSDS"
+navigation_title: Reindex a TSDS
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds-reindex.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/data-streams/run-downsampling-manually.md b/manage-data/data-store/data-streams/run-downsampling-manually.md
index 4ac5f2b1e..e689bb3ca 100644
--- a/manage-data/data-store/data-streams/run-downsampling-manually.md
+++ b/manage-data/data-store/data-streams/run-downsampling-manually.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Run downsampling manually"
+navigation_title: Run downsampling manually
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/downsampling-manual.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/data-streams/run-downsampling-using-data-stream-lifecycle.md b/manage-data/data-store/data-streams/run-downsampling-using-data-stream-lifecycle.md
index a21929429..c32ae1e91 100644
--- a/manage-data/data-store/data-streams/run-downsampling-using-data-stream-lifecycle.md
+++ b/manage-data/data-store/data-streams/run-downsampling-using-data-stream-lifecycle.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Run downsampling using data stream lifecycle"
+navigation_title: Run downsampling using data stream lifecycle
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/downsampling-dsl.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/data-streams/run-downsampling-with-ilm.md b/manage-data/data-store/data-streams/run-downsampling-with-ilm.md
index 505127951..14e87ee04 100644
--- a/manage-data/data-store/data-streams/run-downsampling-with-ilm.md
+++ b/manage-data/data-store/data-streams/run-downsampling-with-ilm.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Run downsampling with ILM"
+navigation_title: Run downsampling with ILM
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/downsampling-ilm.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/data-streams/set-up-data-stream.md b/manage-data/data-store/data-streams/set-up-data-stream.md
index 4b46e1098..ea7884bee 100644
--- a/manage-data/data-store/data-streams/set-up-data-stream.md
+++ b/manage-data/data-store/data-streams/set-up-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Set up a data stream [set-up-a-data-stream]
diff --git a/manage-data/data-store/data-streams/set-up-tsds.md b/manage-data/data-store/data-streams/set-up-tsds.md
index 3f132801b..c3f0c41cb 100644
--- a/manage-data/data-store/data-streams/set-up-tsds.md
+++ b/manage-data/data-store/data-streams/set-up-tsds.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Set up a TSDS"
+navigation_title: Set up a TSDS
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/set-up-tsds.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/data-streams/time-series-data-stream-tsds.md b/manage-data/data-store/data-streams/time-series-data-stream-tsds.md
index 526dabc8b..702f1df00 100644
--- a/manage-data/data-store/data-streams/time-series-data-stream-tsds.md
+++ b/manage-data/data-store/data-streams/time-series-data-stream-tsds.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Time series data stream (TSDS) [tsds]
diff --git a/manage-data/data-store/data-streams/use-data-stream.md b/manage-data/data-store/data-streams/use-data-stream.md
index 1b17f34f4..431f992bb 100644
--- a/manage-data/data-store/data-streams/use-data-stream.md
+++ b/manage-data/data-store/data-streams/use-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Use a data stream [use-a-data-stream]
diff --git a/manage-data/data-store/index-basics.md b/manage-data/data-store/index-basics.md
index a5a6aca2e..9f7aa41a9 100644
--- a/manage-data/data-store/index-basics.md
+++ b/manage-data/data-store/index-basics.md
@@ -6,6 +6,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Index basics
diff --git a/manage-data/data-store/manage-data-from-the-command-line.md b/manage-data/data-store/manage-data-from-the-command-line.md
index 0390b134c..5038ba8dc 100644
--- a/manage-data/data-store/manage-data-from-the-command-line.md
+++ b/manage-data/data-store/manage-data-from-the-command-line.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Manage data from the command line
diff --git a/manage-data/data-store/mapping.md b/manage-data/data-store/mapping.md
index 6497d460b..06e23759c 100644
--- a/manage-data/data-store/mapping.md
+++ b/manage-data/data-store/mapping.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Mapping
diff --git a/manage-data/data-store/mapping/define-runtime-fields-in-search-request.md b/manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
index b45558c0e..2f8b64d69 100644
--- a/manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
+++ b/manage-data/data-store/mapping/define-runtime-fields-in-search-request.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Define runtime fields in a search request [runtime-search-request]
diff --git a/manage-data/data-store/mapping/dynamic-field-mapping.md b/manage-data/data-store/mapping/dynamic-field-mapping.md
index 1c7b75236..68a29a3cf 100644
--- a/manage-data/data-store/mapping/dynamic-field-mapping.md
+++ b/manage-data/data-store/mapping/dynamic-field-mapping.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Dynamic field mapping [dynamic-field-mapping]
diff --git a/manage-data/data-store/mapping/dynamic-mapping.md b/manage-data/data-store/mapping/dynamic-mapping.md
index 24c979878..750a540a4 100644
--- a/manage-data/data-store/mapping/dynamic-mapping.md
+++ b/manage-data/data-store/mapping/dynamic-mapping.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Dynamic mapping [dynamic-mapping]
diff --git a/manage-data/data-store/mapping/dynamic-templates.md b/manage-data/data-store/mapping/dynamic-templates.md
index 6d6adebd7..94b611bd4 100644
--- a/manage-data/data-store/mapping/dynamic-templates.md
+++ b/manage-data/data-store/mapping/dynamic-templates.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Dynamic templates [dynamic-templates]
diff --git a/manage-data/data-store/mapping/explicit-mapping.md b/manage-data/data-store/mapping/explicit-mapping.md
index f49cbfb52..5ebc913fe 100644
--- a/manage-data/data-store/mapping/explicit-mapping.md
+++ b/manage-data/data-store/mapping/explicit-mapping.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Explicit mapping [explicit-mapping]
diff --git a/manage-data/data-store/mapping/explore-data-with-runtime-fields.md b/manage-data/data-store/mapping/explore-data-with-runtime-fields.md
index 200573967..88033b3e7 100644
--- a/manage-data/data-store/mapping/explore-data-with-runtime-fields.md
+++ b/manage-data/data-store/mapping/explore-data-with-runtime-fields.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Explore your data with runtime fields [runtime-examples]
diff --git a/manage-data/data-store/mapping/index-runtime-field.md b/manage-data/data-store/mapping/index-runtime-field.md
index c38d1528f..df647da06 100644
--- a/manage-data/data-store/mapping/index-runtime-field.md
+++ b/manage-data/data-store/mapping/index-runtime-field.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Index a runtime field [runtime-indexed]
diff --git a/manage-data/data-store/mapping/map-runtime-field.md b/manage-data/data-store/mapping/map-runtime-field.md
index 840de8ec9..b222a2487 100644
--- a/manage-data/data-store/mapping/map-runtime-field.md
+++ b/manage-data/data-store/mapping/map-runtime-field.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Map a runtime field [runtime-mapping-fields]
diff --git a/manage-data/data-store/mapping/override-field-values-at-query-time.md b/manage-data/data-store/mapping/override-field-values-at-query-time.md
index f703548aa..2e306fcc3 100644
--- a/manage-data/data-store/mapping/override-field-values-at-query-time.md
+++ b/manage-data/data-store/mapping/override-field-values-at-query-time.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Override field values at query time [runtime-override-values]
diff --git a/manage-data/data-store/mapping/removal-of-mapping-types.md b/manage-data/data-store/mapping/removal-of-mapping-types.md
index 2cff9e9c0..6ad78efee 100644
--- a/manage-data/data-store/mapping/removal-of-mapping-types.md
+++ b/manage-data/data-store/mapping/removal-of-mapping-types.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Removal of mapping types [removal-of-types]
diff --git a/manage-data/data-store/mapping/retrieve-runtime-field.md b/manage-data/data-store/mapping/retrieve-runtime-field.md
index ea3f7144c..2772667eb 100644
--- a/manage-data/data-store/mapping/retrieve-runtime-field.md
+++ b/manage-data/data-store/mapping/retrieve-runtime-field.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Retrieve a runtime field [runtime-retrieving-fields]
diff --git a/manage-data/data-store/mapping/runtime-fields.md b/manage-data/data-store/mapping/runtime-fields.md
index 1c31ebf77..ac35bfbea 100644
--- a/manage-data/data-store/mapping/runtime-fields.md
+++ b/manage-data/data-store/mapping/runtime-fields.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Runtime fields [runtime]
diff --git a/manage-data/data-store/near-real-time-search.md b/manage-data/data-store/near-real-time-search.md
index 8da8901ff..8b01f06ad 100644
--- a/manage-data/data-store/near-real-time-search.md
+++ b/manage-data/data-store/near-real-time-search.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/near-real-time.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Near real-time search [near-real-time]
diff --git a/manage-data/data-store/templates.md b/manage-data/data-store/templates.md
index 5e45117ad..536f991a9 100644
--- a/manage-data/data-store/templates.md
+++ b/manage-data/data-store/templates.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Templates [index-templates]
diff --git a/manage-data/data-store/templates/ignore-missing-component-templates.md b/manage-data/data-store/templates/ignore-missing-component-templates.md
index 44748859a..eb93e2051 100644
--- a/manage-data/data-store/templates/ignore-missing-component-templates.md
+++ b/manage-data/data-store/templates/ignore-missing-component-templates.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Ignore missing component templates
diff --git a/manage-data/data-store/templates/index-template-management.md b/manage-data/data-store/templates/index-template-management.md
index 53190cbf0..b6d769faf 100644
--- a/manage-data/data-store/templates/index-template-management.md
+++ b/manage-data/data-store/templates/index-template-management.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Manage index templates [manage-index-templates]
diff --git a/manage-data/data-store/templates/simulate-multi-component-templates.md b/manage-data/data-store/templates/simulate-multi-component-templates.md
index 5ccedc156..c102a4b59 100644
--- a/manage-data/data-store/templates/simulate-multi-component-templates.md
+++ b/manage-data/data-store/templates/simulate-multi-component-templates.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Simulate multi-component templates [simulate-multi-component-templates]
diff --git a/manage-data/data-store/text-analysis.md b/manage-data/data-store/text-analysis.md
index bc1dddb2d..14ec069fa 100644
--- a/manage-data/data-store/text-analysis.md
+++ b/manage-data/data-store/text-analysis.md
@@ -6,6 +6,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Text analysis
diff --git a/manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md b/manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
index 0230f5454..04492f9ba 100644
--- a/manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
+++ b/manage-data/data-store/text-analysis/anatomy-of-an-analyzer.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Anatomy of an analyzer [analyzer-anatomy]
diff --git a/manage-data/data-store/text-analysis/concepts.md b/manage-data/data-store/text-analysis/concepts.md
index 735b701c5..a12d5bcf0 100644
--- a/manage-data/data-store/text-analysis/concepts.md
+++ b/manage-data/data-store/text-analysis/concepts.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Concepts"
+navigation_title: Concepts
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-concepts.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/data-store/text-analysis/configure-text-analysis.md b/manage-data/data-store/text-analysis/configure-text-analysis.md
index 2bf1dfe87..d5fa3ebda 100644
--- a/manage-data/data-store/text-analysis/configure-text-analysis.md
+++ b/manage-data/data-store/text-analysis/configure-text-analysis.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Configure text analysis [configure-text-analysis]
diff --git a/manage-data/data-store/text-analysis/configuring-built-in-analyzers.md b/manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
index ace6fa98f..dc0230b11 100644
--- a/manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
+++ b/manage-data/data-store/text-analysis/configuring-built-in-analyzers.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Configuring built-in analyzers [configuring-analyzers]
diff --git a/manage-data/data-store/text-analysis/create-custom-analyzer.md b/manage-data/data-store/text-analysis/create-custom-analyzer.md
index 977e66308..61f29d537 100644
--- a/manage-data/data-store/text-analysis/create-custom-analyzer.md
+++ b/manage-data/data-store/text-analysis/create-custom-analyzer.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Create a custom analyzer [analysis-custom-analyzer]
diff --git a/manage-data/data-store/text-analysis/index-search-analysis.md b/manage-data/data-store/text-analysis/index-search-analysis.md
index e8ad3876d..386190862 100644
--- a/manage-data/data-store/text-analysis/index-search-analysis.md
+++ b/manage-data/data-store/text-analysis/index-search-analysis.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Index and search analysis [analysis-index-search-time]
diff --git a/manage-data/data-store/text-analysis/specify-an-analyzer.md b/manage-data/data-store/text-analysis/specify-an-analyzer.md
index 00b8502db..a081b3514 100644
--- a/manage-data/data-store/text-analysis/specify-an-analyzer.md
+++ b/manage-data/data-store/text-analysis/specify-an-analyzer.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Specify an analyzer [specify-analyzer]
diff --git a/manage-data/data-store/text-analysis/stemming.md b/manage-data/data-store/text-analysis/stemming.md
index e28f4db47..fc21ba9fd 100644
--- a/manage-data/data-store/text-analysis/stemming.md
+++ b/manage-data/data-store/text-analysis/stemming.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Stemming [stemming]
diff --git a/manage-data/data-store/text-analysis/test-an-analyzer.md b/manage-data/data-store/text-analysis/test-an-analyzer.md
index 0fa9ae352..08659b5b2 100644
--- a/manage-data/data-store/text-analysis/test-an-analyzer.md
+++ b/manage-data/data-store/text-analysis/test-an-analyzer.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Test an analyzer [test-analyzer]
diff --git a/manage-data/data-store/text-analysis/token-graphs.md b/manage-data/data-store/text-analysis/token-graphs.md
index b81c3c628..ca4406013 100644
--- a/manage-data/data-store/text-analysis/token-graphs.md
+++ b/manage-data/data-store/text-analysis/token-graphs.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Token graphs [token-graphs]
diff --git a/manage-data/ingest.md b/manage-data/ingest.md
index f013d6879..46183476c 100644
--- a/manage-data/ingest.md
+++ b/manage-data/ingest.md
@@ -9,6 +9,11 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-hosted
+  - id: kibana
+  - id: cloud-serverless
+  - id: elasticsearch
 ---
 
 # Ingestion
diff --git a/manage-data/ingest/ingest-reference-architectures.md b/manage-data/ingest/ingest-reference-architectures.md
index c873ab933..ae0917ceb 100644
--- a/manage-data/ingest/ingest-reference-architectures.md
+++ b/manage-data/ingest/ingest-reference-architectures.md
@@ -2,6 +2,8 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/index.html
   - https://www.elastic.co/guide/en/ingest/current/use-case-arch.html
+products:
+  - id: elastic-agent
 ---
 
 # Ingest architectures [ingest-architectures]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-apis.md b/manage-data/ingest/ingest-reference-architectures/agent-apis.md
index 6253ba0e0..7fdb909be 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-apis.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-apis.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-apis.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Elasticsearch: APIs for collection [agent-apis]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md b/manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
index 3ad049d67..8a7b77ff2 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-es-airgapped.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-es-airgapped.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Elasticsearch: Air-gapped environment [agent-es-airgapped]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-installed.md b/manage-data/ingest/ingest-reference-architectures/agent-installed.md
index a57eb1ada..94bf175b3 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-installed.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-installed.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-installed.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Elasticsearch: Agent installed [agent-installed]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md b/manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
index 77a575751..b83a82491 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-kafka-es.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-kafka-es.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Elasticsearch with Kafka as middleware message queue [agent-kafka-es]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md b/manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
index 70c5f49a7..d81307640 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-kafka-essink.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-kafka-essink.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash to Kafka to Kafka ES Sink to Elasticsearch: Kafka as middleware message queue [agent-kafka-essink]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md b/manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
index a9bd28c9b..d839b09b2 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-kafka-ls.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-kafka-ls.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash to Kafka to Logstash to Elasticsearch: Kafka as middleware message queue [agent-kafka-ls]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md b/manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
index 7a3462fc3..111727f8f 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-ls-airgapped.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-ls-airgapped.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash: Air-gapped environment [agent-ls-airgapped]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-ls.md b/manage-data/ingest/ingest-reference-architectures/agent-ls.md
index 9a2b99d34..a0eaab7ed 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-ls.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-ls.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-ls.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash to Elasticsearch [agent-ls]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-proxy.md b/manage-data/ingest/ingest-reference-architectures/agent-proxy.md
index 31fbbb019..3847cb518 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-proxy.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-proxy.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-proxy.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to proxy to Elasticsearch [agent-proxy]
diff --git a/manage-data/ingest/ingest-reference-architectures/agent-to-es.md b/manage-data/ingest/ingest-reference-architectures/agent-to-es.md
index 4db900fa5..1af223e99 100644
--- a/manage-data/ingest/ingest-reference-architectures/agent-to-es.md
+++ b/manage-data/ingest/ingest-reference-architectures/agent-to-es.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/agent-to-es.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Elasticsearch [agent-to-es]
diff --git a/manage-data/ingest/ingest-reference-architectures/airgapped-env.md b/manage-data/ingest/ingest-reference-architectures/airgapped-env.md
index 50fcf4c2d..54bda415e 100644
--- a/manage-data/ingest/ingest-reference-architectures/airgapped-env.md
+++ b/manage-data/ingest/ingest-reference-architectures/airgapped-env.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/airgapped-env.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic air-gapped architectures [airgapped-env]
@@ -8,7 +10,7 @@ mapped_pages:
 You can deploy the {{stack}} with some or all components in a data center or other environment with no access to any outside networks. Some stack components require additional configuration and local dependencies when deployed in air-gapped environments.
 
 
-## {{agent}} to {{es}} architectures: air-gapped environments [airgapped-archs] 
+## {{agent}} to {{es}} architectures: air-gapped environments [airgapped-archs]
 
 * [{{agent}} to {{es}}: Air-gapped environment](agent-es-airgapped.md)
 * [{{agent}} to {{ls}}: Air-gapped environment](agent-ls-airgapped.md)
diff --git a/manage-data/ingest/ingest-reference-architectures/ls-enrich.md b/manage-data/ingest/ingest-reference-architectures/ls-enrich.md
index dc338dcc8..0e51bafa3 100644
--- a/manage-data/ingest/ingest-reference-architectures/ls-enrich.md
+++ b/manage-data/ingest/ingest-reference-architectures/ls-enrich.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/ls-enrich.html
+products:
+  - id: elastic-agent
 ---
 
 # Elastic Agent to Logstash (for enrichment) to Elasticsearch [ls-enrich]
diff --git a/manage-data/ingest/ingest-reference-architectures/ls-for-input.md b/manage-data/ingest/ingest-reference-architectures/ls-for-input.md
index d365e9b02..93f5e944b 100644
--- a/manage-data/ingest/ingest-reference-architectures/ls-for-input.md
+++ b/manage-data/ingest/ingest-reference-architectures/ls-for-input.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/ls-for-input.html
+products:
+  - id: logstash
 ---
 
 # Logstash to Elasticsearch [ls-for-input]
diff --git a/manage-data/ingest/ingest-reference-architectures/ls-multi.md b/manage-data/ingest/ingest-reference-architectures/ls-multi.md
index e5e73b4a5..ca7272b11 100644
--- a/manage-data/ingest/ingest-reference-architectures/ls-multi.md
+++ b/manage-data/ingest/ingest-reference-architectures/ls-multi.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/ls-multi.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash for routing to multiple Elasticsearch clusters and additional destinations [ls-multi]
diff --git a/manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md b/manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
index 9bb071b8d..65c96f3bc 100644
--- a/manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
+++ b/manage-data/ingest/ingest-reference-architectures/ls-networkbridge.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/ls-networkbridge.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash to Elasticsearch: Logstash as a proxy [ls-networkbridge]
diff --git a/manage-data/ingest/ingest-reference-architectures/lspq.md b/manage-data/ingest/ingest-reference-architectures/lspq.md
index 02bdd26dc..6ce4e9c73 100644
--- a/manage-data/ingest/ingest-reference-architectures/lspq.md
+++ b/manage-data/ingest/ingest-reference-architectures/lspq.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/ingest/current/lspq.html
+products:
+  - id: elastic-agent
+  - id: logstash
 ---
 
 # Elastic Agent to Logstash to Elasticsearch: Logstash Persistent Queue (PQ) for buffering [lspq]
diff --git a/manage-data/ingest/ingesting-data-for-elastic-solutions.md b/manage-data/ingest/ingesting-data-for-elastic-solutions.md
index c8687ebb0..b3c6091be 100644
--- a/manage-data/ingest/ingesting-data-for-elastic-solutions.md
+++ b/manage-data/ingest/ingesting-data-for-elastic-solutions.md
@@ -4,6 +4,7 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products: []
 ---
 
 # Ingesting data for Elastic solutions [ingest-for-solutions]
diff --git a/manage-data/ingest/ingesting-data-from-applications.md b/manage-data/ingest/ingesting-data-from-applications.md
index 0d29ab596..1bc575959 100644
--- a/manage-data/ingest/ingesting-data-from-applications.md
+++ b/manage-data/ingest/ingesting-data-from-applications.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-ingest-guides.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingesting data from applications
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md b/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
index a80994ea7..d1d02512c 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-beats-to-elasticsearch-service-with-logstash-as-proxy.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-search-use-cases-beats-logstash.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest data from Beats with Logstash as a proxy
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md b/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
index 8a8114b77..afd5d4771 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-data-from-relational-database-into-elasticsearch-service.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-search-use-cases-db-logstash.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest data from a relational database
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md b/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
index 14aa1273c..b5a7859a5 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-nodejs-on-elasticsearch-service.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-node-js.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest data with Node.js
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md b/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
index 33fb6cf28..557e20cb3 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-data-with-python-on-elasticsearch-service.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-python.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest data with Python
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md b/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
index 42325a41c..8848353f4 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-nodejs-web-application-using-filebeat.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-search-use-cases-node-logs.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest logs from a Node.js web application using Filebeat
diff --git a/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md b/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
index a2f7509d3..63734e025 100644
--- a/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
+++ b/manage-data/ingest/ingesting-data-from-applications/ingest-logs-from-python-application-using-filebeat.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-started-search-use-cases-python-logs.html
 applies_to:
   stack: ga
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Ingest logs from a Python application using Filebeat
diff --git a/manage-data/ingest/ingesting-timeseries-data.md b/manage-data/ingest/ingesting-timeseries-data.md
index 6a79c6d42..a19a95964 100644
--- a/manage-data/ingest/ingesting-timeseries-data.md
+++ b/manage-data/ingest/ingesting-timeseries-data.md
@@ -4,6 +4,7 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products: []
 ---
 
 # Ingesting time series data [ingest-tools]
diff --git a/manage-data/ingest/sample-data.md b/manage-data/ingest/sample-data.md
index ac196175b..f7a8df20e 100644
--- a/manage-data/ingest/sample-data.md
+++ b/manage-data/ingest/sample-data.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: kibana
 ---
 
 # Sample data
diff --git a/manage-data/ingest/tools.md b/manage-data/ingest/tools.md
index 5100248c9..99f2eb0f1 100644
--- a/manage-data/ingest/tools.md
+++ b/manage-data/ingest/tools.md
@@ -9,6 +9,11 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-hosted
+  - id: fleet
+  - id: kibana
+  - id: cloud-serverless
 ---
 
 # Ingest tools overview
diff --git a/manage-data/ingest/transform-enrich.md b/manage-data/ingest/transform-enrich.md
index 42a69ea9e..cd871c864 100644
--- a/manage-data/ingest/transform-enrich.md
+++ b/manage-data/ingest/transform-enrich.md
@@ -4,6 +4,7 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products: []
 ---
 
 # Transform and enrich data [ingest-addl-proc]
diff --git a/manage-data/ingest/transform-enrich/data-enrichment.md b/manage-data/ingest/transform-enrich/data-enrichment.md
index d8d995801..eee86f8f6 100644
--- a/manage-data/ingest/transform-enrich/data-enrichment.md
+++ b/manage-data/ingest/transform-enrich/data-enrichment.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Data enrichment
diff --git a/manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md b/manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
index ddf7938b8..df4a96a99 100644
--- a/manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
+++ b/manage-data/ingest/transform-enrich/example-enrich-data-based-on-exact-values.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Example: Enrich your data based on exact values [match-enrich-policy-type]
diff --git a/manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md b/manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
index 082a1c53f..284422369 100644
--- a/manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
+++ b/manage-data/ingest/transform-enrich/example-enrich-data-based-on-geolocation.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Example: Enrich your data based on geolocation [geo-match-enrich-policy-type]
diff --git a/manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md b/manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
index 9f95321fd..a29ecc8f7 100644
--- a/manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
+++ b/manage-data/ingest/transform-enrich/example-enrich-data-by-matching-value-to-range.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Example: Enrich your data by matching a value to a range [range-enrich-policy-type]
diff --git a/manage-data/ingest/transform-enrich/example-parse-logs.md b/manage-data/ingest/transform-enrich/example-parse-logs.md
index 3a75a9032..4ba383122 100644
--- a/manage-data/ingest/transform-enrich/example-parse-logs.md
+++ b/manage-data/ingest/transform-enrich/example-parse-logs.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Example"
+navigation_title: Example
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/common-log-format-example.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/ingest/transform-enrich/ingest-pipelines.md b/manage-data/ingest/transform-enrich/ingest-pipelines.md
index 89fc66d4e..4bd43706a 100644
--- a/manage-data/ingest/transform-enrich/ingest-pipelines.md
+++ b/manage-data/ingest/transform-enrich/ingest-pipelines.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Elasticsearch ingest pipelines [ingest]
diff --git a/manage-data/ingest/transform-enrich/logstash-pipelines.md b/manage-data/ingest/transform-enrich/logstash-pipelines.md
index 0a979ff42..8237ec89b 100644
--- a/manage-data/ingest/transform-enrich/logstash-pipelines.md
+++ b/manage-data/ingest/transform-enrich/logstash-pipelines.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-serverless
 ---
 
 # Logstash pipelines [logstash-pipelines]
diff --git a/manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md b/manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
index bd4106c2a..89f961a8b 100644
--- a/manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
+++ b/manage-data/ingest/transform-enrich/set-up-an-enrich-processor.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Set up an enrich processor [enrich-setup]
diff --git a/manage-data/ingest/upload-data-files.md b/manage-data/ingest/upload-data-files.md
index bd327c0a0..58270d985 100644
--- a/manage-data/ingest/upload-data-files.md
+++ b/manage-data/ingest/upload-data-files.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Upload data files [upload-data-kibana]
diff --git a/manage-data/lifecycle.md b/manage-data/lifecycle.md
index 3c4128c0b..995274071 100644
--- a/manage-data/lifecycle.md
+++ b/manage-data/lifecycle.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Data lifecycle
diff --git a/manage-data/lifecycle/data-stream.md b/manage-data/lifecycle/data-stream.md
index ec0c2389e..4d239e40b 100644
--- a/manage-data/lifecycle/data-stream.md
+++ b/manage-data/lifecycle/data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Data stream lifecycle [data-stream-lifecycle]
diff --git a/manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md b/manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
index 7bde9d231..f9808f44a 100644
--- a/manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
+++ b/manage-data/lifecycle/data-stream/tutorial-create-data-stream-with-lifecycle.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Create a data stream with a lifecycle [tutorial-manage-new-data-stream]
diff --git a/manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md b/manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
index 945748bee..253f52396 100644
--- a/manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
+++ b/manage-data/lifecycle/data-stream/tutorial-data-stream-retention.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Data stream retention [tutorial-manage-data-stream-retention]
diff --git a/manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md b/manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
index 0c64035a6..682446c62 100644
--- a/manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
+++ b/manage-data/lifecycle/data-stream/tutorial-migrate-ilm-managed-data-stream-to-data-stream-lifecycle.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Migrate ILM managed data stream to data stream lifecycle [tutorial-migrate-data-stream-from-ilm-to-dsl]
diff --git a/manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md b/manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
index 85a4eebb3..ab24107c9 100644
--- a/manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
+++ b/manage-data/lifecycle/data-stream/tutorial-update-existing-data-stream.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Update existing data stream [tutorial-manage-existing-data-stream]
diff --git a/manage-data/lifecycle/data-tiers.md b/manage-data/lifecycle/data-tiers.md
index 8cbb1c982..de38b0d57 100644
--- a/manage-data/lifecycle/data-tiers.md
+++ b/manage-data/lifecycle/data-tiers.md
@@ -6,6 +6,10 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Data tiers
diff --git a/manage-data/lifecycle/index-lifecycle-management.md b/manage-data/lifecycle/index-lifecycle-management.md
index 5bdf7be4f..1f1d81cda 100644
--- a/manage-data/lifecycle/index-lifecycle-management.md
+++ b/manage-data/lifecycle/index-lifecycle-management.md
@@ -5,6 +5,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-concepts.html
 applies_to:
   stack: ga
+products:
+  - id: elasticsearch
 ---
 
 # Index lifecycle management
diff --git a/manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md b/manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
index 1f16fe885..854f65f55 100644
--- a/manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
+++ b/manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Configure a lifecycle policy [set-up-lifecycle-policy]
diff --git a/manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md b/manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
index e045b4b12..ab098c588 100644
--- a/manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
+++ b/manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Index lifecycle"
+navigation_title: Index lifecycle
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-index-lifecycle.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md b/manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md
index 34b1681e1..b4a1f1d1f 100644
--- a/manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md
+++ b/manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Index management in Kibana [index-mgmt]
diff --git a/manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md b/manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
index d6c82e7f7..28eb21355 100644
--- a/manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
+++ b/manage-data/lifecycle/index-lifecycle-management/manage-existing-indices.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Manage existing indices [ilm-with-existing-indices]
diff --git a/manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md b/manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
index cbd5d80ec..7c9d254c5 100644
--- a/manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
+++ b/manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Migrate index allocation filters to node roles [migrate-index-allocation-filters]
diff --git a/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md b/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
index 2be1b052c..4ffc6c07d 100644
--- a/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
+++ b/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
@@ -6,6 +6,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-enterprise
+  - id: cloud-hosted
 ---
 
 # Migrate to index lifecycle management
diff --git a/manage-data/lifecycle/index-lifecycle-management/policy-updates.md b/manage-data/lifecycle/index-lifecycle-management/policy-updates.md
index 4f084237d..32af90234 100644
--- a/manage-data/lifecycle/index-lifecycle-management/policy-updates.md
+++ b/manage-data/lifecycle/index-lifecycle-management/policy-updates.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Update a policy"
+navigation_title: Update a policy
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/update-lifecycle-policy.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Update a lifecycle policy
diff --git a/manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md b/manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
index 61a93d109..536570114 100644
--- a/manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
+++ b/manage-data/lifecycle/index-lifecycle-management/restore-managed-data-stream-index.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Restore a managed data stream or index [index-lifecycle-and-snapshots]
diff --git a/manage-data/lifecycle/index-lifecycle-management/rollover.md b/manage-data/lifecycle/index-lifecycle-management/rollover.md
index e981bb835..1fbfc6244 100644
--- a/manage-data/lifecycle/index-lifecycle-management/rollover.md
+++ b/manage-data/lifecycle/index-lifecycle-management/rollover.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Rollover [index-rollover]
diff --git a/manage-data/lifecycle/index-lifecycle-management/skip-rollover.md b/manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
index ce4cfe4db..9a8d57eaf 100644
--- a/manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
+++ b/manage-data/lifecycle/index-lifecycle-management/skip-rollover.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Skip rollover [skipping-rollover]
diff --git a/manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md b/manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
index 33f0e3085..3e8354ccf 100644
--- a/manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
+++ b/manage-data/lifecycle/index-lifecycle-management/start-stop-index-lifecycle-management.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Start and stop index lifecycle management [start-stop-ilm]
diff --git a/manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md b/manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md
index 66084801c..c1614db9d 100644
--- a/manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md
+++ b/manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Automate rollover [getting-started-index-lifecycle-management]
diff --git a/manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md b/manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
index 0013bce61..e9c5d8d45 100644
--- a/manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
+++ b/manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Customize built-in policies
diff --git a/manage-data/lifecycle/rollup.md b/manage-data/lifecycle/rollup.md
index 9f2c3a44f..a9a0f2f62 100644
--- a/manage-data/lifecycle/rollup.md
+++ b/manage-data/lifecycle/rollup.md
@@ -2,6 +2,8 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-rollup.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/rollup-overview.html
+products:
+  - id: elasticsearch
 ---
 
 # Rollup
diff --git a/manage-data/lifecycle/rollup/getting-started-api.md b/manage-data/lifecycle/rollup/getting-started-api.md
index f2c677150..bf73fc6fb 100644
--- a/manage-data/lifecycle/rollup/getting-started-api.md
+++ b/manage-data/lifecycle/rollup/getting-started-api.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Get started using the API"
+navigation_title: Get started using the API
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/rollup-getting-started.html
+products:
+  - id: elasticsearch
 ---
 
 # Get started with rollups using the API
diff --git a/manage-data/lifecycle/rollup/getting-started-kibana.md b/manage-data/lifecycle/rollup/getting-started-kibana.md
index e2c15bf1b..4c69ff69a 100644
--- a/manage-data/lifecycle/rollup/getting-started-kibana.md
+++ b/manage-data/lifecycle/rollup/getting-started-kibana.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Get started in Kibana"
+navigation_title: Get started in Kibana
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/data-rollups.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: kibana
 ---
 
 # Get started with the rollups in {{kib}}
diff --git a/manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md b/manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
index c5110db4b..49acd44fc 100644
--- a/manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
+++ b/manage-data/lifecycle/rollup/migrating-from-rollup-to-downsampling.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Migrating to downsampling"
+navigation_title: Migrating to downsampling
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/rollup-migrating-to-downsampling.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/manage-data/lifecycle/rollup/rollup-aggregation-limitations.md b/manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
index 392023e2a..4363a9023 100644
--- a/manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
+++ b/manage-data/lifecycle/rollup/rollup-aggregation-limitations.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Rollup aggregation limitations [rollup-agg-limitations]
diff --git a/manage-data/lifecycle/rollup/rollup-search-limitations.md b/manage-data/lifecycle/rollup/rollup-search-limitations.md
index 74c2a68c4..2b1df0615 100644
--- a/manage-data/lifecycle/rollup/rollup-search-limitations.md
+++ b/manage-data/lifecycle/rollup/rollup-search-limitations.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Rollup search limitations [rollup-search-limitations]
diff --git a/manage-data/lifecycle/rollup/understanding-groups.md b/manage-data/lifecycle/rollup/understanding-groups.md
index 1a3739adb..5639fcce8 100644
--- a/manage-data/lifecycle/rollup/understanding-groups.md
+++ b/manage-data/lifecycle/rollup/understanding-groups.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: elasticsearch
 ---
 
 # Understanding groups [rollup-understanding-groups]
diff --git a/manage-data/migrate.md b/manage-data/migrate.md
index aea8daf96..19ce26fb1 100644
--- a/manage-data/migrate.md
+++ b/manage-data/migrate.md
@@ -10,6 +10,9 @@ applies_to:
     ess: ga
     ece: ga
   serverless: unavailable
+products:
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Migrate your {{es}} data
diff --git a/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md b/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
index a8e794ffa..0ae113f0f 100644
--- a/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
+++ b/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
@@ -1,11 +1,13 @@
 ---
+navigation_title: Reindex from a self-managed cluster
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-remote-reindex.html
 applies_to:
   serverless: unavailable
   deployment:
     ess: all
-navigation_title: Reindex from a self-managed cluster
+products:
+  - id: cloud-hosted
 ---
 
 # Migrate from a self-managed cluster with a self-signed certificate using remote reindex [ec-remote-reindex]
diff --git a/manage-data/migrate/migrate-internal-indices.md b/manage-data/migrate/migrate-internal-indices.md
index ba470aae5..c5e327754 100644
--- a/manage-data/migrate/migrate-internal-indices.md
+++ b/manage-data/migrate/migrate-internal-indices.md
@@ -9,6 +9,8 @@ applies_to:
     ess: ga
     ece: unavailable
   serverless: unavailable
+products:
+  - id: cloud-hosted
 ---
 
 # Migrate internal indices
diff --git a/manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md b/manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
index 381b151c1..3832097e0 100644
--- a/manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
+++ b/manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/use-elasticsearch-for-time-series-data.html
+products:
+  - id: elasticsearch
 ---
 
 # Use case: use Elasticsearch to manage time series data [use-elasticsearch-for-time-series-data]
diff --git a/raw-migrated-files/stack-docs/elastic-stack/install-stack-demo-secure.md b/raw-migrated-files/stack-docs/elastic-stack/install-stack-demo-secure.md
index 387677149..7f5b38449 100644
--- a/raw-migrated-files/stack-docs/elastic-stack/install-stack-demo-secure.md
+++ b/raw-migrated-files/stack-docs/elastic-stack/install-stack-demo-secure.md
@@ -1,9 +1,10 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elastic-stack/current/install-stack-demo-secure.html
 applies_to:
   deployment:
     self: ga
-mapped_pages:
-  - https://www.elastic.co/guide/en/elastic-stack/current/install-stack-demo-secure.html
+products: []
 ---
 
 # Tutorial: Securing a self-managed {{stack}} [install-stack-demo-secure]
diff --git a/reference/apm/cloud-enterprise/apm-settings.md b/reference/apm/cloud-enterprise/apm-settings.md
index be9397b56..35f2ce37e 100644
--- a/reference/apm/cloud-enterprise/apm-settings.md
+++ b/reference/apm/cloud-enterprise/apm-settings.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-settings.html#ece_logging_settings_legacy
+products:
+  - id: cloud-enterprise
 ---
 
 # APM settings for Elastic Cloud Enterprise [ece-manage-apm-settings]
diff --git a/reference/apm/cloud/apm-settings.md b/reference/apm/cloud/apm-settings.md
index 80dfc1631..07d9b52e6 100644
--- a/reference/apm/cloud/apm-settings.md
+++ b/reference/apm/cloud/apm-settings.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-manage-apm-settings.html#ec-apm-settings
+products:
+  - id: cloud-hosted
 ---
 
 # APM settings for Elastic Cloud [ec-manage-apm-settings]
diff --git a/reference/apm/observability/apm-settings.md b/reference/apm/observability/apm-settings.md
index 2ec77d007..ccccd3b93 100644
--- a/reference/apm/observability/apm-settings.md
+++ b/reference/apm/observability/apm-settings.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuring-howto-apm-server.html
+products:
+  - id: observability
 ---
 
 # APM settings [apm-configuring-howto-apm-server]
diff --git a/reference/apm/observability/apm.md b/reference/apm/observability/apm.md
index c109f8c82..406767016 100644
--- a/reference/apm/observability/apm.md
+++ b/reference/apm/observability/apm.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm.html
+products:
+  - id: observability
 ---
 
 # APM [apm]
diff --git a/reference/data-analysis/kibana/canvas-functions.md b/reference/data-analysis/kibana/canvas-functions.md
index ea358568f..ae7ee18bb 100644
--- a/reference/data-analysis/kibana/canvas-functions.md
+++ b/reference/data-analysis/kibana/canvas-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/canvas-function-reference.html
+products:
+  - id: kibana
 ---
 
 # Canvas function reference [canvas-function-reference]
diff --git a/reference/data-analysis/kibana/tinymath-functions.md b/reference/data-analysis/kibana/tinymath-functions.md
index 034662ea6..aba0cbb21 100644
--- a/reference/data-analysis/kibana/tinymath-functions.md
+++ b/reference/data-analysis/kibana/tinymath-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/canvas-tinymath-functions.html
+products:
+  - id: kibana
 ---
 
 # TinyMath functions [canvas-tinymath-functions]
diff --git a/reference/data-analysis/machine-learning/machine-learning-functions.md b/reference/data-analysis/machine-learning/machine-learning-functions.md
index d5966b964..1193436b2 100644
--- a/reference/data-analysis/machine-learning/machine-learning-functions.md
+++ b/reference/data-analysis/machine-learning/machine-learning-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Function reference [ml-functions]
diff --git a/reference/data-analysis/machine-learning/ml-count-functions.md b/reference/data-analysis/machine-learning/ml-count-functions.md
index f3ce22007..5855e1824 100644
--- a/reference/data-analysis/machine-learning/ml-count-functions.md
+++ b/reference/data-analysis/machine-learning/ml-count-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-count-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Count functions [ml-count-functions]
diff --git a/reference/data-analysis/machine-learning/ml-geo-functions.md b/reference/data-analysis/machine-learning/ml-geo-functions.md
index f2e1f25de..f1c988d42 100644
--- a/reference/data-analysis/machine-learning/ml-geo-functions.md
+++ b/reference/data-analysis/machine-learning/ml-geo-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-geo-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Geographic functions [ml-geo-functions]
diff --git a/reference/data-analysis/machine-learning/ml-info-functions.md b/reference/data-analysis/machine-learning/ml-info-functions.md
index 5907a3a45..ad16bdc2f 100644
--- a/reference/data-analysis/machine-learning/ml-info-functions.md
+++ b/reference/data-analysis/machine-learning/ml-info-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-info-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Information content functions [ml-info-functions]
diff --git a/reference/data-analysis/machine-learning/ml-metric-functions.md b/reference/data-analysis/machine-learning/ml-metric-functions.md
index 84139a6fd..ab273e1e5 100644
--- a/reference/data-analysis/machine-learning/ml-metric-functions.md
+++ b/reference/data-analysis/machine-learning/ml-metric-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-metric-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Metric functions [ml-metric-functions]
diff --git a/reference/data-analysis/machine-learning/ml-rare-functions.md b/reference/data-analysis/machine-learning/ml-rare-functions.md
index fda99190a..a5e556577 100644
--- a/reference/data-analysis/machine-learning/ml-rare-functions.md
+++ b/reference/data-analysis/machine-learning/ml-rare-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-rare-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Rare functions [ml-rare-functions]
diff --git a/reference/data-analysis/machine-learning/ml-sum-functions.md b/reference/data-analysis/machine-learning/ml-sum-functions.md
index 489b663c9..8a0f7afae 100644
--- a/reference/data-analysis/machine-learning/ml-sum-functions.md
+++ b/reference/data-analysis/machine-learning/ml-sum-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-sum-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Sum functions [ml-sum-functions]
diff --git a/reference/data-analysis/machine-learning/ml-time-functions.md b/reference/data-analysis/machine-learning/ml-time-functions.md
index d05cd4305..8ca1a0cd7 100644
--- a/reference/data-analysis/machine-learning/ml-time-functions.md
+++ b/reference/data-analysis/machine-learning/ml-time-functions.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ml-time-functions.html
+products:
+  - id: machine-learning
 ---
 
 # Time functions [ml-time-functions]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-apache.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-apache.md
index 788191202..56bad172f 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-apache.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-apache.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-apache.html
+products:
+  - id: machine-learning
 ---
 
 # Apache {{anomaly-detect}} configurations [ootb-ml-jobs-apache]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-apm.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-apm.md
index da3deef3f..5b308bec8 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-apm.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-apm.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-apm.html
+products:
+  - id: machine-learning
 ---
 
 # APM {{anomaly-detect}} configurations [ootb-ml-jobs-apm]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-auditbeat.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-auditbeat.md
index b1e72cafc..9badd650c 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-auditbeat.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-auditbeat.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-auditbeat.html
+products:
+  - id: machine-learning
 ---
 
 # {{auditbeat}} {{anomaly-detect}} configurations [ootb-ml-jobs-auditbeat]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-logs-ui.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-logs-ui.md
index d5c0c8548..c8106ab71 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-logs-ui.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-logs-ui.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-logs-ui.html
+products:
+  - id: machine-learning
 ---
 
 # Logs {{anomaly-detect}} configurations [ootb-ml-jobs-logs-ui]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-metricbeat.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-metricbeat.md
index b15866129..39a9882a7 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-metricbeat.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-metricbeat.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-metricbeat.html
+products:
+  - id: machine-learning
 ---
 
 # {{metricbeat}} {{anomaly-detect}} configurations [ootb-ml-jobs-metricbeat]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-metrics-ui.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-metrics-ui.md
index 6598e770b..135363c31 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-metrics-ui.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-metrics-ui.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-metrics-ui.html
+products:
+  - id: machine-learning
 ---
 
 # Metrics {{anomaly-detect}} configurations [ootb-ml-jobs-metrics-ui]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-nginx.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-nginx.md
index e7654aaa8..5a24587be 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-nginx.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-nginx.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-nginx.html
+products:
+  - id: machine-learning
 ---
 
 # Nginx {{anomaly-detect}} configurations [ootb-ml-jobs-nginx]
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-siem.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-siem.md
index 5b9e71e33..9562866ce 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-siem.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-siem.md
@@ -7,6 +7,10 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
+  - id: machine-learning
 ---
 
 # Security {{anomaly-detect}} configurations
diff --git a/reference/data-analysis/machine-learning/ootb-ml-jobs-uptime.md b/reference/data-analysis/machine-learning/ootb-ml-jobs-uptime.md
index ab99be31f..bbacad73d 100644
--- a/reference/data-analysis/machine-learning/ootb-ml-jobs-uptime.md
+++ b/reference/data-analysis/machine-learning/ootb-ml-jobs-uptime.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs-uptime.html
+products:
+  - id: machine-learning
 ---
 
 # Uptime {{anomaly-detect}} configurations [ootb-ml-jobs-uptime]
diff --git a/reference/data-analysis/machine-learning/supplied-anomaly-detection-configurations.md b/reference/data-analysis/machine-learning/supplied-anomaly-detection-configurations.md
index 4e3302e94..b43561bef 100644
--- a/reference/data-analysis/machine-learning/supplied-anomaly-detection-configurations.md
+++ b/reference/data-analysis/machine-learning/supplied-anomaly-detection-configurations.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Supplied configurations"
+navigation_title: Supplied configurations
 mapped_pages:
   - https://www.elastic.co/guide/en/machine-learning/current/ootb-ml-jobs.html
+products:
+  - id: machine-learning
 ---
 
 # Supplied {{anomaly-detect}} configurations [ootb-ml-jobs]
diff --git a/reference/data-analysis/observability/index.md b/reference/data-analysis/observability/index.md
index 0585c5c9f..1a76670c3 100644
--- a/reference/data-analysis/observability/index.md
+++ b/reference/data-analysis/observability/index.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/metrics-reference.html
   - https://www.elastic.co/guide/en/serverless/current/observability-metrics-reference.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Metrics reference [metrics-reference]
diff --git a/reference/data-analysis/observability/observability-aws-metrics.md b/reference/data-analysis/observability/observability-aws-metrics.md
index ffbfdb6a5..f729e64c0 100644
--- a/reference/data-analysis/observability/observability-aws-metrics.md
+++ b/reference/data-analysis/observability/observability-aws-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-aws-metrics.html
   - https://www.elastic.co/guide/en/observability/current/aws-metrics.html
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # AWS metrics [observability-aws-metrics]
diff --git a/reference/data-analysis/observability/observability-container-metrics.md b/reference/data-analysis/observability/observability-container-metrics.md
index 7b762f6ee..cf4276d04 100644
--- a/reference/data-analysis/observability/observability-container-metrics.md
+++ b/reference/data-analysis/observability/observability-container-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-container-metrics.html
   - https://www.elastic.co/guide/en/observability/current/container-metrics.html
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Container metrics [observability-container-metrics]
diff --git a/reference/data-analysis/observability/observability-host-metrics.md b/reference/data-analysis/observability/observability-host-metrics.md
index dffecdab9..1077dfeac 100644
--- a/reference/data-analysis/observability/observability-host-metrics.md
+++ b/reference/data-analysis/observability/observability-host-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-host-metrics.html
   - https://www.elastic.co/guide/en/observability/current/host-metrics.html
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Host metrics [observability-host-metrics]
diff --git a/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md b/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
index ee9edc7dd..4af92c633 100644
--- a/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-kubernetes-pod-metrics.html
   - https://www.elastic.co/guide/en/observability/current/kubernetes-pod-metrics.html
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Kubernetes pod metrics [observability-kubernetes-pod-metrics]
diff --git a/reference/elasticsearch-clients/index.md b/reference/elasticsearch-clients/index.md
index 236766fdd..3e43ce41b 100644
--- a/reference/elasticsearch-clients/index.md
+++ b/reference/elasticsearch-clients/index.md
@@ -1,8 +1,10 @@
 ---
+navigation_title: Clients
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/client/index.html
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-clients.html
-navigation_title: Clients
+products:
+  - id: cloud-serverless
 ---
 
 # Elasticsearch clients [elasticsearch-clients]
diff --git a/reference/fleet/_agent_configuration_encryption.md b/reference/fleet/_agent_configuration_encryption.md
index 102138eab..ff7cd389f 100644
--- a/reference/fleet/_agent_configuration_encryption.md
+++ b/reference/fleet/_agent_configuration_encryption.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/_elastic_agent_configuration_encryption.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{agent}} configuration encryption [_agent_configuration_encryption]
diff --git a/reference/fleet/add-cloud-metadata-processor.md b/reference/fleet/add-cloud-metadata-processor.md
index 921814c74..ea6fb3b0c 100644
--- a/reference/fleet/add-cloud-metadata-processor.md
+++ b/reference/fleet/add-cloud-metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_cloud_metadata"
+navigation_title: add_cloud_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-cloud-metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add cloud metadata [add-cloud-metadata-processor]
diff --git a/reference/fleet/add-fleet-server-cloud.md b/reference/fleet/add-fleet-server-cloud.md
index c1b5076e3..87b5a3508 100644
--- a/reference/fleet/add-fleet-server-cloud.md
+++ b/reference/fleet/add-fleet-server-cloud.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-fleet-server-cloud.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Deploy on Elastic Cloud [add-fleet-server-cloud]
diff --git a/reference/fleet/add-fleet-server-kubernetes.md b/reference/fleet/add-fleet-server-kubernetes.md
index beafc5bd1..ab611b563 100644
--- a/reference/fleet/add-fleet-server-kubernetes.md
+++ b/reference/fleet/add-fleet-server-kubernetes.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-fleet-server-kubernetes.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Deploy Fleet Server on Kubernetes [add-fleet-server-kubernetes]
diff --git a/reference/fleet/add-fleet-server-mixed.md b/reference/fleet/add-fleet-server-mixed.md
index 7381ece6b..0b48ab45e 100644
--- a/reference/fleet/add-fleet-server-mixed.md
+++ b/reference/fleet/add-fleet-server-mixed.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-fleet-server-mixed.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Deploy Fleet Server on-premises and Elasticsearch on Cloud [add-fleet-server-mixed]
diff --git a/reference/fleet/add-fleet-server-on-prem.md b/reference/fleet/add-fleet-server-on-prem.md
index 5a8e5a12f..36a7d8fab 100644
--- a/reference/fleet/add-fleet-server-on-prem.md
+++ b/reference/fleet/add-fleet-server-on-prem.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-fleet-server-on-prem.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Deploy on-premises and self-managed [add-fleet-server-on-prem]
diff --git a/reference/fleet/add-integration-to-policy.md b/reference/fleet/add-integration-to-policy.md
index 47b1b961d..4e96db164 100644
--- a/reference/fleet/add-integration-to-policy.md
+++ b/reference/fleet/add-integration-to-policy.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Add an integration to an {{agent}} policy"
+navigation_title: Add an integration to an {{agent}} policy
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add-integration-to-policy.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add an integration to an {{agent}} policy [add-integration-to-policy]
diff --git a/reference/fleet/add_cloudfoundry_metadata-processor.md b/reference/fleet/add_cloudfoundry_metadata-processor.md
index 1726286f8..5dac686bd 100644
--- a/reference/fleet/add_cloudfoundry_metadata-processor.md
+++ b/reference/fleet/add_cloudfoundry_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_cloudfoundry_metadata"
+navigation_title: add_cloudfoundry_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_cloudfoundry_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Cloud Foundry metadata [add_cloudfoundry_metadata-processor]
diff --git a/reference/fleet/add_docker_metadata-processor.md b/reference/fleet/add_docker_metadata-processor.md
index b0c0446c5..449a1adca 100644
--- a/reference/fleet/add_docker_metadata-processor.md
+++ b/reference/fleet/add_docker_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_docker_metadata"
+navigation_title: add_docker_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_docker_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Docker metadata [add_docker_metadata-processor]
diff --git a/reference/fleet/add_fields-processor.md b/reference/fleet/add_fields-processor.md
index fcd1982e5..598e92736 100644
--- a/reference/fleet/add_fields-processor.md
+++ b/reference/fleet/add_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_fields"
+navigation_title: add_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add fields [add_fields-processor]
diff --git a/reference/fleet/add_host_metadata-processor.md b/reference/fleet/add_host_metadata-processor.md
index a186401f6..0dc514c6f 100644
--- a/reference/fleet/add_host_metadata-processor.md
+++ b/reference/fleet/add_host_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_host_metadata"
+navigation_title: add_host_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_host_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Host metadata [add_host_metadata-processor]
diff --git a/reference/fleet/add_id-processor.md b/reference/fleet/add_id-processor.md
index 425fecce6..6093c4e2c 100644
--- a/reference/fleet/add_id-processor.md
+++ b/reference/fleet/add_id-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_id"
+navigation_title: add_id
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_id-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Generate an ID for an event [add_id-processor]
diff --git a/reference/fleet/add_kubernetes_metadata-processor.md b/reference/fleet/add_kubernetes_metadata-processor.md
index b40cd257b..66ba4085a 100644
--- a/reference/fleet/add_kubernetes_metadata-processor.md
+++ b/reference/fleet/add_kubernetes_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_kubernetes_metadata"
+navigation_title: add_kubernetes_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_kubernetes_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Kubernetes metadata [add_kubernetes_metadata-processor]
diff --git a/reference/fleet/add_labels-processor.md b/reference/fleet/add_labels-processor.md
index c81f6ef03..94b5842c4 100644
--- a/reference/fleet/add_labels-processor.md
+++ b/reference/fleet/add_labels-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_labels"
+navigation_title: add_labels
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_labels-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add labels [add_labels-processor]
diff --git a/reference/fleet/add_locale-processor.md b/reference/fleet/add_locale-processor.md
index d9556eea8..c06624881 100644
--- a/reference/fleet/add_locale-processor.md
+++ b/reference/fleet/add_locale-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_locale"
+navigation_title: add_locale
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_locale-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add the local time zone [add_locale-processor]
diff --git a/reference/fleet/add_network_direction-processor.md b/reference/fleet/add_network_direction-processor.md
index 375d126b6..a50885d04 100644
--- a/reference/fleet/add_network_direction-processor.md
+++ b/reference/fleet/add_network_direction-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_network_direction"
+navigation_title: add_network_direction
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_network_direction-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add network direction [add_network_direction-processor]
diff --git a/reference/fleet/add_nomad_metadata-processor.md b/reference/fleet/add_nomad_metadata-processor.md
index d30d6fc76..f467a3bd6 100644
--- a/reference/fleet/add_nomad_metadata-processor.md
+++ b/reference/fleet/add_nomad_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_nomad_metadata"
+navigation_title: add_nomad_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_nomad_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Nomad metadata [add_nomad_metadata-processor]
diff --git a/reference/fleet/add_observer_metadata-processor.md b/reference/fleet/add_observer_metadata-processor.md
index 9c2bdb59b..32ff5fb57 100644
--- a/reference/fleet/add_observer_metadata-processor.md
+++ b/reference/fleet/add_observer_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_observer_metadata"
+navigation_title: add_observer_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_observer_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add Observer metadata [add_observer_metadata-processor]
diff --git a/reference/fleet/add_process_metadata-processor.md b/reference/fleet/add_process_metadata-processor.md
index faf6984fa..aaa2cfbb3 100644
--- a/reference/fleet/add_process_metadata-processor.md
+++ b/reference/fleet/add_process_metadata-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_process_metadata"
+navigation_title: add_process_metadata
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_process_metadata-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add process metadata [add_process_metadata-processor]
diff --git a/reference/fleet/add_tags-processor.md b/reference/fleet/add_tags-processor.md
index 0c98850b5..f27c59ffd 100644
--- a/reference/fleet/add_tags-processor.md
+++ b/reference/fleet/add_tags-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "add_tags"
+navigation_title: add_tags
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/add_tags-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add tags [add_tags-processor]
diff --git a/reference/fleet/advanced-kubernetes-managed-by-fleet.md b/reference/fleet/advanced-kubernetes-managed-by-fleet.md
index 054e1f7be..bf0964d6f 100644
--- a/reference/fleet/advanced-kubernetes-managed-by-fleet.md
+++ b/reference/fleet/advanced-kubernetes-managed-by-fleet.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/advanced-kubernetes-managed-by-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Advanced Elastic Agent configuration managed by Fleet [advanced-kubernetes-managed-by-fleet]
diff --git a/reference/fleet/agent-command-reference.md b/reference/fleet/agent-command-reference.md
index 6924147c6..9a5e3526e 100644
--- a/reference/fleet/agent-command-reference.md
+++ b/reference/fleet/agent-command-reference.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Command reference"
+navigation_title: Command reference
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-cmd-options.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{agent}} command reference [elastic-agent-cmd-options]
diff --git a/reference/fleet/agent-environment-variables.md b/reference/fleet/agent-environment-variables.md
index 924024fb1..95aacfcc1 100644
--- a/reference/fleet/agent-environment-variables.md
+++ b/reference/fleet/agent-environment-variables.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Environment variables"
+navigation_title: Environment variables
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/agent-environment-variables.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{agent}} environment variables [agent-environment-variables]
diff --git a/reference/fleet/agent-health-status.md b/reference/fleet/agent-health-status.md
index 9a99353b2..613086090 100644
--- a/reference/fleet/agent-health-status.md
+++ b/reference/fleet/agent-health-status.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/agent-health-status.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Elastic Agent health status [agent-health-status]
diff --git a/reference/fleet/agent-policy.md b/reference/fleet/agent-policy.md
index 90af4ee34..37d382f58 100644
--- a/reference/fleet/agent-policy.md
+++ b/reference/fleet/agent-policy.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Policies"
+navigation_title: Policies
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/agent-policy.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{agent}} policies [agent-policy]
diff --git a/reference/fleet/agent-processors.md b/reference/fleet/agent-processors.md
index 006b9d108..91397db83 100644
--- a/reference/fleet/agent-processors.md
+++ b/reference/fleet/agent-processors.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Agent processors [elastic-agent-processor-configuration]
diff --git a/reference/fleet/agent-provider.md b/reference/fleet/agent-provider.md
index 9ffe0171d..0407ad4ff 100644
--- a/reference/fleet/agent-provider.md
+++ b/reference/fleet/agent-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/agent-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Agent provider [agent-provider]
diff --git a/reference/fleet/air-gapped.md b/reference/fleet/air-gapped.md
index d19a70ef0..3cc1dfd7d 100644
--- a/reference/fleet/air-gapped.md
+++ b/reference/fleet/air-gapped.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/air-gapped.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Air-gapped environments [air-gapped]
diff --git a/reference/fleet/certificates-rotation.md b/reference/fleet/certificates-rotation.md
index 43b9b8f39..72d56968f 100644
--- a/reference/fleet/certificates-rotation.md
+++ b/reference/fleet/certificates-rotation.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/certificates-rotation.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Rotate SSL/TLS CA certificates [certificates-rotation]
diff --git a/reference/fleet/community_id-processor.md b/reference/fleet/community_id-processor.md
index 8f02a480d..09737b4a2 100644
--- a/reference/fleet/community_id-processor.md
+++ b/reference/fleet/community_id-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "community_id"
+navigation_title: community_id
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/community_id-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Community ID Network Flow Hash [community_id-processor]
diff --git a/reference/fleet/conditions-based-autodiscover.md b/reference/fleet/conditions-based-autodiscover.md
index 5d7d4a7b0..853ad48c7 100644
--- a/reference/fleet/conditions-based-autodiscover.md
+++ b/reference/fleet/conditions-based-autodiscover.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/conditions-based-autodiscover.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Conditions based autodiscover [conditions-based-autodiscover]
diff --git a/reference/fleet/config-file-example-apache.md b/reference/fleet/config-file-example-apache.md
index cb350497d..11163770e 100644
--- a/reference/fleet/config-file-example-apache.md
+++ b/reference/fleet/config-file-example-apache.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Apache HTTP Server"
+navigation_title: Apache HTTP Server
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/config-file-example-apache.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Config file example: Apache HTTP Server [config-file-example-apache]
diff --git a/reference/fleet/config-file-example-nginx.md b/reference/fleet/config-file-example-nginx.md
index fadb5d3ac..fa12910a1 100644
--- a/reference/fleet/config-file-example-nginx.md
+++ b/reference/fleet/config-file-example-nginx.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Nginx HTTP Server"
+navigation_title: Nginx HTTP Server
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/config-file-example-nginx.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Config file example: Nginx HTTP Server [config-file-example-nginx]
diff --git a/reference/fleet/config-file-examples.md b/reference/fleet/config-file-examples.md
index a54933b4b..e6e733d70 100644
--- a/reference/fleet/config-file-examples.md
+++ b/reference/fleet/config-file-examples.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/config-file-examples.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Config file examples [config-file-examples]
diff --git a/reference/fleet/configure-standalone-elastic-agents.md b/reference/fleet/configure-standalone-elastic-agents.md
index 39922d565..bec4bb85e 100644
--- a/reference/fleet/configure-standalone-elastic-agents.md
+++ b/reference/fleet/configure-standalone-elastic-agents.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure standalone Elastic Agents [elastic-agent-configuration]
diff --git a/reference/fleet/configuring-kubernetes-metadata.md b/reference/fleet/configuring-kubernetes-metadata.md
index d4dcc3d23..637823f6f 100644
--- a/reference/fleet/configuring-kubernetes-metadata.md
+++ b/reference/fleet/configuring-kubernetes-metadata.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/configuring-kubernetes-metadata.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configuring Kubernetes metadata enrichment on Elastic Agent [configuring-kubernetes-metadata]
diff --git a/reference/fleet/convert-processor.md b/reference/fleet/convert-processor.md
index 5349359e9..e727a526a 100644
--- a/reference/fleet/convert-processor.md
+++ b/reference/fleet/convert-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "convert"
+navigation_title: convert
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/convert-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Convert field type [convert-processor]
diff --git a/reference/fleet/copy_fields-processor.md b/reference/fleet/copy_fields-processor.md
index 4a0803112..ab6479821 100644
--- a/reference/fleet/copy_fields-processor.md
+++ b/reference/fleet/copy_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "copy_fields"
+navigation_title: copy_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/copy_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Copy fields [copy_fields-processor]
diff --git a/reference/fleet/create-policy-no-ui.md b/reference/fleet/create-policy-no-ui.md
index 7a2ad2f0f..31a391bd0 100644
--- a/reference/fleet/create-policy-no-ui.md
+++ b/reference/fleet/create-policy-no-ui.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/create-a-policy-no-ui.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Create an agent policy without using the UI [create-a-policy-no-ui]
diff --git a/reference/fleet/create-standalone-agent-policy.md b/reference/fleet/create-standalone-agent-policy.md
index fb67f72b1..1d8adf955 100644
--- a/reference/fleet/create-standalone-agent-policy.md
+++ b/reference/fleet/create-standalone-agent-policy.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/create-standalone-agent-policy.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Create a standalone Elastic Agent policy
diff --git a/reference/fleet/data-streams-advanced-features.md b/reference/fleet/data-streams-advanced-features.md
index 00a58a826..5ce25053a 100644
--- a/reference/fleet/data-streams-advanced-features.md
+++ b/reference/fleet/data-streams-advanced-features.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Advanced data stream features"
+navigation_title: Advanced data stream features
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-advanced-features.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Enabling and disabling advanced indexing features for {{fleet}}-managed data streams [data-streams-advanced-features]
diff --git a/reference/fleet/data-streams-ilm-tutorial.md b/reference/fleet/data-streams-ilm-tutorial.md
index 51e334e6b..25b3e7a26 100644
--- a/reference/fleet/data-streams-ilm-tutorial.md
+++ b/reference/fleet/data-streams-ilm-tutorial.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-ilm-tutorial.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Tutorials: Customize data retention policies [data-streams-ilm-tutorial]
diff --git a/reference/fleet/data-streams-pipeline-tutorial.md b/reference/fleet/data-streams-pipeline-tutorial.md
index aac4c636e..350b6b814 100644
--- a/reference/fleet/data-streams-pipeline-tutorial.md
+++ b/reference/fleet/data-streams-pipeline-tutorial.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-pipeline-tutorial.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Tutorial: Transform data with custom ingest pipelines [data-streams-pipeline-tutorial]
diff --git a/reference/fleet/data-streams-scenario1.md b/reference/fleet/data-streams-scenario1.md
index 2e503d9fa..3caa3f741 100644
--- a/reference/fleet/data-streams-scenario1.md
+++ b/reference/fleet/data-streams-scenario1.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Scenario 1"
+navigation_title: Scenario 1
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-scenario1.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Scenario 1: Apply an ILM policy to all data streams generated from Fleet integrations across all namespaces [data-streams-scenario1]
diff --git a/reference/fleet/data-streams-scenario2.md b/reference/fleet/data-streams-scenario2.md
index eeb63eb17..c8a1cfe20 100644
--- a/reference/fleet/data-streams-scenario2.md
+++ b/reference/fleet/data-streams-scenario2.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Scenario 2"
+navigation_title: Scenario 2
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-scenario2.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Scenario 2: Apply an ILM policy to specific data streams generated from Fleet integrations across all namespaces [data-streams-scenario2]
diff --git a/reference/fleet/data-streams-scenario3.md b/reference/fleet/data-streams-scenario3.md
index 0d1a858ff..0b9cc38eb 100644
--- a/reference/fleet/data-streams-scenario3.md
+++ b/reference/fleet/data-streams-scenario3.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Scenario 3"
+navigation_title: Scenario 3
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams-scenario3.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Scenario 3: Apply an ILM policy with integrations using multiple namespaces [data-streams-scenario3]
diff --git a/reference/fleet/data-streams.md b/reference/fleet/data-streams.md
index dd5ae45df..413f56ce9 100644
--- a/reference/fleet/data-streams.md
+++ b/reference/fleet/data-streams.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/data-streams.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Data streams [data-streams]
diff --git a/reference/fleet/debug-standalone-agents.md b/reference/fleet/debug-standalone-agents.md
index 12bf22188..df058953c 100644
--- a/reference/fleet/debug-standalone-agents.md
+++ b/reference/fleet/debug-standalone-agents.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/debug-standalone-agents.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Debug standalone Elastic Agents [debug-standalone-agents]
diff --git a/reference/fleet/decode-json-fields.md b/reference/fleet/decode-json-fields.md
index a3e0b08fd..e2b2defc0 100644
--- a/reference/fleet/decode-json-fields.md
+++ b/reference/fleet/decode-json-fields.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_json_fields"
+navigation_title: decode_json_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode-json-fields.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode JSON fields [decode-json-fields]
diff --git a/reference/fleet/decode_base64_field-processor.md b/reference/fleet/decode_base64_field-processor.md
index f2990396d..eda199928 100644
--- a/reference/fleet/decode_base64_field-processor.md
+++ b/reference/fleet/decode_base64_field-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_base64_field"
+navigation_title: decode_base64_field
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_base64_field-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode Base64 fields [decode_base64_field-processor]
diff --git a/reference/fleet/decode_cef-processor.md b/reference/fleet/decode_cef-processor.md
index 94f369ea3..3ef81a581 100644
--- a/reference/fleet/decode_cef-processor.md
+++ b/reference/fleet/decode_cef-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_cef"
+navigation_title: decode_cef
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_cef-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode CEF [decode_cef-processor]
diff --git a/reference/fleet/decode_csv_fields-processor.md b/reference/fleet/decode_csv_fields-processor.md
index c57129039..71da35f1c 100644
--- a/reference/fleet/decode_csv_fields-processor.md
+++ b/reference/fleet/decode_csv_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_csv_fields"
+navigation_title: decode_csv_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_csv_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode CSV fields [decode_csv_fields-processor]
diff --git a/reference/fleet/decode_duration-processor.md b/reference/fleet/decode_duration-processor.md
index 63d19e7b4..86774bdc5 100644
--- a/reference/fleet/decode_duration-processor.md
+++ b/reference/fleet/decode_duration-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_duration"
+navigation_title: decode_duration
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_duration-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode duration [decode_duration-processor]
diff --git a/reference/fleet/decode_xml-processor.md b/reference/fleet/decode_xml-processor.md
index 9dad5555d..61d4241d1 100644
--- a/reference/fleet/decode_xml-processor.md
+++ b/reference/fleet/decode_xml-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_xml"
+navigation_title: decode_xml
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_xml-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode XML [decode_xml-processor]
diff --git a/reference/fleet/decode_xml_wineventlog-processor.md b/reference/fleet/decode_xml_wineventlog-processor.md
index bd37420bf..068ac5d3a 100644
--- a/reference/fleet/decode_xml_wineventlog-processor.md
+++ b/reference/fleet/decode_xml_wineventlog-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decode_xml_wineventlog"
+navigation_title: decode_xml_wineventlog
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decode_xml_wineventlog-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decode XML Wineventlog [decode_xml_wineventlog-processor]
diff --git a/reference/fleet/decompress_gzip_field-processor.md b/reference/fleet/decompress_gzip_field-processor.md
index 0fda133ee..9adc7c561 100644
--- a/reference/fleet/decompress_gzip_field-processor.md
+++ b/reference/fleet/decompress_gzip_field-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "decompress_gzip_field"
+navigation_title: decompress_gzip_field
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/decompress_gzip_field-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Decompress gzip fields [decompress_gzip_field-processor]
diff --git a/reference/fleet/deployment-models.md b/reference/fleet/deployment-models.md
index fddf8d836..f8cd7fb99 100644
--- a/reference/fleet/deployment-models.md
+++ b/reference/fleet/deployment-models.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-deployment-models.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Deployment models [fleet-deployment-models]
diff --git a/reference/fleet/detect_mime_type-processor.md b/reference/fleet/detect_mime_type-processor.md
index acc8b2b04..15546dbcd 100644
--- a/reference/fleet/detect_mime_type-processor.md
+++ b/reference/fleet/detect_mime_type-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "detect_mime_type"
+navigation_title: detect_mime_type
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/detect_mime_type-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Detect mime type [detect_mime_type-processor]
diff --git a/reference/fleet/dissect-processor.md b/reference/fleet/dissect-processor.md
index 415cc3967..84ac3927c 100644
--- a/reference/fleet/dissect-processor.md
+++ b/reference/fleet/dissect-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "dissect"
+navigation_title: dissect
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/dissect-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Dissect strings [dissect-processor]
diff --git a/reference/fleet/dns-processor.md b/reference/fleet/dns-processor.md
index 156dc166a..53eba085b 100644
--- a/reference/fleet/dns-processor.md
+++ b/reference/fleet/dns-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "dns"
+navigation_title: dns
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/dns-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # DNS Reverse Lookup [dns-processor]
diff --git a/reference/fleet/docker-provider.md b/reference/fleet/docker-provider.md
index 93caca8a3..7edca6267 100644
--- a/reference/fleet/docker-provider.md
+++ b/reference/fleet/docker-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/docker-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Docker Provider [docker-provider]
diff --git a/reference/fleet/drop_event-processor.md b/reference/fleet/drop_event-processor.md
index 4de5daacb..ee6cb97d3 100644
--- a/reference/fleet/drop_event-processor.md
+++ b/reference/fleet/drop_event-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "drop_event"
+navigation_title: drop_event
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/drop_event-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Drop events [drop_event-processor]
diff --git a/reference/fleet/drop_fields-processor.md b/reference/fleet/drop_fields-processor.md
index 49d2f395e..35bbd7cf7 100644
--- a/reference/fleet/drop_fields-processor.md
+++ b/reference/fleet/drop_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "drop_fields"
+navigation_title: drop_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/drop_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Drop fields from events [drop_fields-processor]
diff --git a/reference/fleet/dynamic-input-configuration.md b/reference/fleet/dynamic-input-configuration.md
index 63c266b44..e1046d71a 100644
--- a/reference/fleet/dynamic-input-configuration.md
+++ b/reference/fleet/dynamic-input-configuration.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Variables and conditions in input configurations [dynamic-input-configuration]
diff --git a/reference/fleet/edit-delete-integration-policy.md b/reference/fleet/edit-delete-integration-policy.md
index 8be89c288..95257a023 100644
--- a/reference/fleet/edit-delete-integration-policy.md
+++ b/reference/fleet/edit-delete-integration-policy.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Edit or delete an integration policy"
+navigation_title: Edit or delete an integration policy
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/edit-or-delete-integration-policy.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Edit or delete an {{agent}} integration policy [edit-or-delete-integration-policy]
diff --git a/reference/fleet/elastic-agent-container.md b/reference/fleet/elastic-agent-container.md
index 4b2e1eef6..4e913637d 100644
--- a/reference/fleet/elastic-agent-container.md
+++ b/reference/fleet/elastic-agent-container.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-container.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent in a container [elastic-agent-container]
diff --git a/reference/fleet/elastic-agent-input-configuration.md b/reference/fleet/elastic-agent-input-configuration.md
index d797b28d6..87734ff21 100644
--- a/reference/fleet/elastic-agent-input-configuration.md
+++ b/reference/fleet/elastic-agent-input-configuration.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Inputs"
+navigation_title: Inputs
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-input-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure inputs for standalone {{agent}}s [elastic-agent-input-configuration]
diff --git a/reference/fleet/elastic-agent-inputs-list.md b/reference/fleet/elastic-agent-inputs-list.md
index 463a0b1ca..18c784bb8 100644
--- a/reference/fleet/elastic-agent-inputs-list.md
+++ b/reference/fleet/elastic-agent-inputs-list.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-inputs-list.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Elastic Agent inputs [elastic-agent-inputs-list]
diff --git a/reference/fleet/elastic-agent-kubernetes-autodiscovery.md b/reference/fleet/elastic-agent-kubernetes-autodiscovery.md
index 805b89c1e..7b103c442 100644
--- a/reference/fleet/elastic-agent-kubernetes-autodiscovery.md
+++ b/reference/fleet/elastic-agent-kubernetes-autodiscovery.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-kubernetes-autodiscovery.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kubernetes autodiscovery with Elastic Agent [elastic-agent-kubernetes-autodiscovery]
diff --git a/reference/fleet/elastic-agent-monitoring-configuration.md b/reference/fleet/elastic-agent-monitoring-configuration.md
index 75172019f..b8d137c92 100644
--- a/reference/fleet/elastic-agent-monitoring-configuration.md
+++ b/reference/fleet/elastic-agent-monitoring-configuration.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Monitoring"
+navigation_title: Monitoring
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-monitoring-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure monitoring for standalone {{agent}}s [elastic-agent-monitoring-configuration]
diff --git a/reference/fleet/elastic-agent-output-configuration.md b/reference/fleet/elastic-agent-output-configuration.md
index 627977d58..28be5bcfd 100644
--- a/reference/fleet/elastic-agent-output-configuration.md
+++ b/reference/fleet/elastic-agent-output-configuration.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Outputs"
+navigation_title: Outputs
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-output-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure outputs for standalone {{agent}}s [elastic-agent-output-configuration]
diff --git a/reference/fleet/elastic-agent-proxy-config.md b/reference/fleet/elastic-agent-proxy-config.md
index 6369b586e..86634de33 100644
--- a/reference/fleet/elastic-agent-proxy-config.md
+++ b/reference/fleet/elastic-agent-proxy-config.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-proxy-config.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # When to configure proxy settings [elastic-agent-proxy-config]
diff --git a/reference/fleet/elastic-agent-reference-yaml.md b/reference/fleet/elastic-agent-reference-yaml.md
index f6277801b..af6b8a808 100644
--- a/reference/fleet/elastic-agent-reference-yaml.md
+++ b/reference/fleet/elastic-agent-reference-yaml.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-reference-yaml.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Reference YAML [elastic-agent-reference-yaml]
diff --git a/reference/fleet/elastic-agent-simplified-input-configuration.md b/reference/fleet/elastic-agent-simplified-input-configuration.md
index a2be31d67..f0fa145b0 100644
--- a/reference/fleet/elastic-agent-simplified-input-configuration.md
+++ b/reference/fleet/elastic-agent-simplified-input-configuration.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-simplified-input-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Simplified log ingestion [elastic-agent-simplified-input-configuration]
diff --git a/reference/fleet/elastic-agent-ssl-configuration.md b/reference/fleet/elastic-agent-ssl-configuration.md
index 791c6a5d8..b9be9b7b7 100644
--- a/reference/fleet/elastic-agent-ssl-configuration.md
+++ b/reference/fleet/elastic-agent-ssl-configuration.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "SSL/TLS"
+navigation_title: SSL/TLS
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-ssl-configuration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure SSL/TLS for standalone {{agent}}s [elastic-agent-ssl-configuration]
diff --git a/reference/fleet/elastic-agent-standalone-download.md b/reference/fleet/elastic-agent-standalone-download.md
index 6fb426556..3a6336731 100644
--- a/reference/fleet/elastic-agent-standalone-download.md
+++ b/reference/fleet/elastic-agent-standalone-download.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Agent download"
+navigation_title: Agent download
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-standalone-download.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure download settings for standalone {{agent}} upgrades [elastic-agent-standalone-download]
diff --git a/reference/fleet/elastic-agent-standalone-feature-flags.md b/reference/fleet/elastic-agent-standalone-feature-flags.md
index 6056d85cc..72e6da737 100644
--- a/reference/fleet/elastic-agent-standalone-feature-flags.md
+++ b/reference/fleet/elastic-agent-standalone-feature-flags.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Feature flags"
+navigation_title: Feature flags
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-standalone-feature-flags.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure feature flags for standalone {{agent}}s [elastic-agent-standalone-feature-flags]
diff --git a/reference/fleet/elastic-agent-standalone-logging-config.md b/reference/fleet/elastic-agent-standalone-logging-config.md
index a03eb6bca..9485bb94f 100644
--- a/reference/fleet/elastic-agent-standalone-logging-config.md
+++ b/reference/fleet/elastic-agent-standalone-logging-config.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Logging"
+navigation_title: Logging
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-standalone-logging-config.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure logging for standalone {{agent}}s [elastic-agent-standalone-logging-config]
diff --git a/reference/fleet/elastic-agent-unprivileged.md b/reference/fleet/elastic-agent-unprivileged.md
index c518b5851..3885fb4a1 100644
--- a/reference/fleet/elastic-agent-unprivileged.md
+++ b/reference/fleet/elastic-agent-unprivileged.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-unprivileged.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent without administrative privileges [elastic-agent-unprivileged]
diff --git a/reference/fleet/elasticsearch-output.md b/reference/fleet/elasticsearch-output.md
index 6dea91773..7581e37a6 100644
--- a/reference/fleet/elasticsearch-output.md
+++ b/reference/fleet/elasticsearch-output.md
@@ -2,6 +2,9 @@
 navigation_title: "{{es}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elasticsearch-output.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure the {{es}} output [elasticsearch-output]
diff --git a/reference/fleet/enable-custom-policy-settings.md b/reference/fleet/enable-custom-policy-settings.md
index 46415404f..314b1812a 100644
--- a/reference/fleet/enable-custom-policy-settings.md
+++ b/reference/fleet/enable-custom-policy-settings.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/enable-custom-policy-settings.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Enable custom settings in an agent policy [enable-custom-policy-settings]
diff --git a/reference/fleet/env-provider.md b/reference/fleet/env-provider.md
index d8a46c29c..ea80548aa 100644
--- a/reference/fleet/env-provider.md
+++ b/reference/fleet/env-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/env-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Env Provider [env-provider]
diff --git a/reference/fleet/epr-proxy-setting.md b/reference/fleet/epr-proxy-setting.md
index e93da8461..28615f9b2 100644
--- a/reference/fleet/epr-proxy-setting.md
+++ b/reference/fleet/epr-proxy-setting.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/epr-proxy-setting.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Set the proxy URL of the Elastic Package Registry [epr-proxy-setting]
diff --git a/reference/fleet/es-output-settings.md b/reference/fleet/es-output-settings.md
index 51264e27f..6dc64da39 100644
--- a/reference/fleet/es-output-settings.md
+++ b/reference/fleet/es-output-settings.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/es-output-settings.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Elasticsearch output settings [es-output-settings]
diff --git a/reference/fleet/example-kubernetes-fleet-managed-agent-helm.md b/reference/fleet/example-kubernetes-fleet-managed-agent-helm.md
index 7dd89915d..8bda3e54e 100644
--- a/reference/fleet/example-kubernetes-fleet-managed-agent-helm.md
+++ b/reference/fleet/example-kubernetes-fleet-managed-agent-helm.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack: ga 8.18
   serverless: all
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Example: Install Fleet-managed Elastic Agent on Kubernetes using Helm [example-kubernetes-fleet-managed-agent-helm]
@@ -42,7 +45,7 @@ The installation and configuration steps shown in this example deploys the follo
 By default, all resources are installed in the namespace defined by your current `kubectl` context. You can override this by specifying a different namespace using the `--namespace` option during installation.
 
 ::::{note}
-The proposed approach of a single {{agent}} DaemonSet to collect all metrics works well for small to medium-sized {{k8s}} clusters. 
+The proposed approach of a single {{agent}} DaemonSet to collect all metrics works well for small to medium-sized {{k8s}} clusters.
 
 For larger clusters, or when kube-state-metrics (KSM) metrics collection becomes a performance bottleneck, we recommend a more scalable architecture: move the KSM metric collection to a separate set of agents deployed as sidecars alongside KSM, with autosharding enabled.
 
@@ -134,7 +137,7 @@ This can be easily implemented with the Helm chart. For details, refer to the [K
     If your Kubernetes nodes have [`taints`](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) configured, you may need to add `tolerations` to the {{agent}} DaemonSet during installation to ensure the Pods can run on tainted nodes.
 
     You can do this by setting the `presets.perNode.tolerations[]` value, which accepts standard Kubernetes toleration definitions.
-    ::::    
+    ::::
 
 10. In the **Add agent** flyout, wait a minute or so for confirmation that {{agent}} has successfully enrolled with {{fleet}} and that data is flowing:
 
diff --git a/reference/fleet/example-kubernetes-standalone-agent-helm.md b/reference/fleet/example-kubernetes-standalone-agent-helm.md
index 8aeb3c8f6..be6c1dc5d 100644
--- a/reference/fleet/example-kubernetes-standalone-agent-helm.md
+++ b/reference/fleet/example-kubernetes-standalone-agent-helm.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/example-kubernetes-standalone-agent-helm.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Example: Install standalone Elastic Agent on Kubernetes using Helm [example-kubernetes-standalone-agent-helm]
diff --git a/reference/fleet/example-standalone-monitor-nginx-serverless.md b/reference/fleet/example-standalone-monitor-nginx-serverless.md
index 6596c5fd1..93677c7b9 100644
--- a/reference/fleet/example-standalone-monitor-nginx-serverless.md
+++ b/reference/fleet/example-standalone-monitor-nginx-serverless.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/example-standalone-monitor-nginx-serverless.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Example: Use standalone Elastic Agent with Elastic Cloud Serverless to monitor nginx [example-standalone-monitor-nginx-serverless]
diff --git a/reference/fleet/example-standalone-monitor-nginx.md b/reference/fleet/example-standalone-monitor-nginx.md
index c6c8a3d68..806ebae42 100644
--- a/reference/fleet/example-standalone-monitor-nginx.md
+++ b/reference/fleet/example-standalone-monitor-nginx.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/example-standalone-monitor-nginx.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Example: Use standalone Elastic Agent with {{ech}} to monitor nginx [example-standalone-monitor-nginx]
diff --git a/reference/fleet/extract_array-processor.md b/reference/fleet/extract_array-processor.md
index 4300b77ef..0462640ef 100644
--- a/reference/fleet/extract_array-processor.md
+++ b/reference/fleet/extract_array-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "extract_array"
+navigation_title: extract_array
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/extract_array-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Extract array [extract_array-processor]
diff --git a/reference/fleet/filter-agent-list-by-tags.md b/reference/fleet/filter-agent-list-by-tags.md
index 1b9fcfb61..7a69bd2a4 100644
--- a/reference/fleet/filter-agent-list-by-tags.md
+++ b/reference/fleet/filter-agent-list-by-tags.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/filter-agent-list-by-tags.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Add tags to filter the Agents list [filter-agent-list-by-tags]
diff --git a/reference/fleet/fingerprint-processor.md b/reference/fleet/fingerprint-processor.md
index da62e3a9f..c5b467f84 100644
--- a/reference/fleet/fingerprint-processor.md
+++ b/reference/fleet/fingerprint-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "fingerprint"
+navigation_title: fingerprint
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fingerprint-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Generate a fingerprint of an event [fingerprint-processor]
diff --git a/reference/fleet/fleet-agent-environment-variables.md b/reference/fleet/fleet-agent-environment-variables.md
index 2c5296cf4..339508711 100644
--- a/reference/fleet/fleet-agent-environment-variables.md
+++ b/reference/fleet/fleet-agent-environment-variables.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-agent-environment-variables.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Set environment variables in an Elastic Agent policy [fleet-agent-environment-variables]
diff --git a/reference/fleet/fleet-agent-proxy-managed.md b/reference/fleet/fleet-agent-proxy-managed.md
index 54c9715ca..1500c4c4b 100644
--- a/reference/fleet/fleet-agent-proxy-managed.md
+++ b/reference/fleet/fleet-agent-proxy-managed.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-agent-proxy-managed.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet managed Elastic Agent connectivity using a proxy server [fleet-agent-proxy-managed]
diff --git a/reference/fleet/fleet-agent-proxy-standalone.md b/reference/fleet/fleet-agent-proxy-standalone.md
index 96cabfcfd..b36ff2894 100644
--- a/reference/fleet/fleet-agent-proxy-standalone.md
+++ b/reference/fleet/fleet-agent-proxy-standalone.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-agent-proxy-standalone.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Standalone Elastic Agent connectivity using a proxy server [fleet-agent-proxy-standalone]
diff --git a/reference/fleet/fleet-agent-proxy-support.md b/reference/fleet/fleet-agent-proxy-support.md
index cb219ae18..017a5d3a5 100644
--- a/reference/fleet/fleet-agent-proxy-support.md
+++ b/reference/fleet/fleet-agent-proxy-support.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-agent-proxy-support.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Using a proxy server with Elastic Agent and Fleet [fleet-agent-proxy-support]
diff --git a/reference/fleet/fleet-agent-serverless-restrictions.md b/reference/fleet/fleet-agent-serverless-restrictions.md
index c98b6c406..7ce2722b0 100644
--- a/reference/fleet/fleet-agent-serverless-restrictions.md
+++ b/reference/fleet/fleet-agent-serverless-restrictions.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Restrictions for {{serverless-full}}"
-applies_to:
-  serverless: all
+navigation_title: Restrictions for {{serverless-full}}
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-agent-serverless-restrictions.html
+applies_to:
+  serverless: all
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{fleet}} and {{agent}} restrictions for {{serverless-full}} [fleet-agent-serverless-restrictions]
diff --git a/reference/fleet/fleet-api-docs.md b/reference/fleet/fleet-api-docs.md
index 4ec62017a..1b0c2a49e 100644
--- a/reference/fleet/fleet-api-docs.md
+++ b/reference/fleet/fleet-api-docs.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-api-docs.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kibana Fleet APIs [fleet-api-docs]
diff --git a/reference/fleet/fleet-enrollment-tokens.md b/reference/fleet/fleet-enrollment-tokens.md
index 8bb972508..e949e0145 100644
--- a/reference/fleet/fleet-enrollment-tokens.md
+++ b/reference/fleet/fleet-enrollment-tokens.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-enrollment-tokens.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet enrollment tokens [fleet-enrollment-tokens]
diff --git a/reference/fleet/fleet-roles-privileges.md b/reference/fleet/fleet-roles-privileges.md
index 69a6ca9cd..ec1fc5803 100644
--- a/reference/fleet/fleet-roles-privileges.md
+++ b/reference/fleet/fleet-roles-privileges.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-roles-and-privileges.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Required roles and privileges [fleet-roles-and-privileges]
diff --git a/reference/fleet/fleet-server-monitoring.md b/reference/fleet/fleet-server-monitoring.md
index 50cee9ea6..cbb196a31 100644
--- a/reference/fleet/fleet-server-monitoring.md
+++ b/reference/fleet/fleet-server-monitoring.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-server-monitoring.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Monitor a self-managed Fleet Server [fleet-server-monitoring]
diff --git a/reference/fleet/fleet-server-scalability.md b/reference/fleet/fleet-server-scalability.md
index f79355867..dabf92f37 100644
--- a/reference/fleet/fleet-server-scalability.md
+++ b/reference/fleet/fleet-server-scalability.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-server-scalability.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet Server scalability [fleet-server-scalability]
diff --git a/reference/fleet/fleet-server-secrets.md b/reference/fleet/fleet-server-secrets.md
index d519e255c..362703238 100644
--- a/reference/fleet/fleet-server-secrets.md
+++ b/reference/fleet/fleet-server-secrets.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-server-secrets.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet Server Secrets [fleet-server-secrets]
diff --git a/reference/fleet/fleet-server.md b/reference/fleet/fleet-server.md
index 35a47ecd7..61bee3477 100644
--- a/reference/fleet/fleet-server.md
+++ b/reference/fleet/fleet-server.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-server.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # What is Fleet Server? [fleet-server]
diff --git a/reference/fleet/fleet-settings-changing-outputs.md b/reference/fleet/fleet-settings-changing-outputs.md
index f9003a6ee..1f5cc9138 100644
--- a/reference/fleet/fleet-settings-changing-outputs.md
+++ b/reference/fleet/fleet-settings-changing-outputs.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-settings-changing-outputs.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Considerations when changing outputs [fleet-settings-changing-outputs]
diff --git a/reference/fleet/fleet-settings.md b/reference/fleet/fleet-settings.md
index 172a7225e..4584ed3ac 100644
--- a/reference/fleet/fleet-settings.md
+++ b/reference/fleet/fleet-settings.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/fleet-settings.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet settings [fleet-settings]
diff --git a/reference/fleet/grant-access-to-elasticsearch.md b/reference/fleet/grant-access-to-elasticsearch.md
index 98183247a..9d4729034 100644
--- a/reference/fleet/grant-access-to-elasticsearch.md
+++ b/reference/fleet/grant-access-to-elasticsearch.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Grant standalone Elastic Agents access to Elasticsearch [grant-access-to-elasticsearch]
diff --git a/reference/fleet/hints-annotations-autodiscovery.md b/reference/fleet/hints-annotations-autodiscovery.md
index 2ff971533..2d8a659a3 100644
--- a/reference/fleet/hints-annotations-autodiscovery.md
+++ b/reference/fleet/hints-annotations-autodiscovery.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Hints annotations based autodiscover [hints-annotations-autodiscovery]
diff --git a/reference/fleet/host-provider.md b/reference/fleet/host-provider.md
index e75e2823f..a16240a2a 100644
--- a/reference/fleet/host-provider.md
+++ b/reference/fleet/host-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/host-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Host provider [host-provider]
diff --git a/reference/fleet/host-proxy-env-vars.md b/reference/fleet/host-proxy-env-vars.md
index 27957595c..3497381e6 100644
--- a/reference/fleet/host-proxy-env-vars.md
+++ b/reference/fleet/host-proxy-env-vars.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/host-proxy-env-vars.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Proxy Server connectivity using default host variables [host-proxy-env-vars]
diff --git a/reference/fleet/include_fields-processor.md b/reference/fleet/include_fields-processor.md
index 6dd3bd1fe..60cd32711 100644
--- a/reference/fleet/include_fields-processor.md
+++ b/reference/fleet/include_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "include_fields"
+navigation_title: include_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/include_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Keep fields from events [include_fields-processor]
diff --git a/reference/fleet/index.md b/reference/fleet/index.md
index 2c177304a..b9e829ca5 100644
--- a/reference/fleet/index.md
+++ b/reference/fleet/index.md
@@ -5,6 +5,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/fleet.html
   - https://www.elastic.co/guide/en/fleet/current/fleet-overview.html
   - https://www.elastic.co/guide/en/fleet/current/index.html
+products:
+  - id: cloud-serverless
+  - id: fleet
+  - id: kibana
 ---
 
 # Fleet and Elastic Agent [fleet-and-elastic-agent]
diff --git a/reference/fleet/ingest-pipeline-kubernetes.md b/reference/fleet/ingest-pipeline-kubernetes.md
index 0a9a34690..82cf7b1b6 100644
--- a/reference/fleet/ingest-pipeline-kubernetes.md
+++ b/reference/fleet/ingest-pipeline-kubernetes.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/ingest-pipeline-kubernetes.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Using a custom ingest pipeline with the Kubernetes Integration [ingest-pipeline-kubernetes]
diff --git a/reference/fleet/install-agent-msi.md b/reference/fleet/install-agent-msi.md
index c901a97fd..035724d23 100644
--- a/reference/fleet/install-agent-msi.md
+++ b/reference/fleet/install-agent-msi.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-agent-msi.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install Elastic Agent from an MSI package [install-agent-msi]
diff --git a/reference/fleet/install-elastic-agents-in-containers.md b/reference/fleet/install-elastic-agents-in-containers.md
index 652ce6208..24276b9df 100644
--- a/reference/fleet/install-elastic-agents-in-containers.md
+++ b/reference/fleet/install-elastic-agents-in-containers.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-elastic-agents-in-containers.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install Elastic Agents in a containerized environment [install-elastic-agents-in-containers]
diff --git a/reference/fleet/install-elastic-agents.md b/reference/fleet/install-elastic-agents.md
index 7b82bfb47..3e0d115a1 100644
--- a/reference/fleet/install-elastic-agents.md
+++ b/reference/fleet/install-elastic-agents.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install Elastic Agents [elastic-agent-installation]
diff --git a/reference/fleet/install-fleet-managed-elastic-agent.md b/reference/fleet/install-fleet-managed-elastic-agent.md
index e61896f6d..016359525 100644
--- a/reference/fleet/install-fleet-managed-elastic-agent.md
+++ b/reference/fleet/install-fleet-managed-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-fleet-managed-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install Fleet-managed Elastic Agents [install-fleet-managed-elastic-agent]
diff --git a/reference/fleet/install-on-kubernetes-using-helm.md b/reference/fleet/install-on-kubernetes-using-helm.md
index 23f23b96a..01cf7359a 100644
--- a/reference/fleet/install-on-kubernetes-using-helm.md
+++ b/reference/fleet/install-on-kubernetes-using-helm.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-on-kubernetes-using-helm.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install Elastic Agent on Kubernetes using Helm [install-on-kubernetes-using-helm]
diff --git a/reference/fleet/install-standalone-elastic-agent.md b/reference/fleet/install-standalone-elastic-agent.md
index bc4dda863..ad13a794a 100644
--- a/reference/fleet/install-standalone-elastic-agent.md
+++ b/reference/fleet/install-standalone-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-standalone-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install standalone Elastic Agents [install-standalone-elastic-agent]
@@ -29,7 +32,7 @@ To install and run {{agent}} standalone:
 
     ::::::{tab-item} macOS
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-darwin-aarch64.tar.gz 
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-darwin-aarch64.tar.gz
     tar xzvf elastic-agent-{{stack-version}}-darwin-aarch64.tar.gz
     ```
     ::::::
@@ -115,7 +118,7 @@ To install and run {{agent}} standalone:
     ::::::
 
     :::::::
-    
+
     The commands shown are for either the Intel or ARM platform, but packages for both are available. Refer to the {{agent}} [downloads page](https://www.elastic.co/downloads/elastic-agent) for the full list of available packages.
 
 
diff --git a/reference/fleet/install-uninstall-integration-assets.md b/reference/fleet/install-uninstall-integration-assets.md
index 380f1dd10..51c160a84 100644
--- a/reference/fleet/install-uninstall-integration-assets.md
+++ b/reference/fleet/install-uninstall-integration-assets.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Install and uninstall integration assets"
+navigation_title: Install and uninstall integration assets
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/install-uninstall-integration-assets.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Install and uninstall {{agent}} integration assets [install-uninstall-integration-assets]
diff --git a/reference/fleet/installation-layout.md b/reference/fleet/installation-layout.md
index 2f59bf69f..8ac0817a8 100644
--- a/reference/fleet/installation-layout.md
+++ b/reference/fleet/installation-layout.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/installation-layout.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Installation layout [installation-layout]
diff --git a/reference/fleet/integration-level-outputs.md b/reference/fleet/integration-level-outputs.md
index c60d9612e..876fc2462 100644
--- a/reference/fleet/integration-level-outputs.md
+++ b/reference/fleet/integration-level-outputs.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/integration-level-outputs.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Set integration-level outputs [integration-level-outputs]
diff --git a/reference/fleet/integrations-assets-best-practices.md b/reference/fleet/integrations-assets-best-practices.md
index e538a7ed2..83e63c578 100644
--- a/reference/fleet/integrations-assets-best-practices.md
+++ b/reference/fleet/integrations-assets-best-practices.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/integrations-assets-best-practices.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Best practices for integration assets [integrations-assets-best-practices]
diff --git a/reference/fleet/kafka-output-settings.md b/reference/fleet/kafka-output-settings.md
index 95080a47c..7558403b4 100644
--- a/reference/fleet/kafka-output-settings.md
+++ b/reference/fleet/kafka-output-settings.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/kafka-output-settings.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kafka output settings [kafka-output-settings]
diff --git a/reference/fleet/kafka-output.md b/reference/fleet/kafka-output.md
index 16af387b4..49a7951e9 100644
--- a/reference/fleet/kafka-output.md
+++ b/reference/fleet/kafka-output.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Kafka"
+navigation_title: Kafka
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/kafka-output.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kafka output [kafka-output]
diff --git a/reference/fleet/kubernetes-provider.md b/reference/fleet/kubernetes-provider.md
index 2b35ff255..c5737b0fe 100644
--- a/reference/fleet/kubernetes-provider.md
+++ b/reference/fleet/kubernetes-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/kubernetes-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kubernetes Provider [kubernetes-provider]
diff --git a/reference/fleet/kubernetes_leaderelection-provider.md b/reference/fleet/kubernetes_leaderelection-provider.md
index 6f1963dba..b55731c71 100644
--- a/reference/fleet/kubernetes_leaderelection-provider.md
+++ b/reference/fleet/kubernetes_leaderelection-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/kubernetes_leaderelection-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kubernetes LeaderElection Provider [kubernetes_leaderelection-provider]
diff --git a/reference/fleet/kubernetes_secrets-provider.md b/reference/fleet/kubernetes_secrets-provider.md
index 882e1eda9..ec3b9ff65 100644
--- a/reference/fleet/kubernetes_secrets-provider.md
+++ b/reference/fleet/kubernetes_secrets-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/kubernetes_secrets-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Kubernetes Secrets Provider [kubernetes_secrets-provider]
diff --git a/reference/fleet/local-dynamic-provider.md b/reference/fleet/local-dynamic-provider.md
index 857227a6d..32e1d0997 100644
--- a/reference/fleet/local-dynamic-provider.md
+++ b/reference/fleet/local-dynamic-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/local-dynamic-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Local dynamic provider [local-dynamic-provider]
diff --git a/reference/fleet/local-provider.md b/reference/fleet/local-provider.md
index a15e92d91..2f4ecf8d5 100644
--- a/reference/fleet/local-provider.md
+++ b/reference/fleet/local-provider.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/local-provider.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Local [local-provider]
diff --git a/reference/fleet/logstash-output.md b/reference/fleet/logstash-output.md
index 997018818..5d82b3934 100644
--- a/reference/fleet/logstash-output.md
+++ b/reference/fleet/logstash-output.md
@@ -2,6 +2,9 @@
 navigation_title: "{{ls}}"
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/logstash-output.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{ls}} output [logstash-output]
diff --git a/reference/fleet/ls-output-settings.md b/reference/fleet/ls-output-settings.md
index 8b6140706..09807d8ca 100644
--- a/reference/fleet/ls-output-settings.md
+++ b/reference/fleet/ls-output-settings.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/ls-output-settings.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Logstash output settings [ls-output-settings]
diff --git a/reference/fleet/manage-agents.md b/reference/fleet/manage-agents.md
index 0cddb3e82..87ed641dc 100644
--- a/reference/fleet/manage-agents.md
+++ b/reference/fleet/manage-agents.md
@@ -2,6 +2,9 @@
 navigation_title: "{{agent}}s"
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/manage-agents.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{agent}}s [manage-agents]
diff --git a/reference/fleet/manage-elastic-agents-in-fleet.md b/reference/fleet/manage-elastic-agents-in-fleet.md
index e81c04c78..8fade9f6a 100644
--- a/reference/fleet/manage-elastic-agents-in-fleet.md
+++ b/reference/fleet/manage-elastic-agents-in-fleet.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Manage {{agent}}s in {{fleet}}"
+navigation_title: Manage {{agent}}s in {{fleet}}
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/manage-agents-in-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Centrally manage {{agent}}s in {{fleet}} [manage-agents-in-fleet]
diff --git a/reference/fleet/manage-integrations.md b/reference/fleet/manage-integrations.md
index b566545d8..d1988fa0c 100644
--- a/reference/fleet/manage-integrations.md
+++ b/reference/fleet/manage-integrations.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Manage integrations"
+navigation_title: Manage integrations
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/integrations.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Manage {{agent}} integrations [integrations]
diff --git a/reference/fleet/managed-integrations-content.md b/reference/fleet/managed-integrations-content.md
index af1be51da..47f99aff2 100644
--- a/reference/fleet/managed-integrations-content.md
+++ b/reference/fleet/managed-integrations-content.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Managed integrations content"
+navigation_title: Managed integrations content
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/managed-integrations-content.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Managed integrations content [managed-integrations-content]
diff --git a/reference/fleet/migrate-auditbeat-to-agent.md b/reference/fleet/migrate-auditbeat-to-agent.md
index 66bb143c7..e9053f676 100644
--- a/reference/fleet/migrate-auditbeat-to-agent.md
+++ b/reference/fleet/migrate-auditbeat-to-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/migrate-auditbeat-to-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Migrate from Auditbeat to Elastic Agent [migrate-auditbeat-to-agent]
diff --git a/reference/fleet/migrate-elastic-agent.md b/reference/fleet/migrate-elastic-agent.md
index ab146f145..0af54ba1e 100644
--- a/reference/fleet/migrate-elastic-agent.md
+++ b/reference/fleet/migrate-elastic-agent.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Migrate {{agent}}s"
+navigation_title: Migrate {{agent}}s
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/migrate-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Migrate {{fleet}}-managed {{agent}}s from one cluster to another [migrate-elastic-agent]
diff --git a/reference/fleet/migrate-from-beats-to-elastic-agent.md b/reference/fleet/migrate-from-beats-to-elastic-agent.md
index 5cf0029bf..eb5fd9fbc 100644
--- a/reference/fleet/migrate-from-beats-to-elastic-agent.md
+++ b/reference/fleet/migrate-from-beats-to-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/migrate-beats-to-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Migrate from Beats to Elastic Agent [migrate-beats-to-agent]
diff --git a/reference/fleet/monitor-elastic-agent.md b/reference/fleet/monitor-elastic-agent.md
index 59232b079..6e6b0c43e 100644
--- a/reference/fleet/monitor-elastic-agent.md
+++ b/reference/fleet/monitor-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/monitor-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Monitor Elastic Agents [monitor-elastic-agent]
diff --git a/reference/fleet/move_fields-processor.md b/reference/fleet/move_fields-processor.md
index 16339b8dc..817910e30 100644
--- a/reference/fleet/move_fields-processor.md
+++ b/reference/fleet/move_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "move_fields"
+navigation_title: move_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/move_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Move fields [move_fields-processor]
diff --git a/reference/fleet/mutual-tls.md b/reference/fleet/mutual-tls.md
index 19ed0056c..d0efa834c 100644
--- a/reference/fleet/mutual-tls.md
+++ b/reference/fleet/mutual-tls.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/mutual-tls.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Elastic Agent deployment models with mutual TLS [mutual-tls]
diff --git a/reference/fleet/otel-agent-transform.md b/reference/fleet/otel-agent-transform.md
index 5239375ff..e16a6e845 100644
--- a/reference/fleet/otel-agent-transform.md
+++ b/reference/fleet/otel-agent-transform.md
@@ -1,8 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/otel-agent-transform.html
-  # That link will 404 until 8.18 is current
-  # (see https://www.elastic.co/guide/en/fleet/8.18/otel-agent-transform.html)
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Transform an installed {{agent}} to run as an OTel Collector [otel-agent-transform]
diff --git a/reference/fleet/otel-agent.md b/reference/fleet/otel-agent.md
index 9181b2181..f58fd607c 100644
--- a/reference/fleet/otel-agent.md
+++ b/reference/fleet/otel-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/otel-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent as an OTel Collector [otel-agent]
diff --git a/reference/fleet/package-signatures.md b/reference/fleet/package-signatures.md
index 9c21d162e..ef6275de4 100644
--- a/reference/fleet/package-signatures.md
+++ b/reference/fleet/package-signatures.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/package-signatures.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Package signatures [package-signatures]
diff --git a/reference/fleet/processor-parse-aws-vpc-flow-log.md b/reference/fleet/processor-parse-aws-vpc-flow-log.md
index 649c02f77..7bccf0475 100644
--- a/reference/fleet/processor-parse-aws-vpc-flow-log.md
+++ b/reference/fleet/processor-parse-aws-vpc-flow-log.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "parse_aws_vpc_flow_log"
+navigation_title: parse_aws_vpc_flow_log
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/processor-parse-aws-vpc-flow-log.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Parse AWS VPC Flow Log [processor-parse-aws-vpc-flow-log]
diff --git a/reference/fleet/processor-syntax.md b/reference/fleet/processor-syntax.md
index 690e23bdd..b3775ad7c 100644
--- a/reference/fleet/processor-syntax.md
+++ b/reference/fleet/processor-syntax.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/processor-syntax.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Processor syntax [processor-syntax]
diff --git a/reference/fleet/providers.md b/reference/fleet/providers.md
index 7f5ffd67f..d1e3f2155 100644
--- a/reference/fleet/providers.md
+++ b/reference/fleet/providers.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Providers"
+navigation_title: Providers
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/providers.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure providers for standalone {{agent}}s [providers]
diff --git a/reference/fleet/rate_limit-processor.md b/reference/fleet/rate_limit-processor.md
index 5001d1a44..66e92a8f1 100644
--- a/reference/fleet/rate_limit-processor.md
+++ b/reference/fleet/rate_limit-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "rate_limit"
+navigation_title: rate_limit
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/rate_limit-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Rate limit the flow of events [rate_limit-processor]
diff --git a/reference/fleet/registered_domain-processor.md b/reference/fleet/registered_domain-processor.md
index a6fafafc1..f60198901 100644
--- a/reference/fleet/registered_domain-processor.md
+++ b/reference/fleet/registered_domain-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "registered_domain"
+navigation_title: registered_domain
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/registered_domain-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Registered Domain [registered_domain-processor]
diff --git a/reference/fleet/remote-elasticsearch-output.md b/reference/fleet/remote-elasticsearch-output.md
index 48995fa76..edd21fcba 100644
--- a/reference/fleet/remote-elasticsearch-output.md
+++ b/reference/fleet/remote-elasticsearch-output.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/remote-elasticsearch-output.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Remote Elasticsearch output [remote-elasticsearch-output]
diff --git a/reference/fleet/rename-processor.md b/reference/fleet/rename-processor.md
index b4dcc175f..224ca2cec 100644
--- a/reference/fleet/rename-processor.md
+++ b/reference/fleet/rename-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "rename"
+navigation_title: rename
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/rename-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Rename fields from events [rename-processor]
diff --git a/reference/fleet/replace-fields.md b/reference/fleet/replace-fields.md
index 3c285baa7..2c192a473 100644
--- a/reference/fleet/replace-fields.md
+++ b/reference/fleet/replace-fields.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "replace"
+navigation_title: replace
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/replace-fields.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Replace fields from events [replace-fields]
diff --git a/reference/fleet/running-on-aks-managed-by-fleet.md b/reference/fleet/running-on-aks-managed-by-fleet.md
index 345323a19..82d4c8925 100644
--- a/reference/fleet/running-on-aks-managed-by-fleet.md
+++ b/reference/fleet/running-on-aks-managed-by-fleet.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/running-on-aks-managed-by-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent on Azure AKS managed by Fleet [running-on-aks-managed-by-fleet]
diff --git a/reference/fleet/running-on-eks-managed-by-fleet.md b/reference/fleet/running-on-eks-managed-by-fleet.md
index d03140fef..39ce8c520 100644
--- a/reference/fleet/running-on-eks-managed-by-fleet.md
+++ b/reference/fleet/running-on-eks-managed-by-fleet.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/running-on-eks-managed-by-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure Elastic Agent Add-On on Amazon EKS[configure-elastic-agent-on-eks]
@@ -37,7 +40,7 @@ You can create a managed node group with either of the following:
 
 ### Step 2: Select the Elastic Agent Add-On
 
-To see all available add-ons, check the [AWS Add-ons](https://docs.aws.amazon.com/eks/latest/userguide/workloads-add-ons-available-eks.html). You can also view the most current list of available add-ons using `eksctl`, the AWS Management Console, or the AWS CLI. 
+To see all available add-ons, check the [AWS Add-ons](https://docs.aws.amazon.com/eks/latest/userguide/workloads-add-ons-available-eks.html). You can also view the most current list of available add-ons using `eksctl`, the AWS Management Console, or the AWS CLI.
 
 ### Step 3: Configure Elastic Agent Add-On
 
@@ -58,8 +61,8 @@ Make sure  the configuration override is selected in case there are conflicts.
 
 Review the data and add the Elastic Agent EKS add-on to your cluster.
 
-Once created, you can see the Elastic Agent Add-on is **Active** on the AWS EKS console. 
-Elastic Agent runs as a daemonset, so it is present on each node. 
+Once created, you can see the Elastic Agent Add-on is **Active** on the AWS EKS console.
+Elastic Agent runs as a daemonset, so it is present on each node.
 
 ### Step 5: View your data in {{kib}} [_step_6_view_your_data_in_kib]
 
diff --git a/reference/fleet/running-on-gke-managed-by-fleet.md b/reference/fleet/running-on-gke-managed-by-fleet.md
index 090245965..482dfc88b 100644
--- a/reference/fleet/running-on-gke-managed-by-fleet.md
+++ b/reference/fleet/running-on-gke-managed-by-fleet.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/running-on-gke-managed-by-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent on GKE managed by Fleet [running-on-gke-managed-by-fleet]
diff --git a/reference/fleet/running-on-kubernetes-managed-by-fleet.md b/reference/fleet/running-on-kubernetes-managed-by-fleet.md
index d4bd3c56a..77a68ad32 100644
--- a/reference/fleet/running-on-kubernetes-managed-by-fleet.md
+++ b/reference/fleet/running-on-kubernetes-managed-by-fleet.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-managed-by-fleet.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent on Kubernetes managed by Fleet [running-on-kubernetes-managed-by-fleet]
diff --git a/reference/fleet/running-on-kubernetes-standalone.md b/reference/fleet/running-on-kubernetes-standalone.md
index 2653cc3d9..dd7abeade 100644
--- a/reference/fleet/running-on-kubernetes-standalone.md
+++ b/reference/fleet/running-on-kubernetes-standalone.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/running-on-kubernetes-standalone.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Run Elastic Agent Standalone on Kubernetes [running-on-kubernetes-standalone]
diff --git a/reference/fleet/scaling-on-kubernetes.md b/reference/fleet/scaling-on-kubernetes.md
index c864477c3..07a97fdcc 100644
--- a/reference/fleet/scaling-on-kubernetes.md
+++ b/reference/fleet/scaling-on-kubernetes.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/scaling-on-kubernetes.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Scaling Elastic Agent on Kubernetes [scaling-on-kubernetes]
diff --git a/reference/fleet/script-processor.md b/reference/fleet/script-processor.md
index 1642b9331..95ffd9e6e 100644
--- a/reference/fleet/script-processor.md
+++ b/reference/fleet/script-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "script"
+navigation_title: script
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/script-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Script Processor [script-processor]
diff --git a/reference/fleet/secret-files-guide.md b/reference/fleet/secret-files-guide.md
index 0826a0825..cdeec4a29 100644
--- a/reference/fleet/secret-files-guide.md
+++ b/reference/fleet/secret-files-guide.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/secret-files-guide.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Secret files guide [secret-files-guide]
diff --git a/reference/fleet/secure-connections.md b/reference/fleet/secure-connections.md
index 89df7bd34..016595749 100644
--- a/reference/fleet/secure-connections.md
+++ b/reference/fleet/secure-connections.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/secure-connections.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure SSL/TLS for self-managed Fleet Servers [secure-connections]
diff --git a/reference/fleet/secure-logstash-connections.md b/reference/fleet/secure-logstash-connections.md
index 25b7fcbf6..6facd386a 100644
--- a/reference/fleet/secure-logstash-connections.md
+++ b/reference/fleet/secure-logstash-connections.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/secure-logstash-connections.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Configure SSL/TLS for the Logstash output [secure-logstash-connections]
diff --git a/reference/fleet/secure.md b/reference/fleet/secure.md
index 7d9d9b9fc..18d3a2d03 100644
--- a/reference/fleet/secure.md
+++ b/reference/fleet/secure.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Secure connections"
+navigation_title: Secure connections
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/secure.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Secure {{agent}} connections [secure]
diff --git a/reference/fleet/set-inactivity-timeout.md b/reference/fleet/set-inactivity-timeout.md
index 3df3f31fa..822dbf3a6 100644
--- a/reference/fleet/set-inactivity-timeout.md
+++ b/reference/fleet/set-inactivity-timeout.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/set-inactivity-timeout.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Set inactivity timeout [set-inactivity-timeout]
diff --git a/reference/fleet/start-stop-elastic-agent.md b/reference/fleet/start-stop-elastic-agent.md
index f679856f4..1a8ae51c1 100644
--- a/reference/fleet/start-stop-elastic-agent.md
+++ b/reference/fleet/start-stop-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/start-stop-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Start and stop Elastic Agents on edge hosts [start-stop-elastic-agent]
diff --git a/reference/fleet/structure-config-file.md b/reference/fleet/structure-config-file.md
index 221b5f355..236b744f5 100644
--- a/reference/fleet/structure-config-file.md
+++ b/reference/fleet/structure-config-file.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/structure-config-file.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Structure of a config file [structure-config-file]
diff --git a/reference/fleet/syslog-processor.md b/reference/fleet/syslog-processor.md
index 3b2dfe348..c75a63189 100644
--- a/reference/fleet/syslog-processor.md
+++ b/reference/fleet/syslog-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "syslog"
+navigation_title: syslog
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/syslog-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Syslog [syslog-processor]
diff --git a/reference/fleet/timestamp-processor.md b/reference/fleet/timestamp-processor.md
index 35eab1bd7..5accfc2d5 100644
--- a/reference/fleet/timestamp-processor.md
+++ b/reference/fleet/timestamp-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "timestamp"
+navigation_title: timestamp
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/timestamp-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Timestamp [timestamp-processor]
diff --git a/reference/fleet/tls-overview.md b/reference/fleet/tls-overview.md
index b7230cb3f..82f0f6861 100644
--- a/reference/fleet/tls-overview.md
+++ b/reference/fleet/tls-overview.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/tls-overview.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # One-way and mutual TLS certifications flow [tls-overview]
diff --git a/reference/fleet/translate_sid-processor.md b/reference/fleet/translate_sid-processor.md
index c7a090729..197267dcb 100644
--- a/reference/fleet/translate_sid-processor.md
+++ b/reference/fleet/translate_sid-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "translate_sid"
+navigation_title: translate_sid
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/translate_sid-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Translate SID [translate_sid-processor]
diff --git a/reference/fleet/truncate_fields-processor.md b/reference/fleet/truncate_fields-processor.md
index ebc35031d..ab917ff99 100644
--- a/reference/fleet/truncate_fields-processor.md
+++ b/reference/fleet/truncate_fields-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "truncate_fields"
+navigation_title: truncate_fields
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/truncate_fields-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Truncate fields [truncate_fields-processor]
diff --git a/reference/fleet/unenroll-elastic-agent.md b/reference/fleet/unenroll-elastic-agent.md
index 2103cec1e..398fb5050 100644
--- a/reference/fleet/unenroll-elastic-agent.md
+++ b/reference/fleet/unenroll-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/unenroll-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Unenroll Elastic Agents [unenroll-elastic-agent]
diff --git a/reference/fleet/uninstall-elastic-agent.md b/reference/fleet/uninstall-elastic-agent.md
index a71cbf049..56b618a08 100644
--- a/reference/fleet/uninstall-elastic-agent.md
+++ b/reference/fleet/uninstall-elastic-agent.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/uninstall-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Uninstall Elastic Agents from edge hosts [uninstall-elastic-agent]
diff --git a/reference/fleet/upgrade-elastic-agent.md b/reference/fleet/upgrade-elastic-agent.md
index adc73eddf..19687985c 100644
--- a/reference/fleet/upgrade-elastic-agent.md
+++ b/reference/fleet/upgrade-elastic-agent.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Upgrade {{agent}}s"
+navigation_title: Upgrade {{agent}}s
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/upgrade-elastic-agent.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Upgrade {{fleet}}-managed {{agent}}s [upgrade-elastic-agent]
diff --git a/reference/fleet/upgrade-integration.md b/reference/fleet/upgrade-integration.md
index 856b7fac9..50f5513c2 100644
--- a/reference/fleet/upgrade-integration.md
+++ b/reference/fleet/upgrade-integration.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Upgrade an integration"
+navigation_title: Upgrade an integration
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/upgrade-integration.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Upgrade an {{agent}} integration [upgrade-integration]
diff --git a/reference/fleet/upgrade-standalone.md b/reference/fleet/upgrade-standalone.md
index 4cbc2dfa9..3e5c127ac 100644
--- a/reference/fleet/upgrade-standalone.md
+++ b/reference/fleet/upgrade-standalone.md
@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/upgrade-standalone.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Upgrade standalone Elastic Agents [upgrade-standalone]
diff --git a/reference/fleet/urldecode-processor.md b/reference/fleet/urldecode-processor.md
index 9f1e2a02f..697492678 100644
--- a/reference/fleet/urldecode-processor.md
+++ b/reference/fleet/urldecode-processor.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "urldecode"
+navigation_title: urldecode
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/urldecode-processor.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # URL Decode [urldecode-processor]
diff --git a/reference/fleet/view-integration-assets.md b/reference/fleet/view-integration-assets.md
index a0ef9315b..c4b66d11a 100644
--- a/reference/fleet/view-integration-assets.md
+++ b/reference/fleet/view-integration-assets.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "View integration assets"
+navigation_title: View integration assets
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/view-integration-assets.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # View {{agent}} integration assets [view-integration-assets]
diff --git a/reference/fleet/view-integration-policies.md b/reference/fleet/view-integration-policies.md
index 1266a9a0f..831882d33 100644
--- a/reference/fleet/view-integration-policies.md
+++ b/reference/fleet/view-integration-policies.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "View integration policies"
+navigation_title: View integration policies
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/view-integration-policies.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # View {{agent}} integration policies [view-integration-policies]
diff --git a/reference/glossary/index.md b/reference/glossary/index.md
index 000a86f58..68dc4b516 100644
--- a/reference/glossary/index.md
+++ b/reference/glossary/index.md
@@ -4,6 +4,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elastic-stack-glossary/current/terms.html
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-glossary.html
   - https://www.elastic.co/guide/en/ecs/current/ecs-glossary.html
+products:
+  - id: elastic-stack
+  - id: cloud-kubernetes
+  - id: ecs
 ---
 
 # Glossary [terms]
diff --git a/reference/index.md b/reference/index.md
index de7d7ac02..ccfa2d578 100644
--- a/reference/index.md
+++ b/reference/index.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/api-reference.html
+products:
+  - id: elastic-stack
 ---
 
 # Reference [api-reference]
@@ -56,7 +58,7 @@ Extend the functionality of your Elastic Stack with a variety of plugins. From a
 
 ## Query languages
 
-Master data querying with our comprehensive guides on QueryDSL, ES|QL, SQL, EQL, and Kibana Query Language. 
+Master data querying with our comprehensive guides on QueryDSL, ES|QL, SQL, EQL, and Kibana Query Language.
 
 **Learn more in [Query languages](elasticsearch://reference/query-languages/index.md)**
 
diff --git a/reference/observability/elastic-entity-model.md b/reference/observability/elastic-entity-model.md
index cb33c4a22..b49b58e0f 100644
--- a/reference/observability/elastic-entity-model.md
+++ b/reference/observability/elastic-entity-model.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/elastic-entity-model.html
   - https://www.elastic.co/guide/en/serverless/current/observability-elastic-entity-model.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Elastic Entity Model [elastic-entity-model]
diff --git a/reference/observability/fields-and-object-schemas.md b/reference/observability/fields-and-object-schemas.md
index 90dad53d0..693f2b7ea 100644
--- a/reference/observability/fields-and-object-schemas.md
+++ b/reference/observability/fields-and-object-schemas.md
@@ -1,11 +1,14 @@
 ---
-applies_to:
-  stack: all
-  serverless: all
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/fields-reference.html
   - https://www.elastic.co/guide/en/observability/current/metrics-app-fields.html
   - https://www.elastic.co/guide/en/serverless/current/observability-infrastructure-monitoring-required-fields.html
+applies_to:
+  stack: all
+  serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Fields and object schemas [fields-reference]
diff --git a/reference/observability/index.md b/reference/observability/index.md
index d8928b714..3f54ce3bd 100644
--- a/reference/observability/index.md
+++ b/reference/observability/index.md
@@ -1,10 +1,13 @@
 ---
-applies_to:
-  stack: all
-  serverless: all
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/reference.html
   - https://www.elastic.co/guide/en/observability/current/reference.html
+applies_to:
+  stack: all
+  serverless: all
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 # Observability
 
diff --git a/reference/security/endpoint-command-reference.md b/reference/security/endpoint-command-reference.md
index a3bf88867..83ad58513 100644
--- a/reference/security/endpoint-command-reference.md
+++ b/reference/security/endpoint-command-reference.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Endpoint command reference [endpoint-command-ref]
diff --git a/reference/security/fields-and-object-schemas/alert-schema.md b/reference/security/fields-and-object-schemas/alert-schema.md
index 60878795e..d6af1ecad 100644
--- a/reference/security/fields-and-object-schemas/alert-schema.md
+++ b/reference/security/fields-and-object-schemas/alert-schema.md
@@ -1,11 +1,14 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/security/current/alert-schema.html
+  - https://www.elastic.co/guide/en/serverless/current/security-alert-schema.html
 applies_to:
   stack: all
   serverless:
     security: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/security/current/alert-schema.html
-  - https://www.elastic.co/guide/en/serverless/current/security-alert-schema.html
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Alert schema [alert-schema]
diff --git a/reference/security/fields-and-object-schemas/index.md b/reference/security/fields-and-object-schemas/index.md
index cbd1215cb..29d0bef8b 100644
--- a/reference/security/fields-and-object-schemas/index.md
+++ b/reference/security/fields-and-object-schemas/index.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
 ---
 
 # Fields and object schemas [security-ref-intro]
diff --git a/reference/security/fields-and-object-schemas/siem-field-reference.md b/reference/security/fields-and-object-schemas/siem-field-reference.md
index acfc7e2d3..590ca4af1 100644
--- a/reference/security/fields-and-object-schemas/siem-field-reference.md
+++ b/reference/security/fields-and-object-schemas/siem-field-reference.md
@@ -1,11 +1,14 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/security/current/siem-field-reference.html
+  - https://www.elastic.co/guide/en/serverless/current/security-siem-field-reference.html
 applies_to:
   stack: all
   serverless:
     security: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/security/current/siem-field-reference.html
-  - https://www.elastic.co/guide/en/serverless/current/security-siem-field-reference.html
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Elastic Security ECS field reference [siem-field-reference]
diff --git a/reference/security/fields-and-object-schemas/timeline-object-schema.md b/reference/security/fields-and-object-schemas/timeline-object-schema.md
index 65efa7121..7a57abbe5 100644
--- a/reference/security/fields-and-object-schemas/timeline-object-schema.md
+++ b/reference/security/fields-and-object-schemas/timeline-object-schema.md
@@ -1,11 +1,14 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/security/current/timeline-object-schema.html
+  - https://www.elastic.co/guide/en/serverless/current/security-timeline-object-schema.html
 applies_to:
   stack: all
   serverless:
     security: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/security/current/timeline-object-schema.html
-  - https://www.elastic.co/guide/en/serverless/current/security-timeline-object-schema.html
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Timeline schema [timeline-object-schema]
diff --git a/release-notes/apm-agents/index.md b/release-notes/apm-agents/index.md
index 48edaf496..ce9df1edb 100644
--- a/release-notes/apm-agents/index.md
+++ b/release-notes/apm-agents/index.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Elastic APM agents"
+navigation_title: Elastic APM agents
 ---
 
 # Elastic APM agents release notes [elastic-apm--agents-release-notes]
diff --git a/release-notes/elastic-cloud-serverless/deprecations.md b/release-notes/elastic-cloud-serverless/deprecations.md
index b71adf069..e3316c621 100644
--- a/release-notes/elastic-cloud-serverless/deprecations.md
+++ b/release-notes/elastic-cloud-serverless/deprecations.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Deprecations"
+navigation_title: Deprecations
 ---
 
 # {{serverless-full}} deprecations [elastic-cloud-serverless-deprecations]
diff --git a/release-notes/elastic-cloud-serverless/index.md b/release-notes/elastic-cloud-serverless/index.md
index ad4da59f0..5fc89e5a7 100644
--- a/release-notes/elastic-cloud-serverless/index.md
+++ b/release-notes/elastic-cloud-serverless/index.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Elastic Cloud Serverless"
+navigation_title: Elastic Cloud Serverless
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/serverless-changelog.html
+products:
+  - id: cloud-serverless
 ---
 
 # {{serverless-full}} changelog [elastic-cloud-serverless-changelog]
@@ -28,7 +30,7 @@ For {{serverless-full}} API changes, refer to [APIs Changelog](https://www.elast
 ### Fixes [serverless-changelog-050525-fixes]
 
 * Fixes ignored dynamic templates [#219875](https://github.com/elastic/kibana/pull/219875)
-% Dashboards and visualizations 
+% Dashboards and visualizations
 * Syncs the Dashboard {{esql}} query and filters with the corresponding one in Visualizations [#218997](https://github.com/elastic/kibana/pull/218997)
 * Fixes the option list control, making two requests upon refreshing [#219625](https://github.com/elastic/kibana/pull/219625)
 * Ensures that an individual alert is sent per monitor configuration when the "Receive distinct alerts per location" toggle is unchecked in {{obs-serverless}} [#219291](https://github.com/elastic/kibana/pull/219291)
@@ -253,7 +255,7 @@ For {{serverless-full}} API changes, refer to [APIs Changelog](https://www.elast
 
 ## March 24, 2025 [serverless-changelog-03242025]
 
-### Features and enhancements [elastic-cloud-serverless-0324025-features-enhancements] 
+### Features and enhancements [elastic-cloud-serverless-0324025-features-enhancements]
 * Enables smoother scrolling in Kibana [#214512]({{kib-pull}}214512)
 * Adds `context.grouping` action variable in Custom threshold and APM rules [#212895]({{kib-pull}}212895)
 * Adds the ability to create an APM availability or latency SLO for all services [#214653]({{kib-pull}}214653)
@@ -297,7 +299,7 @@ For {{serverless-full}} API changes, refer to [APIs Changelog](https://www.elast
 
 ## March 17, 2025 [serverless-changelog-03172025]
 
-### Features and enhancements [elastic-cloud-serverless-0317025-features-enhancements] 
+### Features and enhancements [elastic-cloud-serverless-0317025-features-enhancements]
 
 * Enables read-only editor mode in Lens to explore panel configuration [#208554]({{kib-pull}}208554)
 * Allows you to share Observability AI Assistant conversations [#211854]({{kib-pull}}211854)
diff --git a/release-notes/elastic-cloud-serverless/known-issues.md b/release-notes/elastic-cloud-serverless/known-issues.md
index 02440990b..49a46c6d8 100644
--- a/release-notes/elastic-cloud-serverless/known-issues.md
+++ b/release-notes/elastic-cloud-serverless/known-issues.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Known issues"
+navigation_title: Known issues
 ---
 # {{serverless-full}} known issues [elastic-cloud-serverless-known-issues]
 Known issues are significant defects or limitations that may impact your implementation. These issues are actively being worked on and will be addressed in a future release. Review the {{serverless-full}} known issues to help you make informed decisions, such as upgrading to a new version.
diff --git a/release-notes/elastic-observability/breaking-changes.md b/release-notes/elastic-observability/breaking-changes.md
index 1021be62c..0164f0c36 100644
--- a/release-notes/elastic-observability/breaking-changes.md
+++ b/release-notes/elastic-observability/breaking-changes.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Breaking changes"
+navigation_title: Breaking changes
 ---
 
 # Elastic {{observability}} breaking changes [elastic-observability-breaking-changes]
diff --git a/release-notes/elastic-observability/deprecations.md b/release-notes/elastic-observability/deprecations.md
index ca87800f9..6b1ce1d24 100644
--- a/release-notes/elastic-observability/deprecations.md
+++ b/release-notes/elastic-observability/deprecations.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Deprecations"
+navigation_title: Deprecations
 ---
 
 # Elastic {{observability}} deprecations [elastic-observability-deprecations]
diff --git a/release-notes/elastic-observability/index.md b/release-notes/elastic-observability/index.md
index 84a0c987f..a107832b5 100644
--- a/release-notes/elastic-observability/index.md
+++ b/release-notes/elastic-observability/index.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Elastic Observability"
+navigation_title: Elastic Observability
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/whats-new.html
+products:
+  - id: observability
 ---
 
 # Elastic {{observability}} release notes [elastic-observability-release-notes]
diff --git a/release-notes/elastic-security/breaking-changes.md b/release-notes/elastic-security/breaking-changes.md
index e8544a2df..7b30f6c75 100644
--- a/release-notes/elastic-security/breaking-changes.md
+++ b/release-notes/elastic-security/breaking-changes.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Breaking changes"
+navigation_title: Breaking changes
 ---
 # {{elastic-sec}} breaking changes [elastic-security-breaking-changes]
 Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the {{elastic-sec}} breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [Upgrade](/deploy-manage/upgrade.md).
diff --git a/release-notes/elastic-security/deprecations.md b/release-notes/elastic-security/deprecations.md
index d69bc8b15..66fee3264 100644
--- a/release-notes/elastic-security/deprecations.md
+++ b/release-notes/elastic-security/deprecations.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Deprecations"
+navigation_title: Deprecations
 ---
 
 # {{elastic-sec}} deprecations [elastic-security-deprecations]
diff --git a/release-notes/elastic-security/index.md b/release-notes/elastic-security/index.md
index bcbcc9fa7..1c1904482 100644
--- a/release-notes/elastic-security/index.md
+++ b/release-notes/elastic-security/index.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Elastic Security"
+navigation_title: Elastic Security
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/release-notes.html
   - https://www.elastic.co/guide/en/security/current/whats-new.html
+products:
+  - id: security
 ---
-# {{elastic-sec}} release notes 
+# {{elastic-sec}} release notes
 
 Review the changes, fixes, and more in each version of {{elastic-sec}}.
 
diff --git a/release-notes/elastic-security/known-issues.md b/release-notes/elastic-security/known-issues.md
index b8e1466ba..111a173df 100644
--- a/release-notes/elastic-security/known-issues.md
+++ b/release-notes/elastic-security/known-issues.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Known issues"
+navigation_title: Known issues
 ---
 
 # {{elastic-sec}} known issues [elastic-security-known-issues]
diff --git a/release-notes/elasticsearch-clients/index.md b/release-notes/elasticsearch-clients/index.md
index 8e37ec030..f09a27400 100644
--- a/release-notes/elasticsearch-clients/index.md
+++ b/release-notes/elasticsearch-clients/index.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Elasticsearch Clients"
+navigation_title: Elasticsearch Clients
 ---
 
 # Elasticsearch Clients release notes [elasticsearch-clients-release-notes]
diff --git a/release-notes/fleet-elastic-agent/breaking-changes.md b/release-notes/fleet-elastic-agent/breaking-changes.md
index c3d7cc3e0..1c86dc8e5 100644
--- a/release-notes/fleet-elastic-agent/breaking-changes.md
+++ b/release-notes/fleet-elastic-agent/breaking-changes.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Breaking changes"
+navigation_title: Breaking changes
 ---
 
 # {{fleet}} and {{agent}} breaking changes [fleet-elastic-agent-breaking-changes]
diff --git a/release-notes/fleet-elastic-agent/deprecations.md b/release-notes/fleet-elastic-agent/deprecations.md
index 37b703ae4..9bac699df 100644
--- a/release-notes/fleet-elastic-agent/deprecations.md
+++ b/release-notes/fleet-elastic-agent/deprecations.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Deprecations"
+navigation_title: Deprecations
 ---
 
 # {{fleet}} and {{agent}} deprecations [fleet-elastic-agent-deprecations]
diff --git a/release-notes/fleet-elastic-agent/index.md b/release-notes/fleet-elastic-agent/index.md
index 7af89d1f3..6a489539d 100644
--- a/release-notes/fleet-elastic-agent/index.md
+++ b/release-notes/fleet-elastic-agent/index.md
@@ -1,7 +1,10 @@
 ---
-navigation_title: "Fleet and Elastic Agent"
+navigation_title: Fleet and Elastic Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/fleet/current/release-notes.html
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # {{fleet}} and {{agent}} release notes [fleet-elastic-agent-release-notes]
diff --git a/release-notes/fleet-elastic-agent/known-issues.md b/release-notes/fleet-elastic-agent/known-issues.md
index 81436775a..d3c979649 100644
--- a/release-notes/fleet-elastic-agent/known-issues.md
+++ b/release-notes/fleet-elastic-agent/known-issues.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Known issues"
+navigation_title: Known issues
 ---
 
 # {{fleet}} and {{agent}} known issues [fleet-elastic-agent-known-issues]
diff --git a/release-notes/intro/index.md b/release-notes/intro/index.md
index 959a1d44e..6e2c3e1f9 100644
--- a/release-notes/intro/index.md
+++ b/release-notes/intro/index.md
@@ -2,6 +2,8 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/new.html
   - https://www.elastic.co/guide/en/elastic-stack/current/elastic-stack-breaking-changes.html
+products:
+  - id: elastic-stack
 ---
 
 # Release notes [elastic-release-notes]
diff --git a/solutions/index.md b/solutions/index.md
index 132e2a55d..6460c93c3 100644
--- a/solutions/index.md
+++ b/solutions/index.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: cloud-hosted
 ---
 
 # Solutions and use cases
diff --git a/solutions/observability.md b/solutions/observability.md
index 575397fb1..caf49e41d 100644
--- a/solutions/observability.md
+++ b/solutions/observability.md
@@ -6,6 +6,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
+  - id: kibana
 ---
 
 # Observability
diff --git a/solutions/observability/apm/act-on-data.md b/solutions/observability/apm/act-on-data.md
index 3b4057551..925f1d6fa 100644
--- a/solutions/observability/apm/act-on-data.md
+++ b/solutions/observability/apm/act-on-data.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Act on data"
+navigation_title: Act on data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-act-on-data.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-act-on-data.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Act on application data
diff --git a/solutions/observability/apm/advanced-queries.md b/solutions/observability/apm/advanced-queries.md
index 8b56d067d..73661a405 100644
--- a/solutions/observability/apm/advanced-queries.md
+++ b/solutions/observability/apm/advanced-queries.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Advanced queries"
+navigation_title: Advanced queries
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-advanced-queries.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-query-your-data.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Use advanced queries on your application data [apm-advanced-queries]
diff --git a/solutions/observability/apm/anonymous-authentication.md b/solutions/observability/apm/anonymous-authentication.md
index 697ad0eed..927e459db 100644
--- a/solutions/observability/apm/anonymous-authentication.md
+++ b/solutions/observability/apm/anonymous-authentication.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-anonymous-auth.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Anonymous authentication [apm-anonymous-auth]
diff --git a/solutions/observability/apm/api-keys.md b/solutions/observability/apm/api-keys.md
index c68a82d8b..0b143d524 100644
--- a/solutions/observability/apm/api-keys.md
+++ b/solutions/observability/apm/api-keys.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-key.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # API keys [apm-api-key]
diff --git a/solutions/observability/apm/apis.md b/solutions/observability/apm/apis.md
index 9338302dc..9c0f1f77d 100644
--- a/solutions/observability/apm/apis.md
+++ b/solutions/observability/apm/apis.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM APIs [apm-apis]
diff --git a/solutions/observability/apm/apm-agent-authorization.md b/solutions/observability/apm/apm-agent-authorization.md
index e0ef819c3..6fcaba314 100644
--- a/solutions/observability/apm/apm-agent-authorization.md
+++ b/solutions/observability/apm/apm-agent-authorization.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-auth.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM agent authorization [apm-agent-auth]
diff --git a/solutions/observability/apm/apm-agent-central-configuration.md b/solutions/observability/apm/apm-agent-central-configuration.md
index 9a1da6595..6ad522f41 100644
--- a/solutions/observability/apm/apm-agent-central-configuration.md
+++ b/solutions/observability/apm/apm-agent-central-configuration.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Centrally configure APM agents in Kibana"
+navigation_title: Centrally configure APM agents in Kibana
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-configuration.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM agent central configuration [apm-agent-configuration]
diff --git a/solutions/observability/apm/apm-agent-compatibility.md b/solutions/observability/apm/apm-agent-compatibility.md
index d490c0174..a7fccbaf6 100644
--- a/solutions/observability/apm/apm-agent-compatibility.md
+++ b/solutions/observability/apm/apm-agent-compatibility.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-server-compatibility.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM agent compatibility [apm-agent-server-compatibility]
diff --git a/solutions/observability/apm/apm-agent-explorer.md b/solutions/observability/apm/apm-agent-explorer.md
index e1381a917..e042e6fb2 100644
--- a/solutions/observability/apm/apm-agent-explorer.md
+++ b/solutions/observability/apm/apm-agent-explorer.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-explorer.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Agent explorer [apm-agent-explorer]
diff --git a/solutions/observability/apm/apm-agent-tls-communication.md b/solutions/observability/apm/apm-agent-tls-communication.md
index 268412032..c7093ac45 100644
--- a/solutions/observability/apm/apm-agent-tls-communication.md
+++ b/solutions/observability/apm/apm-agent-tls-communication.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-tls.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM agent TLS communication [apm-agent-tls]
diff --git a/solutions/observability/apm/apm-k8s-attacher.md b/solutions/observability/apm/apm-k8s-attacher.md
index 1748ee581..24462d389 100644
--- a/solutions/observability/apm/apm-k8s-attacher.md
+++ b/solutions/observability/apm/apm-k8s-attacher.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Kubernetes"
+navigation_title: Kubernetes
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-k8s-attacher.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM K8S Attacher [apm-k8s-attacher]
diff --git a/solutions/observability/apm/apm-server-advanced-setup.md b/solutions/observability/apm/apm-server-advanced-setup.md
index f946d1e0b..4e78864cb 100644
--- a/solutions/observability/apm/apm-server-advanced-setup.md
+++ b/solutions/observability/apm/apm-server-advanced-setup.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Advanced setup"
+navigation_title: Advanced setup
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-setting-up-and-running.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server advanced setup [apm-setting-up-and-running]
diff --git a/solutions/observability/apm/apm-server-api.md b/solutions/observability/apm/apm-server-api.md
index bd8817a0e..41cff6a45 100644
--- a/solutions/observability/apm/apm-server-api.md
+++ b/solutions/observability/apm/apm-server-api.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server API [apm-api]
diff --git a/solutions/observability/apm/apm-server-command-reference.md b/solutions/observability/apm/apm-server-command-reference.md
index c0feb7eb0..d48b2d746 100644
--- a/solutions/observability/apm/apm-server-command-reference.md
+++ b/solutions/observability/apm/apm-server-command-reference.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Command reference"
+navigation_title: Command reference
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-command-line-options.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server command reference [apm-command-line-options]
diff --git a/solutions/observability/apm/apm-server-information-api.md b/solutions/observability/apm/apm-server-information-api.md
index 54c407666..08674bb13 100644
--- a/solutions/observability/apm/apm-server-information-api.md
+++ b/solutions/observability/apm/apm-server-information-api.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-info.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server information API [apm-api-info]
diff --git a/solutions/observability/apm/apm-server-systemd.md b/solutions/observability/apm/apm-server-systemd.md
index f880cc30a..f54c2e80a 100644
--- a/solutions/observability/apm/apm-server-systemd.md
+++ b/solutions/observability/apm/apm-server-systemd.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-running-with-systemd.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server and systemd [apm-running-with-systemd]
diff --git a/solutions/observability/apm/apm-ui-api.md b/solutions/observability/apm/apm-ui-api.md
index 1f4a88791..6f7df1c69 100644
--- a/solutions/observability/apm/apm-ui-api.md
+++ b/solutions/observability/apm/apm-ui-api.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM UI API [apm-app-api]
diff --git a/solutions/observability/apm/applications-ui-settings.md b/solutions/observability/apm/applications-ui-settings.md
index ed1dac412..d4a70c02e 100644
--- a/solutions/observability/apm/applications-ui-settings.md
+++ b/solutions/observability/apm/applications-ui-settings.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Settings"
+navigation_title: Settings
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-settings-in-kibana.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-kibana-settings.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Applications UI settings [observability-apm-kibana-settings]
diff --git a/solutions/observability/apm/attributes.md b/solutions/observability/apm/attributes.md
index 3282c8ea6..92672c53a 100644
--- a/solutions/observability/apm/attributes.md
+++ b/solutions/observability/apm/attributes.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Attributes and labels [apm-open-telemetry-resource-attributes]
diff --git a/solutions/observability/apm/built-in-data-filters.md b/solutions/observability/apm/built-in-data-filters.md
index 83fe99b85..8bdb7240b 100644
--- a/solutions/observability/apm/built-in-data-filters.md
+++ b/solutions/observability/apm/built-in-data-filters.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Built-in data filters [apm-filtering]
diff --git a/solutions/observability/apm/collect-application-data.md b/solutions/observability/apm/collect-application-data.md
index 92f933d51..0e771922a 100644
--- a/solutions/observability/apm/collect-application-data.md
+++ b/solutions/observability/apm/collect-application-data.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Collect application data [apm-collect-application-data]
diff --git a/solutions/observability/apm/collect-metrics.md b/solutions/observability/apm/collect-metrics.md
index f4d0b70a5..e624e5712 100644
--- a/solutions/observability/apm/collect-metrics.md
+++ b/solutions/observability/apm/collect-metrics.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Collect metrics [apm-open-telemetry-collect-metrics]
diff --git a/solutions/observability/apm/configure-anonymous-authentication.md b/solutions/observability/apm/configure-anonymous-authentication.md
index d9d0c1ab3..a013e46af 100644
--- a/solutions/observability/apm/configure-anonymous-authentication.md
+++ b/solutions/observability/apm/configure-anonymous-authentication.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Anonymous authentication"
+navigation_title: Anonymous authentication
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-anonymous.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure anonymous authentication [apm-configuration-anonymous]
diff --git a/solutions/observability/apm/configure-apm-agent-central-configuration.md b/solutions/observability/apm/configure-apm-agent-central-configuration.md
index 849564a98..df7a122d0 100644
--- a/solutions/observability/apm/configure-apm-agent-central-configuration.md
+++ b/solutions/observability/apm/configure-apm-agent-central-configuration.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "APM agent central configuration"
+navigation_title: APM agent central configuration
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configure-agent-config.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure APM agent central configuration [apm-configure-agent-config]
diff --git a/solutions/observability/apm/configure-apm-instrumentation.md b/solutions/observability/apm/configure-apm-instrumentation.md
index db30ab055..d7f8a7951 100644
--- a/solutions/observability/apm/configure-apm-instrumentation.md
+++ b/solutions/observability/apm/configure-apm-instrumentation.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Instrumentation"
+navigation_title: Instrumentation
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-instrumentation.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure APM instrumentation [apm-configuration-instrumentation]
diff --git a/solutions/observability/apm/configure-apm-server.md b/solutions/observability/apm/configure-apm-server.md
index 27c4e72e2..6e6eb24bc 100644
--- a/solutions/observability/apm/configure-apm-server.md
+++ b/solutions/observability/apm/configure-apm-server.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuring-howto-apm-server.html
 applies_to:
   stack:
+products:
+  - id: cloud-hosted
+  - id: observability
 ---
 
 # Configure APM Server [apm-configuring-howto-apm-server]
diff --git a/solutions/observability/apm/configure-console-output.md b/solutions/observability/apm/configure-console-output.md
index 03560ee23..3dd5dfd77 100644
--- a/solutions/observability/apm/configure-console-output.md
+++ b/solutions/observability/apm/configure-console-output.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Console"
+navigation_title: Console
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-console-output.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Console output [apm-console-output]
diff --git a/solutions/observability/apm/configure-elasticsearch-output.md b/solutions/observability/apm/configure-elasticsearch-output.md
index fb77616a4..d51e42b84 100644
--- a/solutions/observability/apm/configure-elasticsearch-output.md
+++ b/solutions/observability/apm/configure-elasticsearch-output.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-elasticsearch-output.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Elasticsearch output [apm-elasticsearch-output]
diff --git a/solutions/observability/apm/configure-kafka-output.md b/solutions/observability/apm/configure-kafka-output.md
index 95607b240..7c1e89546 100644
--- a/solutions/observability/apm/configure-kafka-output.md
+++ b/solutions/observability/apm/configure-kafka-output.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Kafka"
+navigation_title: Kafka
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-kafka-output.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Kafka output [apm-kafka-output]
diff --git a/solutions/observability/apm/configure-kibana-endpoint.md b/solutions/observability/apm/configure-kibana-endpoint.md
index f4ce128fd..cceaf0175 100644
--- a/solutions/observability/apm/configure-kibana-endpoint.md
+++ b/solutions/observability/apm/configure-kibana-endpoint.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-setup-kibana-endpoint.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Kibana endpoint [apm-setup-kibana-endpoint]
diff --git a/solutions/observability/apm/configure-logging.md b/solutions/observability/apm/configure-logging.md
index 4216bb694..3285f446f 100644
--- a/solutions/observability/apm/configure-logging.md
+++ b/solutions/observability/apm/configure-logging.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Logging"
+navigation_title: Logging
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-logging.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure logging [apm-configuration-logging]
diff --git a/solutions/observability/apm/configure-logstash-output.md b/solutions/observability/apm/configure-logstash-output.md
index bcc7644ea..61e33ad38 100644
--- a/solutions/observability/apm/configure-logstash-output.md
+++ b/solutions/observability/apm/configure-logstash-output.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-logstash-output.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Logstash output [apm-logstash-output]
diff --git a/solutions/observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md b/solutions/observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md
index 663b19c97..9e400ca14 100644
--- a/solutions/observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md
+++ b/solutions/observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configure-cloud-id.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the output for {{ech}} [apm-configure-cloud-id]
diff --git a/solutions/observability/apm/configure-output.md b/solutions/observability/apm/configure-output.md
index 5b62f5fbf..760b8a4a8 100644
--- a/solutions/observability/apm/configure-output.md
+++ b/solutions/observability/apm/configure-output.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Output"
+navigation_title: Output
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuring-output.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the output [apm-configuring-output]
diff --git a/solutions/observability/apm/configure-project-paths.md b/solutions/observability/apm/configure-project-paths.md
index cff88a2d1..5defadf93 100644
--- a/solutions/observability/apm/configure-project-paths.md
+++ b/solutions/observability/apm/configure-project-paths.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Project paths"
+navigation_title: Project paths
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-path.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure project paths [apm-configuration-path]
diff --git a/solutions/observability/apm/configure-real-user-monitoring-rum.md b/solutions/observability/apm/configure-real-user-monitoring-rum.md
index c32a122c4..5a029a324 100644
--- a/solutions/observability/apm/configure-real-user-monitoring-rum.md
+++ b/solutions/observability/apm/configure-real-user-monitoring-rum.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Real User Monitoring (RUM)"
+navigation_title: Real User Monitoring (RUM)
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-rum.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure Real User Monitoring (RUM) [apm-configuration-rum]
diff --git a/solutions/observability/apm/configure-redis-output.md b/solutions/observability/apm/configure-redis-output.md
index fd80e2f74..685f3c9c0 100644
--- a/solutions/observability/apm/configure-redis-output.md
+++ b/solutions/observability/apm/configure-redis-output.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Redis"
+navigation_title: Redis
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-redis-output.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Configure the Redis output [apm-redis-output]
diff --git a/solutions/observability/apm/control-access-to-apm-data.md b/solutions/observability/apm/control-access-to-apm-data.md
index 3a8965462..338ac0b09 100644
--- a/solutions/observability/apm/control-access-to-apm-data.md
+++ b/solutions/observability/apm/control-access-to-apm-data.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-spaces.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Control access to APM data [apm-spaces]
diff --git a/solutions/observability/apm/create-apm-rules-alerts.md b/solutions/observability/apm/create-apm-rules-alerts.md
index c399f7fb1..abe6ee642 100644
--- a/solutions/observability/apm/create-apm-rules-alerts.md
+++ b/solutions/observability/apm/create-apm-rules-alerts.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Create rules and alerts"
+navigation_title: Create rules and alerts
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-alerts.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-alerts.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Create APM rules and alerts [apm-alerts]
diff --git a/solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md b/solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
index df6b46c39..550f50196 100644
--- a/solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
+++ b/solutions/observability/apm/create-assign-feature-roles-to-apm-server-users.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Use feature roles"
+navigation_title: Use feature roles
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-feature-roles.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Create and assign feature roles to APM Server users [apm-feature-roles]
diff --git a/solutions/observability/apm/create-custom-links.md b/solutions/observability/apm/create-custom-links.md
index d9042663d..3da14a94d 100644
--- a/solutions/observability/apm/create-custom-links.md
+++ b/solutions/observability/apm/create-custom-links.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Create custom links"
+navigation_title: Create custom links
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-custom-links.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-create-custom-links.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Custom links in the Applications UI [apm-custom-links]
diff --git a/solutions/observability/apm/create-upload-source-maps-rum.md b/solutions/observability/apm/create-upload-source-maps-rum.md
index 0959dfbc0..96e738a8d 100644
--- a/solutions/observability/apm/create-upload-source-maps-rum.md
+++ b/solutions/observability/apm/create-upload-source-maps-rum.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-source-map-how-to.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Create and upload source maps (RUM) [apm-source-map-how-to]
diff --git a/solutions/observability/apm/cross-cluster-search.md b/solutions/observability/apm/cross-cluster-search.md
index aeb370e8a..c22fdc1e2 100644
--- a/solutions/observability/apm/cross-cluster-search.md
+++ b/solutions/observability/apm/cross-cluster-search.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Cross-cluster search"
+navigation_title: Cross-cluster search
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-cross-cluster-search.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Cross-cluster search with application data [apm-cross-cluster-search]
diff --git a/solutions/observability/apm/custom-filters.md b/solutions/observability/apm/custom-filters.md
index 13be849fd..85c507880 100644
--- a/solutions/observability/apm/custom-filters.md
+++ b/solutions/observability/apm/custom-filters.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Custom filters [apm-custom-filter]
diff --git a/solutions/observability/apm/data-streams.md b/solutions/observability/apm/data-streams.md
index f2c7c5f65..20f793d42 100644
--- a/solutions/observability/apm/data-streams.md
+++ b/solutions/observability/apm/data-streams.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-data-streams.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Data streams [apm-data-streams]
diff --git a/solutions/observability/apm/data-types.md b/solutions/observability/apm/data-types.md
index 089a16da5..3dd68af89 100644
--- a/solutions/observability/apm/data-types.md
+++ b/solutions/observability/apm/data-types.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Application data types [observability-apm-data-types]
diff --git a/solutions/observability/apm/delete-sensitive-data.md b/solutions/observability/apm/delete-sensitive-data.md
index 61c59927b..d7aaae721 100644
--- a/solutions/observability/apm/delete-sensitive-data.md
+++ b/solutions/observability/apm/delete-sensitive-data.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-data-security-delete.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Delete sensitive data [apm-data-security-delete]
diff --git a/solutions/observability/apm/dependencies.md b/solutions/observability/apm/dependencies.md
index 621f78fa4..f71d046fd 100644
--- a/solutions/observability/apm/dependencies.md
+++ b/solutions/observability/apm/dependencies.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Dependencies [apm-dependencies]
diff --git a/solutions/observability/apm/drill-down-into-data.md b/solutions/observability/apm/drill-down-into-data.md
index 50531d396..c35dbca3b 100644
--- a/solutions/observability/apm/drill-down-into-data.md
+++ b/solutions/observability/apm/drill-down-into-data.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Drill down into data"
+navigation_title: Drill down into data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-ui-drill-down.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-ui-drill-down.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Drill down into application data [apm-ui-drill-down]
diff --git a/solutions/observability/apm/elastic-apm-agent-configuration-api.md b/solutions/observability/apm/elastic-apm-agent-configuration-api.md
index 14e95b53d..954b00ae3 100644
--- a/solutions/observability/apm/elastic-apm-agent-configuration-api.md
+++ b/solutions/observability/apm/elastic-apm-agent-configuration-api.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-config.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Elastic APM agent configuration API [apm-api-config]
diff --git a/solutions/observability/apm/elastic-apm-agents.md b/solutions/observability/apm/elastic-apm-agents.md
index 572fe38ff..46a1dfdb2 100644
--- a/solutions/observability/apm/elastic-apm-agents.md
+++ b/solutions/observability/apm/elastic-apm-agents.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "APM agents"
+navigation_title: APM agents
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agents.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-agents-elastic-apm-agents.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Elastic APM agents [observability-apm-agents-elastic-apm-agents]
diff --git a/solutions/observability/apm/elastic-apm-events-intake-api.md b/solutions/observability/apm/elastic-apm-events-intake-api.md
index 052e0e703..3a0f69864 100644
--- a/solutions/observability/apm/elastic-apm-events-intake-api.md
+++ b/solutions/observability/apm/elastic-apm-events-intake-api.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-events.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Elastic APM events intake API [apm-api-events]
diff --git a/solutions/observability/apm/errors-ui.md b/solutions/observability/apm/errors-ui.md
index 50f4c83ac..9a59f1697 100644
--- a/solutions/observability/apm/errors-ui.md
+++ b/solutions/observability/apm/errors-ui.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Errors [apm-errors]
diff --git a/solutions/observability/apm/errors.md b/solutions/observability/apm/errors.md
index df3f2d94c..a7a116dc1 100644
--- a/solutions/observability/apm/errors.md
+++ b/solutions/observability/apm/errors.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Errors [apm-data-model-errors]
diff --git a/solutions/observability/apm/explore-data-in-elasticsearch.md b/solutions/observability/apm/explore-data-in-elasticsearch.md
index a146d3b05..dacb889fc 100644
--- a/solutions/observability/apm/explore-data-in-elasticsearch.md
+++ b/solutions/observability/apm/explore-data-in-elasticsearch.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-exploring-es-data.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Explore data in Elasticsearch [apm-exploring-es-data]
diff --git a/solutions/observability/apm/explore-mobile-sessions.md b/solutions/observability/apm/explore-mobile-sessions.md
index b92b9dba1..1b6d0ff02 100644
--- a/solutions/observability/apm/explore-mobile-sessions.md
+++ b/solutions/observability/apm/explore-mobile-sessions.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-mobile-session-explorer.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Explore mobile sessions with Discover [apm-mobile-session-explorer]
diff --git a/solutions/observability/apm/filter-data.md b/solutions/observability/apm/filter-data.md
index 8471fb9e1..c3a9098db 100644
--- a/solutions/observability/apm/filter-data.md
+++ b/solutions/observability/apm/filter-data.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Filters"
+navigation_title: Filters
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-filters.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-filter-your-data.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Filter application data [apm-filter-your-data]
diff --git a/solutions/observability/apm/filter-search-data.md b/solutions/observability/apm/filter-search-data.md
index cbaf71d5e..160ca96a5 100644
--- a/solutions/observability/apm/filter-search-data.md
+++ b/solutions/observability/apm/filter-search-data.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Filter and search data"
+navigation_title: Filter and search data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-filter-and-search-data.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-filter-and-search-data.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Filter and search application data [apm-filter-and-search-data]
diff --git a/solutions/observability/apm/find-transaction-latency-failure-correlations.md b/solutions/observability/apm/find-transaction-latency-failure-correlations.md
index 81df502c3..257f16004 100644
--- a/solutions/observability/apm/find-transaction-latency-failure-correlations.md
+++ b/solutions/observability/apm/find-transaction-latency-failure-correlations.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Find transaction latency and failure correlations [observability-apm-find-transaction-latency-and-failure-correlations]
diff --git a/solutions/observability/apm/general-configuration-options.md b/solutions/observability/apm/general-configuration-options.md
index d4f1b405a..c1e16682e 100644
--- a/solutions/observability/apm/general-configuration-options.md
+++ b/solutions/observability/apm/general-configuration-options.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-process.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # General configuration options [apm-configuration-process]
diff --git a/solutions/observability/apm/get-started-apm-server-binary.md b/solutions/observability/apm/get-started-apm-server-binary.md
index f1b69370b..7244c7eeb 100644
--- a/solutions/observability/apm/get-started-apm-server-binary.md
+++ b/solutions/observability/apm/get-started-apm-server-binary.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/get-started-with-apm-server-binary.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM Server binary [get-started-with-apm-server-binary]
diff --git a/solutions/observability/apm/get-started-fleet-managed-apm-server.md b/solutions/observability/apm/get-started-fleet-managed-apm-server.md
index 56f734853..240bd5273 100644
--- a/solutions/observability/apm/get-started-fleet-managed-apm-server.md
+++ b/solutions/observability/apm/get-started-fleet-managed-apm-server.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/get-started-with-fleet-apm-server.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Fleet-managed APM Server [get-started-with-fleet-apm-server]
diff --git a/solutions/observability/apm/get-started-serverless.md b/solutions/observability/apm/get-started-serverless.md
index fc0d93815..c6a68697e 100644
--- a/solutions/observability/apm/get-started-serverless.md
+++ b/solutions/observability/apm/get-started-serverless.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Elastic Cloud Serverless"
+navigation_title: Elastic Cloud Serverless
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-get-started.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Get started with traces and APM [observability-apm-get-started]
diff --git a/solutions/observability/apm/get-started.md b/solutions/observability/apm/get-started.md
index bc332d399..5a9ec61e2 100644
--- a/solutions/observability/apm/get-started.md
+++ b/solutions/observability/apm/get-started.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Get started"
+navigation_title: Get started
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-getting-started-apm-server.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-get-started.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Get started with APM [apm-getting-started-apm-server]
diff --git a/solutions/observability/apm/grant-access-using-api-keys.md b/solutions/observability/apm/grant-access-using-api-keys.md
index 72699b5a3..b0a39ca78 100644
--- a/solutions/observability/apm/grant-access-using-api-keys.md
+++ b/solutions/observability/apm/grant-access-using-api-keys.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-beats-api-keys.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Grant access using API keys [apm-beats-api-keys]
diff --git a/solutions/observability/apm/high-availability.md b/solutions/observability/apm/high-availability.md
index dfbc0b755..699c6402a 100644
--- a/solutions/observability/apm/high-availability.md
+++ b/solutions/observability/apm/high-availability.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-high-availability.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # High Availability [apm-high-availability]
diff --git a/solutions/observability/apm/index-lifecycle-management.md b/solutions/observability/apm/index-lifecycle-management.md
index 178699ca6..57c0e4085 100644
--- a/solutions/observability/apm/index-lifecycle-management.md
+++ b/solutions/observability/apm/index-lifecycle-management.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-ilm-how-to.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Index lifecycle management [apm-ilm-how-to]
diff --git a/solutions/observability/apm/index.md b/solutions/observability/apm/index.md
index 562564003..449739ece 100644
--- a/solutions/observability/apm/index.md
+++ b/solutions/observability/apm/index.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Application performance monitoring (APM) [apm]
diff --git a/solutions/observability/apm/infrastructure.md b/solutions/observability/apm/infrastructure.md
index aae25b58f..ada7b9cbd 100644
--- a/solutions/observability/apm/infrastructure.md
+++ b/solutions/observability/apm/infrastructure.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Infrastructure [observability-apm-infrastructure]
diff --git a/solutions/observability/apm/installation-layout.md b/solutions/observability/apm/installation-layout.md
index baafde5d3..abcdd4423 100644
--- a/solutions/observability/apm/installation-layout.md
+++ b/solutions/observability/apm/installation-layout.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-directory-layout.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Installation layout [apm-directory-layout]
diff --git a/solutions/observability/apm/interpret-data.md b/solutions/observability/apm/interpret-data.md
index 8a6874f00..ac6956f6e 100644
--- a/solutions/observability/apm/interpret-data.md
+++ b/solutions/observability/apm/interpret-data.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Interpret data"
+navigation_title: Interpret data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-interpret-data.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-interpret-data.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Interpret application data [observability-apm-interpret-data]
diff --git a/solutions/observability/apm/inventory.md b/solutions/observability/apm/inventory.md
index f141910be..3138e56c7 100644
--- a/solutions/observability/apm/inventory.md
+++ b/solutions/observability/apm/inventory.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Inventory"
+navigation_title: Inventory
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/inventory.html
   - https://www.elastic.co/guide/en/serverless/current/observability-inventory.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Inventory [inventory]
diff --git a/solutions/observability/apm/jaeger-event-intake.md b/solutions/observability/apm/jaeger-event-intake.md
index a34d3df3e..4ea08ad0f 100644
--- a/solutions/observability/apm/jaeger-event-intake.md
+++ b/solutions/observability/apm/jaeger-event-intake.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-jaeger.html
 applies_to:
   stack: deprecated
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Jaeger event intake [apm-api-jaeger]
diff --git a/solutions/observability/apm/jaeger.md b/solutions/observability/apm/jaeger.md
index 62b460180..a27216c25 100644
--- a/solutions/observability/apm/jaeger.md
+++ b/solutions/observability/apm/jaeger.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Jaeger (deprecated)"
+navigation_title: Jaeger (deprecated)
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-jaeger-integration.html
 applies_to:
   stack: deprecated
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Integrate with Jaeger (deprecated) [apm-jaeger-integration]
diff --git a/solutions/observability/apm/limitations.md b/solutions/observability/apm/limitations.md
index 2de20e626..948aaa22b 100644
--- a/solutions/observability/apm/limitations.md
+++ b/solutions/observability/apm/limitations.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Limitations [apm-open-telemetry-known-limitations]
diff --git a/solutions/observability/apm/logs.md b/solutions/observability/apm/logs.md
index 8eb213a59..167c15758 100644
--- a/solutions/observability/apm/logs.md
+++ b/solutions/observability/apm/logs.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Logs [apm-logs]
diff --git a/solutions/observability/apm/machine-learning.md b/solutions/observability/apm/machine-learning.md
index c6e1a45e8..6fe900c12 100644
--- a/solutions/observability/apm/machine-learning.md
+++ b/solutions/observability/apm/machine-learning.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Integrate with machine learning [observability-apm-integrate-with-machine-learning]
diff --git a/solutions/observability/apm/manage-storage.md b/solutions/observability/apm/manage-storage.md
index 6d1069f68..45086f706 100644
--- a/solutions/observability/apm/manage-storage.md
+++ b/solutions/observability/apm/manage-storage.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-manage-storage.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Manage storage [apm-manage-storage]
diff --git a/solutions/observability/apm/managed-intake-service-event-api.md b/solutions/observability/apm/managed-intake-service-event-api.md
index 0ed6e85d5..942cab4b7 100644
--- a/solutions/observability/apm/managed-intake-service-event-api.md
+++ b/solutions/observability/apm/managed-intake-service-event-api.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-server-api.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Managed intake service event API [observability-apm-server-api]
diff --git a/solutions/observability/apm/metadata.md b/solutions/observability/apm/metadata.md
index 914a74c13..ee1e94d9b 100644
--- a/solutions/observability/apm/metadata.md
+++ b/solutions/observability/apm/metadata.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Metadata [apm-data-model-metadata]
diff --git a/solutions/observability/apm/metrics-ui.md b/solutions/observability/apm/metrics-ui.md
index 067f6dbc6..dfb038831 100644
--- a/solutions/observability/apm/metrics-ui.md
+++ b/solutions/observability/apm/metrics-ui.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Metrics [apm-metrics]
diff --git a/solutions/observability/apm/metrics.md b/solutions/observability/apm/metrics.md
index 61c664802..1b645c6e3 100644
--- a/solutions/observability/apm/metrics.md
+++ b/solutions/observability/apm/metrics.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Metrics [apm-data-model-metrics]
diff --git a/solutions/observability/apm/mobile-service-overview.md b/solutions/observability/apm/mobile-service-overview.md
index be51489fd..f1c96013c 100644
--- a/solutions/observability/apm/mobile-service-overview.md
+++ b/solutions/observability/apm/mobile-service-overview.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-mobile-service-overview.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Mobile service overview [apm-mobile-service-overview]
diff --git a/solutions/observability/apm/monitor-apm-server-binary.md b/solutions/observability/apm/monitor-apm-server-binary.md
index 89b7e0ff2..568e2b4f5 100644
--- a/solutions/observability/apm/monitor-apm-server-binary.md
+++ b/solutions/observability/apm/monitor-apm-server-binary.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "APM Server binary"
+navigation_title: APM Server binary
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitoring.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Monitor the APM Server binary [apm-monitoring]
diff --git a/solutions/observability/apm/monitor-apm-server.md b/solutions/observability/apm/monitor-apm-server.md
index f1fdd1f8a..64f9cc5ec 100644
--- a/solutions/observability/apm/monitor-apm-server.md
+++ b/solutions/observability/apm/monitor-apm-server.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitor-apm.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Monitor APM Server [apm-monitor-apm]
diff --git a/solutions/observability/apm/monitor-aws-lambda-functions.md b/solutions/observability/apm/monitor-aws-lambda-functions.md
index 8fa5e6c62..6bd7eaf2f 100644
--- a/solutions/observability/apm/monitor-aws-lambda-functions.md
+++ b/solutions/observability/apm/monitor-aws-lambda-functions.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "AWS Lambda Functions"
+navigation_title: AWS Lambda Functions
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitoring-aws-lambda.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-agents-aws-lambda-functions.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Monitoring AWS Lambda Functions [apm-monitoring-aws-lambda]
diff --git a/solutions/observability/apm/monitor-fleet-managed-apm-server.md b/solutions/observability/apm/monitor-fleet-managed-apm-server.md
index 6471de7a6..b5676bf7f 100644
--- a/solutions/observability/apm/monitor-fleet-managed-apm-server.md
+++ b/solutions/observability/apm/monitor-fleet-managed-apm-server.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Fleet-managed"
+navigation_title: Fleet-managed
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitor-apm-self-install.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Monitor a Fleet-managed APM Server [apm-monitor-apm-self-install]
diff --git a/solutions/observability/apm/observe-lambda-functions.md b/solutions/observability/apm/observe-lambda-functions.md
index 76f8623c8..abaf01bd3 100644
--- a/solutions/observability/apm/observe-lambda-functions.md
+++ b/solutions/observability/apm/observe-lambda-functions.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Observe Lambda functions [apm-lambda]
diff --git a/solutions/observability/apm/opentelemetry-intake-api.md b/solutions/observability/apm/opentelemetry-intake-api.md
index 0066a923c..6611e41c0 100644
--- a/solutions/observability/apm/opentelemetry-intake-api.md
+++ b/solutions/observability/apm/opentelemetry-intake-api.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-api-otlp.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # OpenTelemetry intake API [apm-api-otlp]
diff --git a/solutions/observability/apm/overviews.md b/solutions/observability/apm/overviews.md
index 34f6fa47c..6731202f8 100644
--- a/solutions/observability/apm/overviews.md
+++ b/solutions/observability/apm/overviews.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Overviews"
+navigation_title: Overviews
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-ui.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-ui-overview.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # High-level overviews of application data [apm-ui]
diff --git a/solutions/observability/apm/parse-data-using-ingest-pipelines.md b/solutions/observability/apm/parse-data-using-ingest-pipelines.md
index a9ba9a002..ddcf4bf84 100644
--- a/solutions/observability/apm/parse-data-using-ingest-pipelines.md
+++ b/solutions/observability/apm/parse-data-using-ingest-pipelines.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-ingest-pipelines.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Parse data using ingest pipelines [apm-ingest-pipelines]
diff --git a/solutions/observability/apm/real-user-monitoring-rum.md b/solutions/observability/apm/real-user-monitoring-rum.md
index 61128d41b..df4f9d77d 100644
--- a/solutions/observability/apm/real-user-monitoring-rum.md
+++ b/solutions/observability/apm/real-user-monitoring-rum.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-rum.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Real User Monitoring (RUM) [apm-rum]
diff --git a/solutions/observability/apm/reduce-storage.md b/solutions/observability/apm/reduce-storage.md
index c6c055337..22dc84b70 100644
--- a/solutions/observability/apm/reduce-storage.md
+++ b/solutions/observability/apm/reduce-storage.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Reduce storage [apm-reduce-apm-storage]
diff --git a/solutions/observability/apm/secret-token.md b/solutions/observability/apm/secret-token.md
index daa4f9e12..3c77c9d87 100644
--- a/solutions/observability/apm/secret-token.md
+++ b/solutions/observability/apm/secret-token.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-secret-token.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Secret token [apm-secret-token]
diff --git a/solutions/observability/apm/secrets-keystore-for-secure-settings.md b/solutions/observability/apm/secrets-keystore-for-secure-settings.md
index 8c05dfe62..ab1464f25 100644
--- a/solutions/observability/apm/secrets-keystore-for-secure-settings.md
+++ b/solutions/observability/apm/secrets-keystore-for-secure-settings.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Secrets keystore"
+navigation_title: Secrets keystore
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-keystore.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Secrets keystore for secure settings [apm-keystore]
diff --git a/solutions/observability/apm/secure-access-to-applications-ui.md b/solutions/observability/apm/secure-access-to-applications-ui.md
index fac801715..daa20822e 100644
--- a/solutions/observability/apm/secure-access-to-applications-ui.md
+++ b/solutions/observability/apm/secure-access-to-applications-ui.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Secure access to the Applications UI"
+navigation_title: Secure access to the Applications UI
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-users.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Secure access to the Applications UI [apm-app-users]
diff --git a/solutions/observability/apm/secure-communication-with-apm-agents.md b/solutions/observability/apm/secure-communication-with-apm-agents.md
index 09f9db847..4b7ebe28e 100644
--- a/solutions/observability/apm/secure-communication-with-apm-agents.md
+++ b/solutions/observability/apm/secure-communication-with-apm-agents.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Secure communication with APM agents [apm-secure-agent-communication]
diff --git a/solutions/observability/apm/secure-communication-with-elastic-stack.md b/solutions/observability/apm/secure-communication-with-elastic-stack.md
index d0e5d8995..16afeb70a 100644
--- a/solutions/observability/apm/secure-communication-with-elastic-stack.md
+++ b/solutions/observability/apm/secure-communication-with-elastic-stack.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-secure-comms-stack.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Secure communication with the Elastic Stack [apm-secure-comms-stack]
diff --git a/solutions/observability/apm/secure-data.md b/solutions/observability/apm/secure-data.md
index 8df3077d2..50ba0bfec 100644
--- a/solutions/observability/apm/secure-data.md
+++ b/solutions/observability/apm/secure-data.md
@@ -1,10 +1,13 @@
 ---
-navigation_title: "Secure data"
+navigation_title: Secure data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-data-security.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Application data security [apm-data-security]
diff --git a/solutions/observability/apm/service-map.md b/solutions/observability/apm/service-map.md
index 4905b851f..1fd3a7302 100644
--- a/solutions/observability/apm/service-map.md
+++ b/solutions/observability/apm/service-map.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Service Map [apm-service-maps]
diff --git a/solutions/observability/apm/service-overview.md b/solutions/observability/apm/service-overview.md
index 85958f43e..e740ae8ff 100644
--- a/solutions/observability/apm/service-overview.md
+++ b/solutions/observability/apm/service-overview.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Service overview [apm-service-overview]
diff --git a/solutions/observability/apm/services.md b/solutions/observability/apm/services.md
index 325d22545..2b200d861 100644
--- a/solutions/observability/apm/services.md
+++ b/solutions/observability/apm/services.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Services [apm-services]
diff --git a/solutions/observability/apm/spans.md b/solutions/observability/apm/spans.md
index 1f26a7aff..57cecdd30 100644
--- a/solutions/observability/apm/spans.md
+++ b/solutions/observability/apm/spans.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Spans [apm-data-model-spans]
diff --git a/solutions/observability/apm/ssl-tls-input-settings.md b/solutions/observability/apm/ssl-tls-input-settings.md
index b679c2764..8e83c0ecf 100644
--- a/solutions/observability/apm/ssl-tls-input-settings.md
+++ b/solutions/observability/apm/ssl-tls-input-settings.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-agent-server-ssl.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # SSL/TLS input settings [apm-agent-server-ssl]
diff --git a/solutions/observability/apm/ssl-tls-output-settings.md b/solutions/observability/apm/ssl-tls-output-settings.md
index eb0888089..5c727c1cd 100644
--- a/solutions/observability/apm/ssl-tls-output-settings.md
+++ b/solutions/observability/apm/ssl-tls-output-settings.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-ssl.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # SSL/TLS output settings [apm-configuration-ssl]
diff --git a/solutions/observability/apm/ssl-tls-settings.md b/solutions/observability/apm/ssl-tls-settings.md
index cd281972a..782cefe74 100644
--- a/solutions/observability/apm/ssl-tls-settings.md
+++ b/solutions/observability/apm/ssl-tls-settings.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-configuration-ssl-landing.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # SSL/TLS settings [apm-configuration-ssl-landing]
diff --git a/solutions/observability/apm/storage-explorer.md b/solutions/observability/apm/storage-explorer.md
index 9aea003de..f653024e5 100644
--- a/solutions/observability/apm/storage-explorer.md
+++ b/solutions/observability/apm/storage-explorer.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-storage-explorer.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Storage Explorer [apm-storage-explorer]
diff --git a/solutions/observability/apm/storage-sizing-guide.md b/solutions/observability/apm/storage-sizing-guide.md
index 8c76da75b..e0a367ec7 100644
--- a/solutions/observability/apm/storage-sizing-guide.md
+++ b/solutions/observability/apm/storage-sizing-guide.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-storage-guide.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Storage and sizing guide [apm-storage-guide]
diff --git a/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md b/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
index 6917e6eb3..83a9851ae 100644
--- a/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
+++ b/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Switch an {{ecloud}} cluster"
+navigation_title: Switch an {{ecloud}} cluster
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-integration-upgrade-steps-ess.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Switch an Elastic Cloud cluster to the APM integration [apm-integration-upgrade-steps-ess]
diff --git a/solutions/observability/apm/switch-self-installation-to-apm-integration.md b/solutions/observability/apm/switch-self-installation-to-apm-integration.md
index 7a1d999ed..407af2a04 100644
--- a/solutions/observability/apm/switch-self-installation-to-apm-integration.md
+++ b/solutions/observability/apm/switch-self-installation-to-apm-integration.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Switch a self-installation"
+navigation_title: Switch a self-installation
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-integration-upgrade-steps.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Switch a self-installation to the APM integration [apm-integration-upgrade-steps]
diff --git a/solutions/observability/apm/switch-to-elastic-apm-integration.md b/solutions/observability/apm/switch-to-elastic-apm-integration.md
index 8d3a9cf7c..7dc3655c5 100644
--- a/solutions/observability/apm/switch-to-elastic-apm-integration.md
+++ b/solutions/observability/apm/switch-to-elastic-apm-integration.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade-to-apm-integration.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Switch to the Elastic APM integration [apm-upgrade-to-apm-integration]
diff --git a/solutions/observability/apm/tail-based-sampling.md b/solutions/observability/apm/tail-based-sampling.md
index 11b79da93..7a27c3697 100644
--- a/solutions/observability/apm/tail-based-sampling.md
+++ b/solutions/observability/apm/tail-based-sampling.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-tail-based-samling-config.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Tail-based sampling [apm-tail-based-sampling-config]
diff --git a/solutions/observability/apm/trace-sample-timeline.md b/solutions/observability/apm/trace-sample-timeline.md
index 2e761247b..d0b608867 100644
--- a/solutions/observability/apm/trace-sample-timeline.md
+++ b/solutions/observability/apm/trace-sample-timeline.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Trace sample timeline [apm-spans]
diff --git a/solutions/observability/apm/traces-ui.md b/solutions/observability/apm/traces-ui.md
index a407d925e..315858074 100644
--- a/solutions/observability/apm/traces-ui.md
+++ b/solutions/observability/apm/traces-ui.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Traces [apm-traces]
diff --git a/solutions/observability/apm/traces.md b/solutions/observability/apm/traces.md
index 516c7ac0f..49b4f7f27 100644
--- a/solutions/observability/apm/traces.md
+++ b/solutions/observability/apm/traces.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Traces [apm-data-model-traces]
diff --git a/solutions/observability/apm/track-deployments-with-annotations.md b/solutions/observability/apm/track-deployments-with-annotations.md
index 66b0912cd..0431061a4 100644
--- a/solutions/observability/apm/track-deployments-with-annotations.md
+++ b/solutions/observability/apm/track-deployments-with-annotations.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Track deployments with annotations"
+navigation_title: Track deployments with annotations
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-transactions-annotations.html
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-track-deployments-with-annotations.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Track deployments with annotations [apm-transactions-annotations]
diff --git a/solutions/observability/apm/transaction-sampling.md b/solutions/observability/apm/transaction-sampling.md
index f4efc7111..9b2cd2705 100644
--- a/solutions/observability/apm/transaction-sampling.md
+++ b/solutions/observability/apm/transaction-sampling.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Transaction sampling [apm-sampling]
diff --git a/solutions/observability/apm/transactions-ui.md b/solutions/observability/apm/transactions-ui.md
index d5193e57d..292194b06 100644
--- a/solutions/observability/apm/transactions-ui.md
+++ b/solutions/observability/apm/transactions-ui.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Transactions [apm-transactions]
diff --git a/solutions/observability/apm/transactions.md b/solutions/observability/apm/transactions.md
index e2589ddc0..a26d3fed0 100644
--- a/solutions/observability/apm/transactions.md
+++ b/solutions/observability/apm/transactions.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Transactions [apm-data-model-transactions]
diff --git a/solutions/observability/apm/tune-data-ingestion.md b/solutions/observability/apm/tune-data-ingestion.md
index 7ddd8184c..1928767b6 100644
--- a/solutions/observability/apm/tune-data-ingestion.md
+++ b/solutions/observability/apm/tune-data-ingestion.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-tune-data-ingestion.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Tune data ingestion [apm-tune-data-ingestion]
diff --git a/solutions/observability/apm/ui-user-annotation.md b/solutions/observability/apm/ui-user-annotation.md
index c83b5150c..c851f27cd 100644
--- a/solutions/observability/apm/ui-user-annotation.md
+++ b/solutions/observability/apm/ui-user-annotation.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Create an annotation user"
+navigation_title: Create an annotation user
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-annotation-user-create.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Applications UI annotation user [apm-app-annotation-user-create]
diff --git a/solutions/observability/apm/ui-user-api.md b/solutions/observability/apm/ui-user-api.md
index 37e20585e..0c539740a 100644
--- a/solutions/observability/apm/ui-user-api.md
+++ b/solutions/observability/apm/ui-user-api.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Create an API user"
+navigation_title: Create an API user
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-api-user.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Applications UI API user [apm-app-api-user]
diff --git a/solutions/observability/apm/ui-user-central-config.md b/solutions/observability/apm/ui-user-central-config.md
index 40228c809..ff8844d48 100644
--- a/solutions/observability/apm/ui-user-central-config.md
+++ b/solutions/observability/apm/ui-user-central-config.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Create a central config user"
+navigation_title: Create a central config user
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-central-config-user.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Applications UI central config user [apm-app-central-config-user]
diff --git a/solutions/observability/apm/ui-user-reader.md b/solutions/observability/apm/ui-user-reader.md
index d8c93ccee..de9d4066a 100644
--- a/solutions/observability/apm/ui-user-reader.md
+++ b/solutions/observability/apm/ui-user-reader.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Create an APM reader user"
+navigation_title: Create an APM reader user
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-reader.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # APM reader user [apm-app-reader]
diff --git a/solutions/observability/apm/ui-user-storage-explorer.md b/solutions/observability/apm/ui-user-storage-explorer.md
index 889938e8b..e79fd6135 100644
--- a/solutions/observability/apm/ui-user-storage-explorer.md
+++ b/solutions/observability/apm/ui-user-storage-explorer.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Create a storage explorer user"
+navigation_title: Create a storage explorer user
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-app-storage-explorer-user-create.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Applications UI storage explorer user [apm-app-storage-explorer-user-create]
diff --git a/solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md b/solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
index 07451e4cd..a9da6928a 100644
--- a/solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
+++ b/solutions/observability/apm/upgrade-elastic-cloud-apm-server-standalone-to-9.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade-8.0-cloud-standalone.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade Elastic Cloud APM Server standalone to 8. [apm-upgrade-8.0-cloud-standalone]
diff --git a/solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md b/solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
index a6488ded5..5418de646 100644
--- a/solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
+++ b/solutions/observability/apm/upgrade-elastic-cloud-with-apm-integration-to-9.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade-8.0-cloud-integration.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade Elastic Cloud with the APM integration to 8.0 [apm-upgrade-8.0-cloud-integration]
diff --git a/solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md b/solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
index f916ed22b..5897b109c 100644
--- a/solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
+++ b/solutions/observability/apm/upgrade-self-installation-of-apm-integration-to-9.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Self-installation APM integration"
+navigation_title: Self-installation APM integration
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade-8.0-self-integration.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade a self-installation of the APM integration to 9.0 [apm-upgrade-9.0-self-integration]
diff --git a/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md b/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
index 08f98e5f7..596bb995e 100644
--- a/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
+++ b/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Self-installation standalone"
+navigation_title: Self-installation standalone
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade-8.0-self-standalone.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade a self-installation of APM Server standalone to 9.0 [apm-upgrade-9.0-self-standalone]
diff --git a/solutions/observability/apm/upgrade-to-version-9.md b/solutions/observability/apm/upgrade-to-version-9.md
index 92accfd58..5854fb664 100644
--- a/solutions/observability/apm/upgrade-to-version-9.md
+++ b/solutions/observability/apm/upgrade-to-version-9.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrading-to-8.x.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade to version 9.0 [apm-upgrading-to-9.0]
diff --git a/solutions/observability/apm/upgrade.md b/solutions/observability/apm/upgrade.md
index 23716c856..3598aaf98 100644
--- a/solutions/observability/apm/upgrade.md
+++ b/solutions/observability/apm/upgrade.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-upgrade.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Upgrade [apm-upgrade]
diff --git a/solutions/observability/apm/upstream-opentelemetry-collectors-language-sdks.md b/solutions/observability/apm/upstream-opentelemetry-collectors-language-sdks.md
index 65dc000f1..bb52addbd 100644
--- a/solutions/observability/apm/upstream-opentelemetry-collectors-language-sdks.md
+++ b/solutions/observability/apm/upstream-opentelemetry-collectors-language-sdks.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Upstream OpenTelemetry Collectors and language SDKs [apm-open-telemetry-direct]
diff --git a/solutions/observability/apm/use-apm-securely.md b/solutions/observability/apm/use-apm-securely.md
index 702e007aa..8b1ee4de1 100644
--- a/solutions/observability/apm/use-apm-securely.md
+++ b/solutions/observability/apm/use-apm-securely.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # Use APM securely [apm-securing-apm-server]
diff --git a/solutions/observability/apm/use-environment-variables-in-configuration.md b/solutions/observability/apm/use-environment-variables-in-configuration.md
index a48b70b61..94bfa05fe 100644
--- a/solutions/observability/apm/use-environment-variables-in-configuration.md
+++ b/solutions/observability/apm/use-environment-variables-in-configuration.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-config-env.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Use environment variables in the configuration [apm-config-env]
diff --git a/solutions/observability/apm/use-internal-collection-to-send-monitoring-data.md b/solutions/observability/apm/use-internal-collection-to-send-monitoring-data.md
index f2f6fbe16..d3b38b878 100644
--- a/solutions/observability/apm/use-internal-collection-to-send-monitoring-data.md
+++ b/solutions/observability/apm/use-internal-collection-to-send-monitoring-data.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Use internal collection"
+navigation_title: Use internal collection
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitoring-internal-collection.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Use internal collection to send monitoring data [apm-monitoring-internal-collection]
diff --git a/solutions/observability/apm/use-metricbeat-to-send-monitoring-data.md b/solutions/observability/apm/use-metricbeat-to-send-monitoring-data.md
index 48f0a0593..3355eee1d 100644
--- a/solutions/observability/apm/use-metricbeat-to-send-monitoring-data.md
+++ b/solutions/observability/apm/use-metricbeat-to-send-monitoring-data.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Use {{metricbeat}} collection"
+navigation_title: Use {{metricbeat}} collection
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitoring-metricbeat-collection.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Use Metricbeat to send monitoring data [apm-monitoring-metricbeat-collection]
diff --git a/solutions/observability/apm/use-opentelemetry-with-apm.md b/solutions/observability/apm/use-opentelemetry-with-apm.md
index d9341bcb7..aa4ad5957 100644
--- a/solutions/observability/apm/use-opentelemetry-with-apm.md
+++ b/solutions/observability/apm/use-opentelemetry-with-apm.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "OpenTelemetry"
+navigation_title: OpenTelemetry
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-apm-agents-opentelemetry.html
   - https://www.elastic.co/guide/en/observability/current/apm-open-telemetry.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Use OpenTelemetry with APM [apm-open-telemetry]
diff --git a/solutions/observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md b/solutions/observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md
index 06ba184bc..b95795337 100644
--- a/solutions/observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md
+++ b/solutions/observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md
@@ -1,9 +1,12 @@
 ---
-navigation_title: "Use local collection"
+navigation_title: Use local collection
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-monitoring-local-collection.html
 applies_to:
   stack: all
+products:
+  - id: observability
+  - id: apm
 ---
 
 # Use the select metrics emitted directly to your monitoring cluster [apm-monitoring-local-collection]
diff --git a/solutions/observability/apm/view-analyze-data.md b/solutions/observability/apm/view-analyze-data.md
index ca7a8809c..d56464276 100644
--- a/solutions/observability/apm/view-analyze-data.md
+++ b/solutions/observability/apm/view-analyze-data.md
@@ -5,6 +5,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: apm
+  - id: cloud-serverless
 ---
 
 # View and analyze data [apm-view-and-analyze-data]
diff --git a/solutions/observability/apm/view-elasticsearch-index-template.md b/solutions/observability/apm/view-elasticsearch-index-template.md
index 6469d40ad..7d3a579d2 100644
--- a/solutions/observability/apm/view-elasticsearch-index-template.md
+++ b/solutions/observability/apm/view-elasticsearch-index-template.md
@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-custom-index-template.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: apm
 ---
 
 # View the Elasticsearch index template [apm-custom-index-template]
diff --git a/solutions/observability/applications/index.md b/solutions/observability/applications/index.md
index 696c52af7..4c9c00386 100644
--- a/solutions/observability/applications/index.md
+++ b/solutions/observability/applications/index.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Applications and services"
+navigation_title: Applications and services
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/application-and-service-monitoring.html
   - https://www.elastic.co/guide/en/observability/current/application-and-service-monitoring.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Application and service monitoring [application-and-service-monitoring]
diff --git a/solutions/observability/applications/llm-observability.md b/solutions/observability/applications/llm-observability.md
index 484e5c36a..781b9e58a 100644
--- a/solutions/observability/applications/llm-observability.md
+++ b/solutions/observability/applications/llm-observability.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "LLM Observability"
+navigation_title: LLM Observability
 ---
 
 # LLM Observability
diff --git a/solutions/observability/applications/tutorial-monitor-java-application.md b/solutions/observability/applications/tutorial-monitor-java-application.md
index 35c383b3f..e3e099a99 100644
--- a/solutions/observability/applications/tutorial-monitor-java-application.md
+++ b/solutions/observability/applications/tutorial-monitor-java-application.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-java-app.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Tutorial: Monitor a Java application [monitor-java-app]
diff --git a/solutions/observability/applications/user-experience.md b/solutions/observability/applications/user-experience.md
index 7fd25a37f..0d606b339 100644
--- a/solutions/observability/applications/user-experience.md
+++ b/solutions/observability/applications/user-experience.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Real user monitoring"
+navigation_title: Real user monitoring
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/user-experience.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # Real user monitoring (User Experience) [user-experience]
diff --git a/solutions/observability/cicd.md b/solutions/observability/cicd.md
index a2a714de0..9eb3fb923 100644
--- a/solutions/observability/cicd.md
+++ b/solutions/observability/cicd.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "CI/CD"
+navigation_title: CI/CD
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/ci-cd-observability.html
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud.md b/solutions/observability/cloud.md
index ac88fb65b..28b9cf94e 100644
--- a/solutions/observability/cloud.md
+++ b/solutions/observability/cloud.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Cloud"
+navigation_title: Cloud
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/cloud-monitoring.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/amazon-web-services-aws-monitoring.md b/solutions/observability/cloud/amazon-web-services-aws-monitoring.md
index dd7c8dc36..89901f785 100644
--- a/solutions/observability/cloud/amazon-web-services-aws-monitoring.md
+++ b/solutions/observability/cloud/amazon-web-services-aws-monitoring.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "AWS"
+navigation_title: AWS
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-web-services.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/azure-monitoring.md b/solutions/observability/cloud/azure-monitoring.md
index bee66158c..d8cc17866 100644
--- a/solutions/observability/cloud/azure-monitoring.md
+++ b/solutions/observability/cloud/azure-monitoring.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Azure"
+navigation_title: Azure
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-azure-web-services.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/gcp-dataflow-templates.md b/solutions/observability/cloud/gcp-dataflow-templates.md
index d9cf09422..11b8df43f 100644
--- a/solutions/observability/cloud/gcp-dataflow-templates.md
+++ b/solutions/observability/cloud/gcp-dataflow-templates.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/gcp-dataflow.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # GCP Dataflow templates [gcp-dataflow]
diff --git a/solutions/observability/cloud/ingestion-options.md b/solutions/observability/cloud/ingestion-options.md
index f7b7b5b94..6106ae0e9 100644
--- a/solutions/observability/cloud/ingestion-options.md
+++ b/solutions/observability/cloud/ingestion-options.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Ingestion options"
+navigation_title: Ingestion options
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/ingest-aws-options.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md b/solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
index ed3ff317f..b9e176c0e 100644
--- a/solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
+++ b/solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "EC2"
+navigation_title: EC2
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-ec2.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md b/solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
index 0c8e9b916..83b5341dd 100644
--- a/solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
+++ b/solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Kinesis data streams"
+navigation_title: Kinesis data streams
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-kinesis.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md b/solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
index 02d9cc200..e7558618d 100644
--- a/solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
+++ b/solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "SQS"
+navigation_title: SQS
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-sqs.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md b/solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
index 216b25c54..f763f2115 100644
--- a/solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
+++ b/solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "S3"
+navigation_title: S3
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-s3.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
index 73c323535..5340a7a70 100644
--- a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
+++ b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Monitor {{aws}} with Amazon Data Firehose"
+navigation_title: Monitor {{aws}} with Amazon Data Firehose
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/ingest-aws-firehose.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
index ab1af1ffb..abdf988a9 100644
--- a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
+++ b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Monitor {{aws}} with {{beats}}"
+navigation_title: Monitor {{aws}} with {{beats}}
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
index 5ad5adddb..74038fe87 100644
--- a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
+++ b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-agent.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Monitor {{aws}} with {{agent}}"
+navigation_title: Monitor {{aws}} with {{agent}}
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-elastic-agent.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
index e735e5b33..a5df2ee98 100644
--- a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
+++ b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-elastic-serverless-forwarder.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Monitor {{aws}} with Elastic Serverless Forwarder"
+navigation_title: Monitor {{aws}} with Elastic Serverless Forwarder
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-esf.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-aws-network-firewall-logs.md b/solutions/observability/cloud/monitor-aws-network-firewall-logs.md
index 876c4c436..c3af07b8c 100644
--- a/solutions/observability/cloud/monitor-aws-network-firewall-logs.md
+++ b/solutions/observability/cloud/monitor-aws-network-firewall-logs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Network Firewall logs"
+navigation_title: Network Firewall logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-firewall-firehose.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-cloudtrail-logs.md b/solutions/observability/cloud/monitor-cloudtrail-logs.md
index a05745aea..02b8f73b4 100644
--- a/solutions/observability/cloud/monitor-cloudtrail-logs.md
+++ b/solutions/observability/cloud/monitor-cloudtrail-logs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "CloudTrail logs"
+navigation_title: CloudTrail logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-cloudtrail-firehose.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-cloudwatch-logs.md b/solutions/observability/cloud/monitor-cloudwatch-logs.md
index 3e7ab0273..2fc7f95a4 100644
--- a/solutions/observability/cloud/monitor-cloudwatch-logs.md
+++ b/solutions/observability/cloud/monitor-cloudwatch-logs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "CloudWatch logs"
+navigation_title: CloudWatch logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-cloudwatch-firehose.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md b/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
index d95fd1bb2..a87070c9c 100644
--- a/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
+++ b/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "GCP"
+navigation_title: GCP
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-gcp.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-microsoft-azure-openai.md b/solutions/observability/cloud/monitor-microsoft-azure-openai.md
index b868ab8d0..e20555346 100644
--- a/solutions/observability/cloud/monitor-microsoft-azure-openai.md
+++ b/solutions/observability/cloud/monitor-microsoft-azure-openai.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-azure-openai.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Monitor Microsoft Azure OpenAI [monitor-azure-openai]
diff --git a/solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md b/solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
index 1e6d7117c..ae3c01952 100644
--- a/solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
+++ b/solutions/observability/cloud/monitor-microsoft-azure-with-azure-native-isv-service.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-azure-native.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Monitor Microsoft Azure with the Azure Native ISV Service [monitor-azure-native]
diff --git a/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md b/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
index cb32d2555..7b902b258 100644
--- a/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
+++ b/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-azure.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Monitor Microsoft Azure with Beats [monitor-azure]
diff --git a/solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md b/solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
index b4a033377..e75555df2 100644
--- a/solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
+++ b/solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-azure-elastic-agent.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Monitor Microsoft Azure with Elastic Agent [monitor-azure-elastic-agent]
diff --git a/solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md b/solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
index fb8850767..ec37a8ccd 100644
--- a/solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
+++ b/solutions/observability/cloud/monitor-virtual-private-cloud-vpc-flow-logs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "VPC Flow Logs"
+navigation_title: VPC Flow Logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-amazon-vpc-flow-logs.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md b/solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
index 7788f1902..5c72c8878 100644
--- a/solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
+++ b/solutions/observability/cloud/monitor-web-application-firewall-waf-logs.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "WAF logs"
+navigation_title: WAF logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-waf-firehose.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/data-set-quality-monitoring.md b/solutions/observability/data-set-quality-monitoring.md
index c0f5f882e..8cd9bbd70 100644
--- a/solutions/observability/data-set-quality-monitoring.md
+++ b/solutions/observability/data-set-quality-monitoring.md
@@ -1,11 +1,14 @@
 ---
+navigation_title: Data set quality
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-datasets.html
   - https://www.elastic.co/guide/en/serverless/current/observability-monitor-datasets.html
-navigation_title: "Data set quality"
 applies_to:
   stack: beta
   serverless: beta
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Data set quality monitoring [observability-monitor-datasets]
diff --git a/solutions/observability/get-started.md b/solutions/observability/get-started.md
index bd6130199..2702cf5fc 100644
--- a/solutions/observability/get-started.md
+++ b/solutions/observability/get-started.md
@@ -1,4 +1,5 @@
 ---
+navigation_title: Get started
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-get-started.html
   - https://www.elastic.co/guide/en/observability/current/observability-get-started.html
@@ -6,7 +7,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
-navigation_title: "Get started"
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Get started with Elastic Observability [observability-get-started]
diff --git a/solutions/observability/get-started/add-data-from-splunk.md b/solutions/observability/get-started/add-data-from-splunk.md
index ecc4cf425..fd383dc79 100644
--- a/solutions/observability/get-started/add-data-from-splunk.md
+++ b/solutions/observability/get-started/add-data-from-splunk.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/splunk-get-started.html
 applies_to:
   stack: preview
+products:
+  - id: observability
 ---
 
 # Add data from Splunk [splunk-get-started]
diff --git a/solutions/observability/get-started/create-an-observability-project.md b/solutions/observability/get-started/create-an-observability-project.md
index a5f24ffd3..25911d9f1 100644
--- a/solutions/observability/get-started/create-an-observability-project.md
+++ b/solutions/observability/get-started/create-an-observability-project.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Create an Observability project"
+navigation_title: Create an Observability project
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-create-an-observability-project.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 % Serverless only
diff --git a/solutions/observability/get-started/get-started-with-dashboards.md b/solutions/observability/get-started/get-started-with-dashboards.md
index 6a7c8c619..78558dd45 100644
--- a/solutions/observability/get-started/get-started-with-dashboards.md
+++ b/solutions/observability/get-started/get-started-with-dashboards.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-dashboards.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Get started with dashboards [observability-dashboards]
diff --git a/solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md b/solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
index 26c377388..29779af1d 100644
--- a/solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
+++ b/solutions/observability/get-started/quickstart-collect-data-with-aws-firehose.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Quickstart: Collect data with AWS Firehose [collect-data-with-aws-firehose]
diff --git a/solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md b/solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
index 38a087d4e..d5560dff9 100644
--- a/solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
+++ b/solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md
@@ -1,5 +1,5 @@
 ---
-mapped_urls:
+mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/collect-data-with-native-otlp.html
 applies_to:
   serverless:
@@ -64,7 +64,7 @@ The Elastic Cloud Managed OTLP Endpoint ensures that OpenTelemetry data is store
     The response should be similar to:
 
     ```txt
-    {"partialSuccess":{}}% 
+    {"partialSuccess":{}}%
     ```
 
 ### Send data to your Elastic Cloud Managed OTLP endpoint
@@ -100,7 +100,7 @@ See the [EDOT Language SDK documentation](https://elastic.github.io/opentelemetr
 
 Configure your OTel SDK with the following environment variables:
 
-* Elastic Cloud Managed OTLP endpoint: `OTEL_EXPORTER_OTLP_ENDPOINT` 
+* Elastic Cloud Managed OTLP endpoint: `OTEL_EXPORTER_OTLP_ENDPOINT`
 * Elastic API key: `OTEL_EXPORTER_OTLP_HEADERS`
 
 For example:
diff --git a/solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md b/solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
index 53d10744d..37940a605 100644
--- a/solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
+++ b/solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md
@@ -7,6 +7,10 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
+  - id: elastic-stack
 ---
 
 # Quickstart: Monitor hosts with {{agent}} [quickstart-monitor-hosts-with-elastic-agent]
diff --git a/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md b/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
index b7543cc55..3f1d1f5d2 100644
--- a/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
+++ b/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Quickstart: Monitor hosts with OpenTelemetry [quickstart-monitor-hosts-with-otel]
diff --git a/solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md b/solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
index 54b412bd7..c9ba4ebf6 100644
--- a/solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
+++ b/solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Quickstart: Monitor your Kubernetes cluster with {{agent}} [monitor-k8s-logs-metrics-with-elastic-agent]
diff --git a/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md b/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
index 67923aa12..b0d3c4071 100644
--- a/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
+++ b/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Quickstart: Unified Kubernetes Observability with Elastic Distributions of OpenTelemetry (EDOT) [monitor-k8s-otel-edot]
diff --git a/solutions/observability/get-started/what-is-elastic-observability.md b/solutions/observability/get-started/what-is-elastic-observability.md
index a071a4b58..94b38388a 100644
--- a/solutions/observability/get-started/what-is-elastic-observability.md
+++ b/solutions/observability/get-started/what-is-elastic-observability.md
@@ -2,7 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/observability-introduction.html
   - https://www.elastic.co/guide/en/serverless/current/observability-serverless-observability-overview.html
-
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # What is Elastic {{observability}}? [observability-introduction]
diff --git a/solutions/observability/incident-management.md b/solutions/observability/incident-management.md
index 9693dc76d..497c76721 100644
--- a/solutions/observability/incident-management.md
+++ b/solutions/observability/incident-management.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Incident management [incident-management]
diff --git a/solutions/observability/incident-management/aggregation-options.md b/solutions/observability/incident-management/aggregation-options.md
index 8bff1855a..265493e1e 100644
--- a/solutions/observability/incident-management/aggregation-options.md
+++ b/solutions/observability/incident-management/aggregation-options.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/aggregation-options.html
   - https://www.elastic.co/guide/en/serverless/current/observability-aggregationOptions.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Aggregation options [aggregation-options]
diff --git a/solutions/observability/incident-management/alerting.md b/solutions/observability/incident-management/alerting.md
index 030090d22..c9a80a10b 100644
--- a/solutions/observability/incident-management/alerting.md
+++ b/solutions/observability/incident-management/alerting.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/create-alerts.html
   - https://www.elastic.co/guide/en/serverless/current/observability-alerting.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Alerting [observability-alerting]
diff --git a/solutions/observability/incident-management/cases.md b/solutions/observability/incident-management/cases.md
index 6bf412935..632e53d43 100644
--- a/solutions/observability/incident-management/cases.md
+++ b/solutions/observability/incident-management/cases.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/create-cases.html
   - https://www.elastic.co/guide/en/serverless/current/observability-cases.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Cases [observability-cases]
diff --git a/solutions/observability/incident-management/configure-access-to-cases.md b/solutions/observability/incident-management/configure-access-to-cases.md
index 9b4495d0b..689d44345 100644
--- a/solutions/observability/incident-management/configure-access-to-cases.md
+++ b/solutions/observability/incident-management/configure-access-to-cases.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/grant-cases-access.html
+products:
+  - id: observability
 ---
 
 # Configure access to cases [grant-cases-access]
diff --git a/solutions/observability/incident-management/configure-case-settings.md b/solutions/observability/incident-management/configure-case-settings.md
index e77ea28fe..851bbd10f 100644
--- a/solutions/observability/incident-management/configure-case-settings.md
+++ b/solutions/observability/incident-management/configure-case-settings.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/manage-cases-settings.html
   - https://www.elastic.co/guide/en/serverless/current/observability-case-settings.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Configure case settings [manage-cases-settings]
diff --git a/solutions/observability/incident-management/configure-service-level-objective-slo-access.md b/solutions/observability/incident-management/configure-service-level-objective-slo-access.md
index 71795701f..23e0d8066 100644
--- a/solutions/observability/incident-management/configure-service-level-objective-slo-access.md
+++ b/solutions/observability/incident-management/configure-service-level-objective-slo-access.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Configure SLO access"
+navigation_title: Configure SLO access
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/slo-privileges.html
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/incident-management/create-an-anomaly-detection-rule.md b/solutions/observability/incident-management/create-an-anomaly-detection-rule.md
index d05d8f29c..249126623 100644
--- a/solutions/observability/incident-management/create-an-anomaly-detection-rule.md
+++ b/solutions/observability/incident-management/create-an-anomaly-detection-rule.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Anomaly detection"
+navigation_title: Anomaly detection
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-aiops-generate-anomaly-alerts.html
+products:
+  - id: cloud-serverless
 ---
 
 
diff --git a/solutions/observability/incident-management/create-an-apm-anomaly-rule.md b/solutions/observability/incident-management/create-an-apm-anomaly-rule.md
index 191981366..922be1f18 100644
--- a/solutions/observability/incident-management/create-an-apm-anomaly-rule.md
+++ b/solutions/observability/incident-management/create-an-apm-anomaly-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: APM anomaly
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-anomaly-rule.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-anomaly-alert-rule.html
-
-navigation_title: "APM anomaly"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create an APM anomaly rule [observability-create-anomaly-alert-rule]
diff --git a/solutions/observability/incident-management/create-an-elasticsearch-query-rule.md b/solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
index 10d554532..c96d83627 100644
--- a/solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
+++ b/solutions/observability/incident-management/create-an-elasticsearch-query-rule.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Elasticsearch query"
+navigation_title: Elasticsearch query
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-create-elasticsearch-query-rule.html
+products:
+  - id: cloud-serverless
 ---
 
 
diff --git a/solutions/observability/incident-management/create-an-error-count-threshold-rule.md b/solutions/observability/incident-management/create-an-error-count-threshold-rule.md
index 225ced2ec..b1c5ee8d5 100644
--- a/solutions/observability/incident-management/create-an-error-count-threshold-rule.md
+++ b/solutions/observability/incident-management/create-an-error-count-threshold-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Error count threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-error-count-threshold-rule.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-error-count-threshold-alert-rule.html
-
-navigation_title: "Error count threshold"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create an error count threshold rule [observability-create-error-count-threshold-alert-rule]
diff --git a/solutions/observability/incident-management/create-an-inventory-rule.md b/solutions/observability/incident-management/create-an-inventory-rule.md
index 9dffacbb0..088064687 100644
--- a/solutions/observability/incident-management/create-an-inventory-rule.md
+++ b/solutions/observability/incident-management/create-an-inventory-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Inventory
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/infrastructure-threshold-alert.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-inventory-threshold-alert-rule.html
-
-navigation_title: "Inventory"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create an inventory rule [observability-create-inventory-threshold-alert-rule]
diff --git a/solutions/observability/incident-management/create-an-slo-burn-rate-rule.md b/solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
index 7fe0d23f1..ebd442c89 100644
--- a/solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
+++ b/solutions/observability/incident-management/create-an-slo-burn-rate-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: SLO burn rate
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/slo-burn-rate-alert.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-slo-burn-rate-alert-rule.html
-
-navigation_title: "SLO burn rate"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create an SLO burn rate rule [observability-create-slo-burn-rate-alert-rule]
diff --git a/solutions/observability/incident-management/create-an-slo.md b/solutions/observability/incident-management/create-an-slo.md
index 9c442a198..aa15a6f84 100644
--- a/solutions/observability/incident-management/create-an-slo.md
+++ b/solutions/observability/incident-management/create-an-slo.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/slo-create.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-an-slo.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 
diff --git a/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md b/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
index 49ac87294..92fb147f9 100644
--- a/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
+++ b/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Uptime duration anomaly"
+navigation_title: Uptime duration anomaly
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/duration-anomaly-alert.html
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Create an uptime duration anomaly rule [duration-anomaly-alert]
diff --git a/solutions/observability/incident-management/create-custom-threshold-rule.md b/solutions/observability/incident-management/create-custom-threshold-rule.md
index c91dc7c0f..1c8d21e20 100644
--- a/solutions/observability/incident-management/create-custom-threshold-rule.md
+++ b/solutions/observability/incident-management/create-custom-threshold-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Custom threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/custom-threshold-alert.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-custom-threshold-alert-rule.html
-
-navigation_title: "Custom threshold"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create a custom threshold rule [observability-create-custom-threshold-alert-rule]
diff --git a/solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md b/solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
index aa669a572..9183db4ac 100644
--- a/solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
+++ b/solutions/observability/incident-management/create-failed-transaction-rate-threshold-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Failed transaction rate threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-failed-transaction-rate-threshold-rule.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-failed-transaction-rate-threshold-alert-rule.html
-
-navigation_title: "Failed transaction rate threshold"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create a failed transaction rate threshold rule [observability-create-failed-transaction-rate-threshold-alert-rule]
diff --git a/solutions/observability/incident-management/create-latency-threshold-rule.md b/solutions/observability/incident-management/create-latency-threshold-rule.md
index 3a2e83c1a..066345a2d 100644
--- a/solutions/observability/incident-management/create-latency-threshold-rule.md
+++ b/solutions/observability/incident-management/create-latency-threshold-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Latency threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-latency-threshold-rule.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-latency-threshold-alert-rule.html
-
-navigation_title: "Latency threshold"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create a latency threshold rule [observability-create-latency-threshold-alert-rule]
diff --git a/solutions/observability/incident-management/create-log-threshold-rule.md b/solutions/observability/incident-management/create-log-threshold-rule.md
index e1c0996b4..dcb575ec7 100644
--- a/solutions/observability/incident-management/create-log-threshold-rule.md
+++ b/solutions/observability/incident-management/create-log-threshold-rule.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Log threshold"
+navigation_title: Log threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/logs-threshold-alert.html
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/incident-management/create-manage-cases.md b/solutions/observability/incident-management/create-manage-cases.md
index d98649f02..7a5bb87f6 100644
--- a/solutions/observability/incident-management/create-manage-cases.md
+++ b/solutions/observability/incident-management/create-manage-cases.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/manage-cases.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-a-new-case.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create and manage cases [observability-create-a-new-case]
diff --git a/solutions/observability/incident-management/create-manage-rules.md b/solutions/observability/incident-management/create-manage-rules.md
index a1aada86b..123e58d46 100644
--- a/solutions/observability/incident-management/create-manage-rules.md
+++ b/solutions/observability/incident-management/create-manage-rules.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/create-alerts-rules.html
   - https://www.elastic.co/guide/en/serverless/current/observability-create-manage-rules.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create and manage rules [observability-create-manage-rules]
diff --git a/solutions/observability/incident-management/create-metric-threshold-rule.md b/solutions/observability/incident-management/create-metric-threshold-rule.md
index 04aa682ad..705ab4556 100644
--- a/solutions/observability/incident-management/create-metric-threshold-rule.md
+++ b/solutions/observability/incident-management/create-metric-threshold-rule.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Metric threshold"
+navigation_title: Metric threshold
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/metrics-threshold-alert.html
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/incident-management/create-monitor-status-rule.md b/solutions/observability/incident-management/create-monitor-status-rule.md
index 5feb8de15..700d296f4 100644
--- a/solutions/observability/incident-management/create-monitor-status-rule.md
+++ b/solutions/observability/incident-management/create-monitor-status-rule.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Monitor Status
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-status-alert.html
   - https://www.elastic.co/guide/en/serverless/current/observability-monitor-status-alert.html
-
-navigation_title: "Monitor Status"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 
diff --git a/solutions/observability/incident-management/create-tls-certificate-rule.md b/solutions/observability/incident-management/create-tls-certificate-rule.md
index 47c2681db..d5204d268 100644
--- a/solutions/observability/incident-management/create-tls-certificate-rule.md
+++ b/solutions/observability/incident-management/create-tls-certificate-rule.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "TLS certificate"
+navigation_title: TLS certificate
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/tls-certificate-alert.html
+products:
+  - id: observability
 ---
 
 # Create a TLS certificate rule [tls-certificate-alert]
diff --git a/solutions/observability/incident-management/rate-aggregation.md b/solutions/observability/incident-management/rate-aggregation.md
index 0bfefe47a..1c0072086 100644
--- a/solutions/observability/incident-management/rate-aggregation.md
+++ b/solutions/observability/incident-management/rate-aggregation.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/rate-aggregation.html
   - https://www.elastic.co/guide/en/serverless/current/observability-rateAggregation.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Rate aggregation [rate-aggregation]
diff --git a/solutions/observability/incident-management/service-level-objectives-slos.md b/solutions/observability/incident-management/service-level-objectives-slos.md
index df83eb398..01f44d0c7 100644
--- a/solutions/observability/incident-management/service-level-objectives-slos.md
+++ b/solutions/observability/incident-management/service-level-objectives-slos.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/slo.html
   - https://www.elastic.co/guide/en/serverless/current/observability-slos.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 # Service-level objectives (SLOs) [observability-slos]
 
diff --git a/solutions/observability/incident-management/triage-slo-burn-rate-breaches.md b/solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
index 48ea691b0..60fe1ad35 100644
--- a/solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
+++ b/solutions/observability/incident-management/triage-slo-burn-rate-breaches.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: SLO burn rate breaches
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/triage-slo-burn-rate-breaches.html
   - https://www.elastic.co/guide/en/serverless/current/observability-triage-slo-burn-rate-breaches.html
-
-navigation_title: "SLO burn rate breaches"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Triage SLO burn rate breaches [triage-slo-burn-rate-breaches]
diff --git a/solutions/observability/incident-management/triage-threshold-breaches.md b/solutions/observability/incident-management/triage-threshold-breaches.md
index 9c83a919e..f8825813d 100644
--- a/solutions/observability/incident-management/triage-threshold-breaches.md
+++ b/solutions/observability/incident-management/triage-threshold-breaches.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Threshold breaches
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/triage-threshold-breaches.html
   - https://www.elastic.co/guide/en/serverless/current/observability-triage-threshold-breaches.html
-
-navigation_title: "Threshold breaches"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Triage threshold breaches [triage-threshold-breaches]
diff --git a/solutions/observability/incident-management/view-alerts.md b/solutions/observability/incident-management/view-alerts.md
index 0c80bc635..2dac01862 100644
--- a/solutions/observability/incident-management/view-alerts.md
+++ b/solutions/observability/incident-management/view-alerts.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/view-observability-alerts.html
   - https://www.elastic.co/guide/en/serverless/current/observability-view-alerts.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # View alerts [observability-view-alerts]
diff --git a/solutions/observability/infra-and-hosts.md b/solutions/observability/infra-and-hosts.md
index 1efd7d7dd..59226f31c 100644
--- a/solutions/observability/infra-and-hosts.md
+++ b/solutions/observability/infra-and-hosts.md
@@ -1,12 +1,14 @@
 ---
+navigation_title: Infrastructure and hosts
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/infrastructure-and-host-monitoring-intro.html
   - https://www.elastic.co/guide/en/serverless/current/infrastructure-and-host-monitoring-intro.html
-
-navigation_title: "Infrastructure and hosts"
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Infrastructure and host monitoring [infrastructure-and-host-monitoring-intro]
diff --git a/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md b/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
index 8570d973e..90ee110ea 100644
--- a/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
+++ b/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-add-symbols.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Add symbols for native frames [profiling-add-symbols]
diff --git a/solutions/observability/infra-and-hosts/advanced-configuration.md b/solutions/observability/infra-and-hosts/advanced-configuration.md
index 7420aa001..0e55613d4 100644
--- a/solutions/observability/infra-and-hosts/advanced-configuration.md
+++ b/solutions/observability/infra-and-hosts/advanced-configuration.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-advanced-configuration.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Advanced configuration [profiling-advanced-configuration]
diff --git a/solutions/observability/infra-and-hosts/analyze-compare-hosts.md b/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
index c72facc7b..627320961 100644
--- a/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
+++ b/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Analyze and compare hosts [observability-analyze-hosts]
diff --git a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
index a3a6870eb..0d102e50b 100644
--- a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
+++ b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Analyze infrastructure and host metrics [observability-infrastructure-monitoring]
diff --git a/solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md b/solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
index 5e6aa8d6f..e38804e2e 100644
--- a/solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
+++ b/solutions/observability/infra-and-hosts/configuration-file-of-universal-profiling-agent.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-config-file.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Configuration file of the Universal Profiling Agent [profiling-config-file]
diff --git a/solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md b/solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
index 19dfb3d3a..0b48bb68c 100644
--- a/solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
+++ b/solutions/observability/infra-and-hosts/configure-probabilistic-profiling.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-probabilistic-profiling.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Configure probabilistic profiling [profiling-probabilistic-profiling]
diff --git a/solutions/observability/infra-and-hosts/configure-settings.md b/solutions/observability/infra-and-hosts/configure-settings.md
index 7e6347266..4ebc23285 100644
--- a/solutions/observability/infra-and-hosts/configure-settings.md
+++ b/solutions/observability/infra-and-hosts/configure-settings.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/configure-settings.html
   - https://www.elastic.co/guide/en/serverless/current/observability-configure-intra-settings.html
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Configure settings [observability-configure-intra-settings]
diff --git a/solutions/observability/infra-and-hosts/detect-metric-anomalies.md b/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
index 3dfa3b95c..f07cf5c02 100644
--- a/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
+++ b/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Detect metric anomalies [observability-detect-metric-anomalies]
diff --git a/solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md b/solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
index 6d28af7f3..a9bd64cdf 100644
--- a/solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
+++ b/solutions/observability/infra-and-hosts/environment-variables-to-configure-universal-profiling-agent.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-envs.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Environment variables to configure the Universal Profiling Agent [profiling-envs]
diff --git a/solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md b/solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
index b72e2ed2f..edf668f52 100644
--- a/solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
+++ b/solutions/observability/infra-and-hosts/explore-infrastructure-metrics-over-time.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/explore-metrics.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Explore infrastructure metrics over time [explore-metrics]
diff --git a/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md b/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
index fab467023..1e095941a 100644
--- a/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
+++ b/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 % Stateful get started is much more detailed, but I'm not sure it needs to be. I've considerably pared it down here, but we should go through the actual steps in here.
diff --git a/solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md b/solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
index 87ab915c0..b0a6abb79 100644
--- a/solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
+++ b/solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Get started"
+navigation_title: Get started
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-get-started.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/install-backend.md b/solutions/observability/infra-and-hosts/install-backend.md
index 9c70d5140..05ed4a381 100644
--- a/solutions/observability/infra-and-hosts/install-backend.md
+++ b/solutions/observability/infra-and-hosts/install-backend.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-installation.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Install the backend [profiling-self-managed-installation]
diff --git a/solutions/observability/infra-and-hosts/manage-data-storage.md b/solutions/observability/infra-and-hosts/manage-data-storage.md
index 7cac01733..86364f7a3 100644
--- a/solutions/observability/infra-and-hosts/manage-data-storage.md
+++ b/solutions/observability/infra-and-hosts/manage-data-storage.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-manage-storage.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Manage data storage [profiling-manage-storage]
diff --git a/solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md b/solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
index 188ebb322..5a5f9d075 100644
--- a/solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
+++ b/solutions/observability/infra-and-hosts/operate-universal-profiling-backend.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Operate the backend"
+navigation_title: Operate the backend
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-ops.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/override-kernel-version-check.md b/solutions/observability/infra-and-hosts/override-kernel-version-check.md
index 1e00096ba..d3589c8f1 100644
--- a/solutions/observability/infra-and-hosts/override-kernel-version-check.md
+++ b/solutions/observability/infra-and-hosts/override-kernel-version-check.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-no-kernel-version-check.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Override kernel version check [profiling-no-kernel-version-check]
diff --git a/solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md b/solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
index ea788f58c..1d45f3acf 100644
--- a/solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
+++ b/solutions/observability/infra-and-hosts/run-universal-profiling-on-self-hosted-elastic-stack.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Self-hosted infrastructure"
+navigation_title: Self-hosted infrastructure
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed.html
 applies_to:
-  stack: 
+  stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/step-1-update-stack.md b/solutions/observability/infra-and-hosts/step-1-update-stack.md
index 266a83b9b..f90227839 100644
--- a/solutions/observability/infra-and-hosts/step-1-update-stack.md
+++ b/solutions/observability/infra-and-hosts/step-1-update-stack.md
@@ -2,7 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-updating.html
 applies_to:
-  stack: 
+  stack:
+products:
+  - id: observability
 ---
 
 # Step 1: Update the stack [profiling-self-managed-updating]
diff --git a/solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md b/solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
index bfe08f4ae..8f275a423 100644
--- a/solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
+++ b/solutions/observability/infra-and-hosts/step-2-enable-universal-profiling-in-kibana.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-enable-kibana.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Step 2: Enable Universal Profiling in Kibana [profiling-self-managed-enable-kibana]
diff --git a/solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md b/solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
index a1c09350b..34635f4e5 100644
--- a/solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
+++ b/solutions/observability/infra-and-hosts/step-3-set-up-universal-profiling-in-kibana.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-setup-kibana.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Step 3: Set up Universal Profiling in Kibana [profiling-self-managed-setup-kibana]
diff --git a/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md b/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
index 986255054..4e4cf575f 100644
--- a/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
+++ b/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-running.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Step 4: Run the backend applications [profiling-self-managed-running]
diff --git a/solutions/observability/infra-and-hosts/step-5-next-steps.md b/solutions/observability/infra-and-hosts/step-5-next-steps.md
index 24fa0d088..07ff0b855 100644
--- a/solutions/observability/infra-and-hosts/step-5-next-steps.md
+++ b/solutions/observability/infra-and-hosts/step-5-next-steps.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-install-next-steps.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Step 5: Next steps [profiling-self-managed-install-next-steps]
diff --git a/solutions/observability/infra-and-hosts/tag-data-for-querying.md b/solutions/observability/infra-and-hosts/tag-data-for-querying.md
index b5529bff4..8b33a373a 100644
--- a/solutions/observability/infra-and-hosts/tag-data-for-querying.md
+++ b/solutions/observability/infra-and-hosts/tag-data-for-querying.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-tag-data-query.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Tag data for querying [profiling-tag-data-query]
diff --git a/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md b/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
index 198a29953..275732a84 100644
--- a/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
+++ b/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-kubernetes.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Tutorial: Observe your Kubernetes deployments [monitor-kubernetes]
diff --git a/solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md b/solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
index aece013df..bb0bb8708 100644
--- a/solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
+++ b/solutions/observability/infra-and-hosts/tutorial-observe-nginx-instances.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-nginx.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Tutorial: Observe your nginx instances [monitor-nginx]
diff --git a/solutions/observability/infra-and-hosts/understanding-no-results-found-message.md b/solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
index 45faf7f18..76febe2ee 100644
--- a/solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
+++ b/solutions/observability/infra-and-hosts/understanding-no-results-found-message.md
@@ -4,6 +4,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-handle-no-results-found-message.html
 applies_to:
   stack:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Understanding "no results found" message [observability-handle-no-results-found-message]
diff --git a/solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md b/solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
index 78d402f6d..329354d91 100644
--- a/solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
+++ b/solutions/observability/infra-and-hosts/universal-profiling-index-life-cycle-management.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Index lifecycle management"
+navigation_title: Index lifecycle management
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-index-lifecycle-management.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/universal-profiling.md b/solutions/observability/infra-and-hosts/universal-profiling.md
index 0337a8e98..7a2e86114 100644
--- a/solutions/observability/infra-and-hosts/universal-profiling.md
+++ b/solutions/observability/infra-and-hosts/universal-profiling.md
@@ -2,7 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/universal-profiling.html
 applies_to:
-  stack: 
+  stack:
+products:
+  - id: observability
 ---
 
 # Universal Profiling [universal-profiling]
diff --git a/solutions/observability/infra-and-hosts/upgrade-universal-profiling.md b/solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
index e22d7392b..0e3973ae2 100644
--- a/solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
+++ b/solutions/observability/infra-and-hosts/upgrade-universal-profiling.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Upgrade"
+navigation_title: Upgrade
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-upgrade.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md b/solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
index e320ae0ba..551f1a2aa 100644
--- a/solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
+++ b/solutions/observability/infra-and-hosts/use-proxy-with-universal-profiling-agent.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Use a proxy"
+navigation_title: Use a proxy
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-use-a-proxy.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 
diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index ecdd87f00..ce3a3e419 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # View infrastructure metrics by resource type [observability-view-infrastructure-metrics]
diff --git a/solutions/observability/logs.md b/solutions/observability/logs.md
index 331886129..8e8e8c472 100644
--- a/solutions/observability/logs.md
+++ b/solutions/observability/logs.md
@@ -1,9 +1,11 @@
 ---
+navigation_title: Logs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/logs-checklist.html
   - https://www.elastic.co/guide/en/serverless/current/observability-log-monitoring.html
-
-navigation_title: "Logs"
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Log monitoring [logs-checklist]
diff --git a/solutions/observability/logs/add-service-name-to-logs.md b/solutions/observability/logs/add-service-name-to-logs.md
index 72bf8f771..4aae889cd 100644
--- a/solutions/observability/logs/add-service-name-to-logs.md
+++ b/solutions/observability/logs/add-service-name-to-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Add a service name to logs [observability-add-logs-service-name]
diff --git a/solutions/observability/logs/apm-agent-log-sending.md b/solutions/observability/logs/apm-agent-log-sending.md
index 66ad913c9..c27ef5e7c 100644
--- a/solutions/observability/logs/apm-agent-log-sending.md
+++ b/solutions/observability/logs/apm-agent-log-sending.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # APM agent log sending [observability-send-application-logs]
diff --git a/solutions/observability/logs/categorize-log-entries.md b/solutions/observability/logs/categorize-log-entries.md
index 8cc51b78d..877225dbf 100644
--- a/solutions/observability/logs/categorize-log-entries.md
+++ b/solutions/observability/logs/categorize-log-entries.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/categorize-logs.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # Categorize log entries [categorize-logs]
diff --git a/solutions/observability/logs/discover-logs.md b/solutions/observability/logs/discover-logs.md
index 5cd84b684..4045fb977 100644
--- a/solutions/observability/logs/discover-logs.md
+++ b/solutions/observability/logs/discover-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Explore logs in Discover [explore-logs]
diff --git a/solutions/observability/logs/ecs-formatted-application-logs.md b/solutions/observability/logs/ecs-formatted-application-logs.md
index 62fcaec02..1b5102f77 100644
--- a/solutions/observability/logs/ecs-formatted-application-logs.md
+++ b/solutions/observability/logs/ecs-formatted-application-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # ECS formatted application logs [logs-ecs-application]
diff --git a/solutions/observability/logs/explore-logs.md b/solutions/observability/logs/explore-logs.md
index b6cd9a768..6991725c6 100644
--- a/solutions/observability/logs/explore-logs.md
+++ b/solutions/observability/logs/explore-logs.md
@@ -1,6 +1,8 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-logs.html
+products:
+  - id: observability
 ---
 
 # Explore logs [monitor-logs]
diff --git a/solutions/observability/logs/filter-aggregate-logs.md b/solutions/observability/logs/filter-aggregate-logs.md
index 0ce47aade..580a56060 100644
--- a/solutions/observability/logs/filter-aggregate-logs.md
+++ b/solutions/observability/logs/filter-aggregate-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Filter and aggregate logs [observability-filter-and-aggregate-logs]
diff --git a/solutions/observability/logs/get-started-with-system-logs.md b/solutions/observability/logs/get-started-with-system-logs.md
index f283a53f0..05cff60a0 100644
--- a/solutions/observability/logs/get-started-with-system-logs.md
+++ b/solutions/observability/logs/get-started-with-system-logs.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Get started with system logs [observability-get-started-with-logs]
diff --git a/solutions/observability/logs/inspect-log-anomalies.md b/solutions/observability/logs/inspect-log-anomalies.md
index acd364ba8..a6565dc5c 100644
--- a/solutions/observability/logs/inspect-log-anomalies.md
+++ b/solutions/observability/logs/inspect-log-anomalies.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/inspect-log-anomalies.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # Inspect log anomalies [inspect-log-anomalies]
diff --git a/solutions/observability/logs/logs-index-template-reference.md b/solutions/observability/logs/logs-index-template-reference.md
index 607964cb1..b302b6020 100644
--- a/solutions/observability/logs/logs-index-template-reference.md
+++ b/solutions/observability/logs/logs-index-template-reference.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
 ---
 
 # Logs index template reference [logs-index-template]
diff --git a/solutions/observability/logs/parse-route-logs.md b/solutions/observability/logs/parse-route-logs.md
index b51c1753d..9cf8b6d4d 100644
--- a/solutions/observability/logs/parse-route-logs.md
+++ b/solutions/observability/logs/parse-route-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Parse and route logs [observability-parse-log-data]
diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md
index f0ebfe7d5..f57951da6 100644
--- a/solutions/observability/logs/plaintext-application-logs.md
+++ b/solutions/observability/logs/plaintext-application-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Plaintext application logs [logs-plaintext]
diff --git a/solutions/observability/logs/run-pattern-analysis-on-log-data.md b/solutions/observability/logs/run-pattern-analysis-on-log-data.md
index 49f898ff6..0d08c7a8d 100644
--- a/solutions/observability/logs/run-pattern-analysis-on-log-data.md
+++ b/solutions/observability/logs/run-pattern-analysis-on-log-data.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-run-log-pattern-analysis.html
 applies_to:
   stack: all
+products:
+  - id: cloud-serverless
 ---
 
 # Run a pattern analysis on log data [observability-run-log-pattern-analysis]
diff --git a/solutions/observability/logs/stream-any-log-file.md b/solutions/observability/logs/stream-any-log-file.md
index 467f10ebe..b0ade9702 100644
--- a/solutions/observability/logs/stream-any-log-file.md
+++ b/solutions/observability/logs/stream-any-log-file.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Stream any log file [logs-stream]
diff --git a/solutions/observability/logs/stream-application-logs.md b/solutions/observability/logs/stream-application-logs.md
index 47fab9fe4..fa7a2e480 100644
--- a/solutions/observability/logs/stream-application-logs.md
+++ b/solutions/observability/logs/stream-application-logs.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack: all
   serverless: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Stream application logs [observability-correlate-application-logs]
diff --git a/solutions/observability/logs/streams/management/advanced.md b/solutions/observability/logs/streams/management/advanced.md
index 40fd4d1b5..ea12ded9e 100644
--- a/solutions/observability/logs/streams/management/advanced.md
+++ b/solutions/observability/logs/streams/management/advanced.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 # Configure advanced settings [streams-advanced-settings]
 
diff --git a/solutions/observability/logs/streams/management/extract.md b/solutions/observability/logs/streams/management/extract.md
index 8bf20747c..413d309fb 100644
--- a/solutions/observability/logs/streams/management/extract.md
+++ b/solutions/observability/logs/streams/management/extract.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 # Extract fields [streams-extract-fields]
 
diff --git a/solutions/observability/logs/streams/management/extract/date.md b/solutions/observability/logs/streams/management/extract/date.md
index 28cc9c2b2..e6d131a2a 100644
--- a/solutions/observability/logs/streams/management/extract/date.md
+++ b/solutions/observability/logs/streams/management/extract/date.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 
 # Date processor [streams-date-processor]
diff --git a/solutions/observability/logs/streams/management/extract/dissect.md b/solutions/observability/logs/streams/management/extract/dissect.md
index 50d5f5f43..02b713472 100644
--- a/solutions/observability/logs/streams/management/extract/dissect.md
+++ b/solutions/observability/logs/streams/management/extract/dissect.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 # Dissect processor [streams-dissect-processor]
 
diff --git a/solutions/observability/logs/streams/management/extract/grok.md b/solutions/observability/logs/streams/management/extract/grok.md
index 724f00b43..7321538ee 100644
--- a/solutions/observability/logs/streams/management/extract/grok.md
+++ b/solutions/observability/logs/streams/management/extract/grok.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 # Grok processor [streams-grok-processor]
 
diff --git a/solutions/observability/logs/streams/management/extract/key-value.md b/solutions/observability/logs/streams/management/extract/key-value.md
index dab16ee8e..419c77909 100644
--- a/solutions/observability/logs/streams/management/extract/key-value.md
+++ b/solutions/observability/logs/streams/management/extract/key-value.md
@@ -1,7 +1,7 @@
 ---
 navigation_title: KV processor
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 # Key value processor [streams-kv-processor]
 
diff --git a/solutions/observability/logs/streams/management/retention.md b/solutions/observability/logs/streams/management/retention.md
index 569322d2e..b4cb0f2a3 100644
--- a/solutions/observability/logs/streams/management/retention.md
+++ b/solutions/observability/logs/streams/management/retention.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 
 # Manage data retention [streams-data-retention]
diff --git a/solutions/observability/logs/streams/streams.md b/solutions/observability/logs/streams/streams.md
index e71e9fb72..3238847b5 100644
--- a/solutions/observability/logs/streams/streams.md
+++ b/solutions/observability/logs/streams/streams.md
@@ -1,6 +1,6 @@
 ---
 applies_to:
-    serverless: preview
+  serverless: preview
 ---
 
 :::{warning}
diff --git a/solutions/observability/observability-ai-assistant.md b/solutions/observability/observability-ai-assistant.md
index 8817afab6..b897a4bfd 100644
--- a/solutions/observability/observability-ai-assistant.md
+++ b/solutions/observability/observability-ai-assistant.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: AI Assistant
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/obs-ai-assistant.html
-navigation_title: "AI Assistant"
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: observability
 ---
 
 # {{obs-ai-assistant}} [obs-ai-assistant]
diff --git a/solutions/observability/otlp-visualize.md b/solutions/observability/otlp-visualize.md
index 6513697c3..f0be9a170 100644
--- a/solutions/observability/otlp-visualize.md
+++ b/solutions/observability/otlp-visualize.md
@@ -1,5 +1,5 @@
 ---
-mapped_urls:
+mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/otlp-visualize.html
 applies_to:
   serverless:
diff --git a/solutions/observability/synthetics/analyze-data.md b/solutions/observability/synthetics/analyze-data.md
index c1424d5ed..f2a8d21c9 100644
--- a/solutions/observability/synthetics/analyze-data.md
+++ b/solutions/observability/synthetics/analyze-data.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Analyze monitor data"
+navigation_title: Analyze monitor data
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-analyze.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-analyze.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Analyze data from synthetic monitors
diff --git a/solutions/observability/synthetics/cli.md b/solutions/observability/synthetics/cli.md
index 5d05d24ee..cd579ba42 100644
--- a/solutions/observability/synthetics/cli.md
+++ b/solutions/observability/synthetics/cli.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Use the CLI"
+navigation_title: Use the CLI
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-command-reference.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-command-reference.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Use the Synthetics CLI [synthetics-command-reference]
diff --git a/solutions/observability/synthetics/configure-individual-browser-monitors.md b/solutions/observability/synthetics/configure-individual-browser-monitors.md
index 32782a102..3f8fe7d3b 100644
--- a/solutions/observability/synthetics/configure-individual-browser-monitors.md
+++ b/solutions/observability/synthetics/configure-individual-browser-monitors.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Configure individual monitors"
+navigation_title: Configure individual monitors
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-monitor-use.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-monitor-use.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Configure individual browser monitors [synthetics-monitor-use]
diff --git a/solutions/observability/synthetics/configure-lightweight-monitors.md b/solutions/observability/synthetics/configure-lightweight-monitors.md
index 13ba51fcb..d4c1b3602 100644
--- a/solutions/observability/synthetics/configure-lightweight-monitors.md
+++ b/solutions/observability/synthetics/configure-lightweight-monitors.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Configure lightweight monitors [synthetics-lightweight]
diff --git a/solutions/observability/synthetics/configure-projects.md b/solutions/observability/synthetics/configure-projects.md
index ef9e0b36d..f6796f44d 100644
--- a/solutions/observability/synthetics/configure-projects.md
+++ b/solutions/observability/synthetics/configure-projects.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Configure a Synthetics project [observability-synthetics-configuration]
diff --git a/solutions/observability/synthetics/configure-settings.md b/solutions/observability/synthetics/configure-settings.md
index 30beb1e2f..eacb61b00 100644
--- a/solutions/observability/synthetics/configure-settings.md
+++ b/solutions/observability/synthetics/configure-settings.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: observability
 ---
 
 # Configure Synthetics settings [synthetics-settings]
diff --git a/solutions/observability/synthetics/create-monitors-ui.md b/solutions/observability/synthetics/create-monitors-ui.md
index 651648ec7..87af47cb3 100644
--- a/solutions/observability/synthetics/create-monitors-ui.md
+++ b/solutions/observability/synthetics/create-monitors-ui.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Use the Synthetics UI"
+navigation_title: Use the Synthetics UI
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-get-started-ui.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-get-started-ui.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create monitors in the Synthetics UI [synthetics-get-started-ui]
diff --git a/solutions/observability/synthetics/create-monitors-with-projects.md b/solutions/observability/synthetics/create-monitors-with-projects.md
index c345a0848..289ce5931 100644
--- a/solutions/observability/synthetics/create-monitors-with-projects.md
+++ b/solutions/observability/synthetics/create-monitors-with-projects.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Use a Synthetics project"
+navigation_title: Use a Synthetics project
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-get-started-project.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-get-started-project.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Create monitors with a Synthetics project [observability-synthetics-get-started-project]
diff --git a/solutions/observability/synthetics/encryption-security.md b/solutions/observability/synthetics/encryption-security.md
index 6b6b3792a..6ef5fbca6 100644
--- a/solutions/observability/synthetics/encryption-security.md
+++ b/solutions/observability/synthetics/encryption-security.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Synthetics Encryption and Security [synthetics-security-encryption]
diff --git a/solutions/observability/synthetics/get-started.md b/solutions/observability/synthetics/get-started.md
index d5726f155..229ec7d5c 100644
--- a/solutions/observability/synthetics/get-started.md
+++ b/solutions/observability/synthetics/get-started.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Get started [observability-synthetics-get-started]
diff --git a/solutions/observability/synthetics/grant-access-to-secured-resources.md b/solutions/observability/synthetics/grant-access-to-secured-resources.md
index 6a9985a4e..87050b0a5 100644
--- a/solutions/observability/synthetics/grant-access-to-secured-resources.md
+++ b/solutions/observability/synthetics/grant-access-to-secured-resources.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Grant users access to secured resources [observability-synthetics-feature-roles]
diff --git a/solutions/observability/synthetics/index.md b/solutions/observability/synthetics/index.md
index ede9682f7..98ad5f9d8 100644
--- a/solutions/observability/synthetics/index.md
+++ b/solutions/observability/synthetics/index.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Synthetic monitoring [monitor-uptime-synthetics]
diff --git a/solutions/observability/synthetics/manage-data-retention.md b/solutions/observability/synthetics/manage-data-retention.md
index 506630ec2..0e4d2f362 100644
--- a/solutions/observability/synthetics/manage-data-retention.md
+++ b/solutions/observability/synthetics/manage-data-retention.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Manage data retention [synthetics-manage-retention]
diff --git a/solutions/observability/synthetics/manage-monitors.md b/solutions/observability/synthetics/manage-monitors.md
index 290221cec..ae36a4d37 100644
--- a/solutions/observability/synthetics/manage-monitors.md
+++ b/solutions/observability/synthetics/manage-monitors.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Manage monitors [synthetics-manage-monitors]
diff --git a/solutions/observability/synthetics/mfa-for-browser-monitors.md b/solutions/observability/synthetics/mfa-for-browser-monitors.md
index ee2649449..77e7dca5c 100644
--- a/solutions/observability/synthetics/mfa-for-browser-monitors.md
+++ b/solutions/observability/synthetics/mfa-for-browser-monitors.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Multi-factor Authentication"
+navigation_title: Multi-factor Authentication
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-mfa.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-mfa.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Multi-factor Authentication (MFA) for browser monitors [synthetics-mfa]
diff --git a/solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md b/solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
index cb31dd2af..7734adc19 100644
--- a/solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
+++ b/solutions/observability/synthetics/migrate-from-elastic-synthetics-integration.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-migrate-from-integration.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Migrate from the Elastic Synthetics integration [synthetics-migrate-from-integration]
diff --git a/solutions/observability/synthetics/monitor-resources-on-private-networks.md b/solutions/observability/synthetics/monitor-resources-on-private-networks.md
index 5e506121a..31a940a25 100644
--- a/solutions/observability/synthetics/monitor-resources-on-private-networks.md
+++ b/solutions/observability/synthetics/monitor-resources-on-private-networks.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Monitor resources on private networks [synthetics-private-location]
diff --git a/solutions/observability/synthetics/reader-role.md b/solutions/observability/synthetics/reader-role.md
index 8366e09b5..58a7775e4 100644
--- a/solutions/observability/synthetics/reader-role.md
+++ b/solutions/observability/synthetics/reader-role.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-role-read.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Reader role [synthetics-role-read]
diff --git a/solutions/observability/synthetics/scale-architect-synthetics-deployment.md b/solutions/observability/synthetics/scale-architect-synthetics-deployment.md
index b1cccdd39..3f792a331 100644
--- a/solutions/observability/synthetics/scale-architect-synthetics-deployment.md
+++ b/solutions/observability/synthetics/scale-architect-synthetics-deployment.md
@@ -1,11 +1,14 @@
 ---
-navigation_title: "Scale and architect a deployment"
+navigation_title: Scale and architect a deployment
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-scale-and-architect.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-scale-and-architect.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Scale and architect a Synthetics deployment [synthetics-scale-and-architect]
diff --git a/solutions/observability/synthetics/scripting-browser-monitors.md b/solutions/observability/synthetics/scripting-browser-monitors.md
index f2177ee9d..4068f868c 100644
--- a/solutions/observability/synthetics/scripting-browser-monitors.md
+++ b/solutions/observability/synthetics/scripting-browser-monitors.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Scripting browser monitors [synthetics-journeys]
diff --git a/solutions/observability/synthetics/setup-role.md b/solutions/observability/synthetics/setup-role.md
index 46118fc44..33144022c 100644
--- a/solutions/observability/synthetics/setup-role.md
+++ b/solutions/observability/synthetics/setup-role.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-role-setup.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Setup role [synthetics-role-setup]
diff --git a/solutions/observability/synthetics/support-matrix.md b/solutions/observability/synthetics/support-matrix.md
index 6a17c68bf..444d8ca5b 100644
--- a/solutions/observability/synthetics/support-matrix.md
+++ b/solutions/observability/synthetics/support-matrix.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-support-matrix.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Synthetics support matrix [synthetics-support-matrix]
diff --git a/solutions/observability/synthetics/traffic-filters.md b/solutions/observability/synthetics/traffic-filters.md
index 4ea30116b..9be6d774f 100644
--- a/solutions/observability/synthetics/traffic-filters.md
+++ b/solutions/observability/synthetics/traffic-filters.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-traffic-filters.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Use Synthetics with traffic filters [synthetics-traffic-filters]
diff --git a/solutions/observability/synthetics/use-synthetics-recorder.md b/solutions/observability/synthetics/use-synthetics-recorder.md
index 2c9c84378..2ec7567bc 100644
--- a/solutions/observability/synthetics/use-synthetics-recorder.md
+++ b/solutions/observability/synthetics/use-synthetics-recorder.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Use the Synthetics Recorder [synthetics-recorder]
diff --git a/solutions/observability/synthetics/work-with-params-secrets.md b/solutions/observability/synthetics/work-with-params-secrets.md
index c5d418caa..1b983dd49 100644
--- a/solutions/observability/synthetics/work-with-params-secrets.md
+++ b/solutions/observability/synthetics/work-with-params-secrets.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Work with params and secrets [observability-synthetics-params-secrets]
diff --git a/solutions/observability/synthetics/write-synthetic-test.md b/solutions/observability/synthetics/write-synthetic-test.md
index 4a570f01c..f8b70180c 100644
--- a/solutions/observability/synthetics/write-synthetic-test.md
+++ b/solutions/observability/synthetics/write-synthetic-test.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Write a synthetic test [synthetics-create-test]
diff --git a/solutions/observability/synthetics/writer-role.md b/solutions/observability/synthetics/writer-role.md
index 934ffb104..ba6c13e40 100644
--- a/solutions/observability/synthetics/writer-role.md
+++ b/solutions/observability/synthetics/writer-role.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-role-write.html
 applies_to:
   stack:
+products:
+  - id: observability
 ---
 
 # Writer role [synthetics-role-write]
diff --git a/solutions/observability/uptime/analyze-monitors.md b/solutions/observability/uptime/analyze-monitors.md
index a3cbce403..dc968398c 100644
--- a/solutions/observability/uptime/analyze-monitors.md
+++ b/solutions/observability/uptime/analyze-monitors.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Analyze monitors [analyze-monitors]
diff --git a/solutions/observability/uptime/analyze.md b/solutions/observability/uptime/analyze.md
index 0e9503bea..091ea19a3 100644
--- a/solutions/observability/uptime/analyze.md
+++ b/solutions/observability/uptime/analyze.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Analyze"
+navigation_title: Analyze
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/uptime-analyze.html
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Analyze [uptime-analyze]
diff --git a/solutions/observability/uptime/configure-settings.md b/solutions/observability/uptime/configure-settings.md
index 57d7902c9..e84650f97 100644
--- a/solutions/observability/uptime/configure-settings.md
+++ b/solutions/observability/uptime/configure-settings.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Configure settings [configure-uptime-settings]
diff --git a/solutions/observability/uptime/get-started.md b/solutions/observability/uptime/get-started.md
index b4646fd44..05f462658 100644
--- a/solutions/observability/uptime/get-started.md
+++ b/solutions/observability/uptime/get-started.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Get started"
+navigation_title: Get started
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/uptime-get-started.html
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Get started with Uptime [uptime-get-started]
diff --git a/solutions/observability/uptime/index.md b/solutions/observability/uptime/index.md
index 34a382a8e..38983d39f 100644
--- a/solutions/observability/uptime/index.md
+++ b/solutions/observability/uptime/index.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Uptime monitoring (deprecated) [uptime-intro]
diff --git a/solutions/observability/uptime/inspect-duration-anomalies.md b/solutions/observability/uptime/inspect-duration-anomalies.md
index 492a6148d..81d080f33 100644
--- a/solutions/observability/uptime/inspect-duration-anomalies.md
+++ b/solutions/observability/uptime/inspect-duration-anomalies.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # Inspect uptime duration anomalies [inspect-uptime-duration-anomalies]
diff --git a/solutions/observability/uptime/view-monitor-status.md b/solutions/observability/uptime/view-monitor-status.md
index 968350e73..d205fdc7d 100644
--- a/solutions/observability/uptime/view-monitor-status.md
+++ b/solutions/observability/uptime/view-monitor-status.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
+products:
+  - id: observability
 ---
 
 # View monitor status [view-monitor-status]
diff --git a/solutions/search.md b/solutions/search.md
index e81a91c90..84f094b97 100644
--- a/solutions/search.md
+++ b/solutions/search.md
@@ -1,11 +1,15 @@
 ---
-applies_to:
-  stack:
-  serverless:
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-with-elasticsearch.html
   - https://www.elastic.co/guide/en/serverless/current/what-is-elasticsearch-serverless.html
   - https://www.elastic.co/guide/en/kibana/current/search-space.html
+applies_to:
+  stack:
+  serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Elasticsearch
diff --git a/solutions/search/api-quickstarts.md b/solutions/search/api-quickstarts.md
index b2c410ce9..b8fa91978 100644
--- a/solutions/search/api-quickstarts.md
+++ b/solutions/search/api-quickstarts.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 # API quickstarts
 
diff --git a/solutions/search/apis-and-tools.md b/solutions/search/apis-and-tools.md
index 86722ffc9..6b7809836 100644
--- a/solutions/search/apis-and-tools.md
+++ b/solutions/search/apis-and-tools.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # APIs and tools
diff --git a/solutions/search/async-search-api.md b/solutions/search/async-search-api.md
index 61aa2b68d..871285e78 100644
--- a/solutions/search/async-search-api.md
+++ b/solutions/search/async-search-api.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: The `async-search` API
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search-intro.html
-navigation_title: The `async-search` API
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Long running searches with the Async Search API [async-search-intro]
diff --git a/solutions/search/cross-cluster-search.md b/solutions/search/cross-cluster-search.md
index 87f16cc70..dcba194ab 100644
--- a/solutions/search/cross-cluster-search.md
+++ b/solutions/search/cross-cluster-search.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless: unavailable
+products:
+  - id: elasticsearch
 ---
 
 # Cross-cluster search [modules-cross-cluster-search]
diff --git a/solutions/search/esql-for-search.md b/solutions/search/esql-for-search.md
index b7a995079..34a055690 100644
--- a/solutions/search/esql-for-search.md
+++ b/solutions/search/esql-for-search.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: preview
   serverless: preview
+products:
+  - id: elasticsearch
 ---
 
 % ℹ️ 8.x version of this doc lives in elasticsearch repo
diff --git a/solutions/search/esql-search-tutorial.md b/solutions/search/esql-search-tutorial.md
index ee4e30bf2..22f4e7b4a 100644
--- a/solutions/search/esql-search-tutorial.md
+++ b/solutions/search/esql-search-tutorial.md
@@ -2,7 +2,7 @@
 applies_to:
   stack: preview 9.0
   serverless: preview
-navigation_title: "Search and filter with ES|QL"
+navigation_title: Search and filter with ES|QL
 ---
 
 # Tutorial: Search and filter with {{esql}}
diff --git a/solutions/search/full-text.md b/solutions/search/full-text.md
index af925eff3..72d29ea46 100644
--- a/solutions/search/full-text.md
+++ b/solutions/search/full-text.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Full-text search [full-text-search]
diff --git a/solutions/search/full-text/search-relevance.md b/solutions/search/full-text/search-relevance.md
index 616fa7918..7e22cc951 100644
--- a/solutions/search/full-text/search-relevance.md
+++ b/solutions/search/full-text/search-relevance.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/recipes.html
 applies_to:
   stack:
   serverless:
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/recipes.html
+products:
+  - id: elasticsearch
 ---
 
 # Search relevance optimizations
diff --git a/solutions/search/full-text/search-relevance/consistent-scoring.md b/solutions/search/full-text/search-relevance/consistent-scoring.md
index 69f059d33..9e903a721 100644
--- a/solutions/search/full-text/search-relevance/consistent-scoring.md
+++ b/solutions/search/full-text/search-relevance/consistent-scoring.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Getting consistent scoring [consistent-scoring]
diff --git a/solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md b/solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md
index 716c748fc..0b0358b82 100644
--- a/solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md
+++ b/solutions/search/full-text/search-relevance/mixing-exact-search-with-stemming.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Mixing exact search with stemming [mixing-exact-search-with-stemming]
diff --git a/solutions/search/full-text/search-relevance/static-scoring-signals.md b/solutions/search/full-text/search-relevance/static-scoring-signals.md
index baa4eb6b7..e963a216e 100644
--- a/solutions/search/full-text/search-relevance/static-scoring-signals.md
+++ b/solutions/search/full-text/search-relevance/static-scoring-signals.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Incorporating static relevance signals into the score [static-scoring-signals]
diff --git a/solutions/search/full-text/search-with-synonyms.md b/solutions/search/full-text/search-with-synonyms.md
index 53bbad863..1b45b82e4 100644
--- a/solutions/search/full-text/search-with-synonyms.md
+++ b/solutions/search/full-text/search-with-synonyms.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Search with synonyms
diff --git a/solutions/search/full-text/text-analysis-during-search.md b/solutions/search/full-text/text-analysis-during-search.md
index 7bb34715c..2754b9e5c 100644
--- a/solutions/search/full-text/text-analysis-during-search.md
+++ b/solutions/search/full-text/text-analysis-during-search.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Text analysis during search [analysis]
diff --git a/solutions/search/get-started.md b/solutions/search/get-started.md
index 9ab98f2d6..61c0c1527 100644
--- a/solutions/search/get-started.md
+++ b/solutions/search/get-started.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Get started
diff --git a/solutions/search/hybrid-semantic-text.md b/solutions/search/hybrid-semantic-text.md
index 384f71e88..639d642d3 100644
--- a/solutions/search/hybrid-semantic-text.md
+++ b/solutions/search/hybrid-semantic-text.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Hybrid search with `semantic_text`"
+navigation_title: Hybrid search with `semantic_text`
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/semantic-text-hybrid-search.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Hybrid search with `semantic_text` [semantic-text-hybrid-search]
diff --git a/solutions/search/ingest-for-search.md b/solutions/search/ingest-for-search.md
index 57d345302..81bb47622 100644
--- a/solutions/search/ingest-for-search.md
+++ b/solutions/search/ingest-for-search.md
@@ -7,6 +7,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Ingest for search use cases
diff --git a/solutions/search/mcp.md b/solutions/search/mcp.md
index e799b4e95..65ac07034 100644
--- a/solutions/search/mcp.md
+++ b/solutions/search/mcp.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "MCP server"
+navigation_title: MCP server
 applies_to:
   stack:
   serverless:
diff --git a/solutions/search/querydsl-full-text-filter-tutorial.md b/solutions/search/querydsl-full-text-filter-tutorial.md
index 97b0e7906..ac9ad9b06 100644
--- a/solutions/search/querydsl-full-text-filter-tutorial.md
+++ b/solutions/search/querydsl-full-text-filter-tutorial.md
@@ -1,10 +1,12 @@
 ---
+navigation_title: Search and filter with Query DSL
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/full-text-filter-tutorial.html
-navigation_title: "Search and filter with Query DSL"
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Full-text search and filtering with Query DSL [full-text-filter-tutorial]
diff --git a/solutions/search/querying-for-search.md b/solutions/search/querying-for-search.md
index 25b05e866..7469547ae 100644
--- a/solutions/search/querying-for-search.md
+++ b/solutions/search/querying-for-search.md
@@ -1,13 +1,16 @@
 ---
+navigation_title: Build search queries
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/8.18/search-with-elasticsearch.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-your-data.html
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-search-your-data.html
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-search-your-data-the-search-api.html
-navigation_title: Build search queries
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Build your search queries
diff --git a/solutions/search/rag.md b/solutions/search/rag.md
index 82aa98fd9..c8f2c3e9b 100644
--- a/solutions/search/rag.md
+++ b/solutions/search/rag.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # RAG [_retrieval_augmented_generation]
diff --git a/solutions/search/rag/playground-context.md b/solutions/search/rag/playground-context.md
index 4a1a060b6..121f5ddb1 100644
--- a/solutions/search/rag/playground-context.md
+++ b/solutions/search/rag/playground-context.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
 ---
 
 # Optimize model context [playground-context]
diff --git a/solutions/search/rag/playground-query.md b/solutions/search/rag/playground-query.md
index 86218235d..f8fe10643 100644
--- a/solutions/search/rag/playground-query.md
+++ b/solutions/search/rag/playground-query.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
 ---
 
 # View and modify queries [playground-query]
diff --git a/solutions/search/rag/playground-troubleshooting.md b/solutions/search/rag/playground-troubleshooting.md
index ff61c2a8a..1b86f39c5 100644
--- a/solutions/search/rag/playground-troubleshooting.md
+++ b/solutions/search/rag/playground-troubleshooting.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
 ---
 
 # Troubleshooting [playground-troubleshooting]
diff --git a/solutions/search/rag/playground.md b/solutions/search/rag/playground.md
index 53c1e8578..97433adf1 100644
--- a/solutions/search/rag/playground.md
+++ b/solutions/search/rag/playground.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Playground [playground]
diff --git a/solutions/search/ranking.md b/solutions/search/ranking.md
index 3fd64fb43..f8cacebfa 100644
--- a/solutions/search/ranking.md
+++ b/solutions/search/ranking.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Ranking and reranking [re-ranking-overview]
diff --git a/solutions/search/ranking/learning-to-rank-ltr.md b/solutions/search/ranking/learning-to-rank-ltr.md
index dc30c7acd..6591961f8 100644
--- a/solutions/search/ranking/learning-to-rank-ltr.md
+++ b/solutions/search/ranking/learning-to-rank-ltr.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Learning To Rank (LTR) [learning-to-rank]
diff --git a/solutions/search/ranking/learning-to-rank-model-training.md b/solutions/search/ranking/learning-to-rank-model-training.md
index 881a610c9..5351acede 100644
--- a/solutions/search/ranking/learning-to-rank-model-training.md
+++ b/solutions/search/ranking/learning-to-rank-model-training.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Deploy and manage LTR models"
+navigation_title: Deploy and manage LTR models
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/learning-to-rank-model-training.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/ranking/learning-to-rank-search-usage.md b/solutions/search/ranking/learning-to-rank-search-usage.md
index 48509d792..3a3d913a5 100644
--- a/solutions/search/ranking/learning-to-rank-search-usage.md
+++ b/solutions/search/ranking/learning-to-rank-search-usage.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Search using LTR"
+navigation_title: Search using LTR
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/learning-to-rank-search-usage.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/ranking/semantic-reranking.md b/solutions/search/ranking/semantic-reranking.md
index 8e96e69cf..97295ee4c 100644
--- a/solutions/search/ranking/semantic-reranking.md
+++ b/solutions/search/ranking/semantic-reranking.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Semantic reranking [semantic-reranking]
diff --git a/solutions/search/retrievers-examples.md b/solutions/search/retrievers-examples.md
index eff9238c9..29fb88216 100644
--- a/solutions/search/retrievers-examples.md
+++ b/solutions/search/retrievers-examples.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Retrievers examples [retrievers-examples]
diff --git a/solutions/search/retrievers-overview.md b/solutions/search/retrievers-overview.md
index a9a618f06..20eead7bb 100644
--- a/solutions/search/retrievers-overview.md
+++ b/solutions/search/retrievers-overview.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Retrievers [retrievers-overview]
diff --git a/solutions/search/run-elasticsearch-locally.md b/solutions/search/run-elasticsearch-locally.md
index c92984f61..6c53c7827 100644
--- a/solutions/search/run-elasticsearch-locally.md
+++ b/solutions/search/run-elasticsearch-locally.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Run {{es}} locally"
+navigation_title: Run {{es}} locally
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/run-elasticsearch-locally.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Run {{es}} locally [run-elasticsearch-locally]
diff --git a/solutions/search/search-applications.md b/solutions/search/search-applications.md
index fa0ad1850..03482334a 100644
--- a/solutions/search/search-applications.md
+++ b/solutions/search/search-applications.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Search Applications"
+navigation_title: Search Applications
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-application-overview.html
 applies_to:
   stack: beta
   serverless: beta
+products:
+  - id: elasticsearch
 ---
 
 # Search applications [search-application-overview]
diff --git a/solutions/search/search-applications/search-application-api.md b/solutions/search/search-applications/search-application-api.md
index 9460489b6..932a7ff3b 100644
--- a/solutions/search/search-applications/search-application-api.md
+++ b/solutions/search/search-applications/search-application-api.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Search API and templates"
+navigation_title: Search API and templates
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-application-api.html
 applies_to:
   stack: beta
   serverless: beta
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/search-applications/search-application-client.md b/solutions/search/search-applications/search-application-client.md
index 716f1262b..714c9ea8c 100644
--- a/solutions/search/search-applications/search-application-client.md
+++ b/solutions/search/search-applications/search-application-client.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Search Application client guide"
+navigation_title: Search Application client guide
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-application-client.html
 applies_to:
   stack: beta
   serverless: beta
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/search-applications/search-application-security.md b/solutions/search/search-applications/search-application-security.md
index 2cb5360cf..5aa2a998a 100644
--- a/solutions/search/search-applications/search-application-security.md
+++ b/solutions/search/search-applications/search-application-security.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Security"
+navigation_title: Security
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-application-security.html
 applies_to:
   stack: beta
   serverless: beta
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/search-connection-details.md b/solutions/search/search-connection-details.md
index 067784d72..cf8e6b2e5 100644
--- a/solutions/search/search-connection-details.md
+++ b/solutions/search/search-connection-details.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Find connection details"
+navigation_title: Find connection details
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/search-space-connection-details.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: kibana
 ---
 
 # Find your connection details [search-space-connection-details]
diff --git a/solutions/search/search-pipelines.md b/solutions/search/search-pipelines.md
index b582d28ab..0ea177e22 100644
--- a/solutions/search/search-pipelines.md
+++ b/solutions/search/search-pipelines.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/8.18/ingest-pipeline-search.html
 applies_to:
   stack:
+products:
+  - id: elasticsearch
 ---
 
 # Ingest pipelines for search use cases [ingest-pipeline-search]
diff --git a/solutions/search/search-templates.md b/solutions/search/search-templates.md
index 8755a4c6b..e03c1ab67 100644
--- a/solutions/search/search-templates.md
+++ b/solutions/search/search-templates.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Search templates [search-template]
diff --git a/solutions/search/semantic-search.md b/solutions/search/semantic-search.md
index cf8741b40..ba654ec75 100644
--- a/solutions/search/semantic-search.md
+++ b/solutions/search/semantic-search.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Semantic search [semantic-search]
diff --git a/solutions/search/semantic-search/cohere-es.md b/solutions/search/semantic-search/cohere-es.md
index 0c118ff94..03d287814 100644
--- a/solutions/search/semantic-search/cohere-es.md
+++ b/solutions/search/semantic-search/cohere-es.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Using Cohere with {{es}}"
+navigation_title: Using Cohere with {{es}}
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/cohere-es.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md b/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md
index aea3177b1..de7deaeb7 100644
--- a/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md
+++ b/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Semantic search with ELSER (ingest pipelines)"
+navigation_title: Semantic search with ELSER (ingest pipelines)
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/semantic-search-elser.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/solutions/search/semantic-search/semantic-search-inference.md b/solutions/search/semantic-search/semantic-search-inference.md
index 63c4f3977..d2482f180 100644
--- a/solutions/search/semantic-search/semantic-search-inference.md
+++ b/solutions/search/semantic-search/semantic-search-inference.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Semantic search with the {{infer}} API"
+navigation_title: Semantic search with the {{infer}} API
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/semantic-search-inference.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Semantic search with the inference API [semantic-search-inference]
diff --git a/solutions/search/semantic-search/semantic-search-semantic-text.md b/solutions/search/semantic-search/semantic-search-semantic-text.md
index 17027c4eb..d63373909 100644
--- a/solutions/search/semantic-search/semantic-search-semantic-text.md
+++ b/solutions/search/semantic-search/semantic-search-semantic-text.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Semantic search with `semantic_text`"
+navigation_title: Semantic search with `semantic_text`
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/semantic-search-semantic-text.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Semantic search with `semantic_text` [semantic-search-semantic-text]
diff --git a/solutions/search/serverless-elasticsearch-get-started.md b/solutions/search/serverless-elasticsearch-get-started.md
index 8d4ca0c40..1c57acaed 100644
--- a/solutions/search/serverless-elasticsearch-get-started.md
+++ b/solutions/search/serverless-elasticsearch-get-started.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Get started on Serverless"
+navigation_title: Get started on Serverless
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/elasticsearch-connecting-to-es-serverless-endpoint.html
 applies_to:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Get started with {{es}} Serverless [elasticsearch-get-started]
diff --git a/solutions/search/site-or-app.md b/solutions/search/site-or-app.md
index 62fe4f283..24e99ceaf 100644
--- a/solutions/search/site-or-app.md
+++ b/solutions/search/site-or-app.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Add search to your app"
+navigation_title: Add search to your app
 applies_to:
   stack:
   serverless:
diff --git a/solutions/search/site-or-app/clients.md b/solutions/search/site-or-app/clients.md
index b0c6443ee..89631e077 100644
--- a/solutions/search/site-or-app/clients.md
+++ b/solutions/search/site-or-app/clients.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 
 # Client libraries [elasticsearch-clients]
diff --git a/solutions/search/site-or-app/search-ui.md b/solutions/search/site-or-app/search-ui.md
index b6caf5827..00836a98a 100644
--- a/solutions/search/site-or-app/search-ui.md
+++ b/solutions/search/site-or-app/search-ui.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Search UI"
+navigation_title: Search UI
 mapped_pages:
   - https://www.elastic.co/guide/en/search-ui/current/overview.html
   - https://www.elastic.co/guide/en/search-ui/current/index.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: search-ui
 ---
 
 # What is Search UI? [overview]
diff --git a/solutions/search/the-search-api.md b/solutions/search/the-search-api.md
index 72bfa0ca4..70fc53e15 100644
--- a/solutions/search/the-search-api.md
+++ b/solutions/search/the-search-api.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: cloud-serverless
 ---
 # The `_search` API [search-your-data]
 
diff --git a/solutions/search/using-resolve-cluster-endpoint-before-cross-cluster-search.md b/solutions/search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
index 047e8290c..f7158819f 100644
--- a/solutions/search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
+++ b/solutions/search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless: unavailable
+products:
+  - id: elasticsearch
 ---
 
 # Resolve a cluster before {{ccs}} [_advantages_of_using_this_endpoint_before_a_ccs]
diff --git a/solutions/search/vector/bring-own-vectors.md b/solutions/search/vector/bring-own-vectors.md
index 1d0c35790..b6302884e 100644
--- a/solutions/search/vector/bring-own-vectors.md
+++ b/solutions/search/vector/bring-own-vectors.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Bring your own dense vectors"
+navigation_title: Bring your own dense vectors
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/bring-your-own-vectors.html
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Bring your own dense vectors [bring-your-own-vectors]
diff --git a/solutions/search/vector/dense-versus-sparse-ingest-pipelines.md b/solutions/search/vector/dense-versus-sparse-ingest-pipelines.md
index dfec1642f..a22ef198b 100644
--- a/solutions/search/vector/dense-versus-sparse-ingest-pipelines.md
+++ b/solutions/search/vector/dense-versus-sparse-ingest-pipelines.md
@@ -5,6 +5,8 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
 ---
 
 # Tutorial: Dense and sparse workflows using ingest pipelines [semantic-search-deployed-nlp-model]
diff --git a/solutions/search/vector/knn.md b/solutions/search/vector/knn.md
index ef7b5ed46..a8f9f3676 100644
--- a/solutions/search/vector/knn.md
+++ b/solutions/search/vector/knn.md
@@ -5,6 +5,9 @@ mapped_pages:
 applies_to:
   stack:
   serverless:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # kNN search [knn-search]
diff --git a/solutions/security.md b/solutions/security.md
index 14dab3b48..699b44d86 100644
--- a/solutions/security.md
+++ b/solutions/security.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Security"
+navigation_title: Security
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/index.html
   - https://www.elastic.co/guide/en/security/current/es-overview.html
@@ -9,6 +9,10 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # {{elastic-sec}} overview [es-overview]
diff --git a/solutions/security/advanced-entity-analytics.md b/solutions/security/advanced-entity-analytics.md
index 612351668..91bde5b11 100644
--- a/solutions/security/advanced-entity-analytics.md
+++ b/solutions/security/advanced-entity-analytics.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Advanced Entity Analytics [advanced-entity-analytics-overview]
diff --git a/solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md b/solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
index 0e0013388..290e7cb67 100644
--- a/solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
+++ b/solutions/security/advanced-entity-analytics/advanced-behavioral-detections.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Advanced behavioral detections [advanced-behavioral-detections]
diff --git a/solutions/security/advanced-entity-analytics/anomaly-detection.md b/solutions/security/advanced-entity-analytics/anomaly-detection.md
index acd2f752f..1d6890d7c 100644
--- a/solutions/security/advanced-entity-analytics/anomaly-detection.md
+++ b/solutions/security/advanced-entity-analytics/anomaly-detection.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Anomaly detection
diff --git a/solutions/security/advanced-entity-analytics/asset-criticality.md b/solutions/security/advanced-entity-analytics/asset-criticality.md
index 1e599bb50..3a09beae6 100644
--- a/solutions/security/advanced-entity-analytics/asset-criticality.md
+++ b/solutions/security/advanced-entity-analytics/asset-criticality.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Asset criticality [asset-criticality]
diff --git a/solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md b/solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
index d1c6262bf..2a9e659f2 100644
--- a/solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
+++ b/solutions/security/advanced-entity-analytics/behavioral-detection-use-cases.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Behavioral detection use cases
diff --git a/solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md b/solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
index 161767880..f713e0303 100644
--- a/solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
+++ b/solutions/security/advanced-entity-analytics/entity-risk-scoring-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Entity risk scoring requirements
diff --git a/solutions/security/advanced-entity-analytics/entity-risk-scoring.md b/solutions/security/advanced-entity-analytics/entity-risk-scoring.md
index e7ae8dfad..1b6be4caa 100644
--- a/solutions/security/advanced-entity-analytics/entity-risk-scoring.md
+++ b/solutions/security/advanced-entity-analytics/entity-risk-scoring.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Entity risk scoring [security-entity-risk-scoring]
diff --git a/solutions/security/advanced-entity-analytics/entity-store.md b/solutions/security/advanced-entity-analytics/entity-store.md
index e3e6fbc27..35c84824d 100644
--- a/solutions/security/advanced-entity-analytics/entity-store.md
+++ b/solutions/security/advanced-entity-analytics/entity-store.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
 ---
 
 # Entity store [entity-store]
diff --git a/solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md b/solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
index b660be7fc..bddd06f94 100644
--- a/solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
+++ b/solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Machine learning job and rule requirements
diff --git a/solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md b/solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
index d399fd876..49f7b677b 100644
--- a/solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
+++ b/solutions/security/advanced-entity-analytics/optimizing-anomaly-results.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Optimizing anomaly results [tuning-anomaly-results]
diff --git a/solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md b/solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
index c34961e69..1c2ae9b91 100644
--- a/solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
+++ b/solutions/security/advanced-entity-analytics/turn-on-risk-scoring-engine.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Turn on the risk scoring engine
diff --git a/solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md b/solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
index f3276f27c..788e767ea 100644
--- a/solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
+++ b/solutions/security/advanced-entity-analytics/view-analyze-risk-score-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # View and analyze risk score data [analyze-risk-score-data]
diff --git a/solutions/security/ai.md b/solutions/security/ai.md
index ee9d4bd40..2258dc6f5 100644
--- a/solutions/security/ai.md
+++ b/solutions/security/ai.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # AI for security
diff --git a/solutions/security/ai/ai-assistant-knowledge-base.md b/solutions/security/ai/ai-assistant-knowledge-base.md
index ceb71ef46..c66eeb666 100644
--- a/solutions/security/ai/ai-assistant-knowledge-base.md
+++ b/solutions/security/ai/ai-assistant-knowledge-base.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # AI Assistant Knowledge Base
diff --git a/solutions/security/ai/ai-assistant.md b/solutions/security/ai/ai-assistant.md
index e576a7bdc..36c840ab8 100644
--- a/solutions/security/ai/ai-assistant.md
+++ b/solutions/security/ai/ai-assistant.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # AI Assistant
diff --git a/solutions/security/ai/attack-discovery.md b/solutions/security/ai/attack-discovery.md
index 9c9b3abbf..0c46beae4 100644
--- a/solutions/security/ai/attack-discovery.md
+++ b/solutions/security/ai/attack-discovery.md
@@ -6,6 +6,9 @@ applies_to:
   stack: preview
   serverless:
     security: preview
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Attack Discovery
diff --git a/solutions/security/ai/connect-to-amazon-bedrock.md b/solutions/security/ai/connect-to-amazon-bedrock.md
index 097eec431..fce05e1f5 100644
--- a/solutions/security/ai/connect-to-amazon-bedrock.md
+++ b/solutions/security/ai/connect-to-amazon-bedrock.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Connect to Amazon Bedrock
diff --git a/solutions/security/ai/connect-to-azure-openai.md b/solutions/security/ai/connect-to-azure-openai.md
index 389c21c16..9e8cd872b 100644
--- a/solutions/security/ai/connect-to-azure-openai.md
+++ b/solutions/security/ai/connect-to-azure-openai.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Connect to Azure OpenAI
diff --git a/solutions/security/ai/connect-to-google-vertex.md b/solutions/security/ai/connect-to-google-vertex.md
index 69a484a63..a72513119 100644
--- a/solutions/security/ai/connect-to-google-vertex.md
+++ b/solutions/security/ai/connect-to-google-vertex.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Connect to Google Vertex
diff --git a/solutions/security/ai/connect-to-openai.md b/solutions/security/ai/connect-to-openai.md
index 9307ad9ad..30df8f356 100644
--- a/solutions/security/ai/connect-to-openai.md
+++ b/solutions/security/ai/connect-to-openai.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Connect to OpenAI
diff --git a/solutions/security/ai/connect-to-own-local-llm.md b/solutions/security/ai/connect-to-own-local-llm.md
index 6bce3306b..ac38c2dab 100644
--- a/solutions/security/ai/connect-to-own-local-llm.md
+++ b/solutions/security/ai/connect-to-own-local-llm.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Connect to your own local LLM
diff --git a/solutions/security/ai/generate-customize-learn-about-esorql-queries.md b/solutions/security/ai/generate-customize-learn-about-esorql-queries.md
index 7674f2be7..4c64c620c 100644
--- a/solutions/security/ai/generate-customize-learn-about-esorql-queries.md
+++ b/solutions/security/ai/generate-customize-learn-about-esorql-queries.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Generate, customize, and learn about ES|QL queries
diff --git a/solutions/security/ai/identify-investigate-document-threats.md b/solutions/security/ai/identify-investigate-document-threats.md
index 526769bf7..aa0fba14f 100644
--- a/solutions/security/ai/identify-investigate-document-threats.md
+++ b/solutions/security/ai/identify-investigate-document-threats.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Identify, investigate, and document threats
diff --git a/solutions/security/ai/large-language-model-performance-matrix.md b/solutions/security/ai/large-language-model-performance-matrix.md
index dde574b63..ad4b764c6 100644
--- a/solutions/security/ai/large-language-model-performance-matrix.md
+++ b/solutions/security/ai/large-language-model-performance-matrix.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Large language model performance matrix
diff --git a/solutions/security/ai/set-up-connectors-for-large-language-models-llm.md b/solutions/security/ai/set-up-connectors-for-large-language-models-llm.md
index 95412d7f0..badefcdc8 100644
--- a/solutions/security/ai/set-up-connectors-for-large-language-models-llm.md
+++ b/solutions/security/ai/set-up-connectors-for-large-language-models-llm.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Enable large language model (LLM) access
diff --git a/solutions/security/ai/triage-alerts.md b/solutions/security/ai/triage-alerts.md
index 5f45bb05e..a86e43cd4 100644
--- a/solutions/security/ai/triage-alerts.md
+++ b/solutions/security/ai/triage-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Triage alerts
diff --git a/solutions/security/ai/use-cases.md b/solutions/security/ai/use-cases.md
index 6a1d94a45..e62a95e73 100644
--- a/solutions/security/ai/use-cases.md
+++ b/solutions/security/ai/use-cases.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # AI use cases
diff --git a/solutions/security/asset-management.md b/solutions/security/asset-management.md
index 19f779cff..f3caa4597 100644
--- a/solutions/security/asset-management.md
+++ b/solutions/security/asset-management.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: cloud-serverless
 ---
 
 # Asset management [security-asset-management]
diff --git a/solutions/security/cloud.md b/solutions/security/cloud.md
index 8af84f815..4aaf3baf8 100644
--- a/solutions/security/cloud.md
+++ b/solutions/security/cloud.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud Security
diff --git a/solutions/security/cloud/benchmarks.md b/solutions/security/cloud/benchmarks.md
index 75a675da6..bdb7a7a8a 100644
--- a/solutions/security/cloud/benchmarks.md
+++ b/solutions/security/cloud/benchmarks.md
@@ -8,6 +8,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Benchmarks
diff --git a/solutions/security/cloud/capture-environment-variables.md b/solutions/security/cloud/capture-environment-variables.md
index ec5b843a3..cc8db590d 100644
--- a/solutions/security/cloud/capture-environment-variables.md
+++ b/solutions/security/cloud/capture-environment-variables.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Capture environment variables
diff --git a/solutions/security/cloud/cloud-native-vulnerability-management.md b/solutions/security/cloud/cloud-native-vulnerability-management.md
index ec722f4a5..3ff51a423 100644
--- a/solutions/security/cloud/cloud-native-vulnerability-management.md
+++ b/solutions/security/cloud/cloud-native-vulnerability-management.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud native vulnerability management
diff --git a/solutions/security/cloud/cloud-security-posture-management.md b/solutions/security/cloud/cloud-security-posture-management.md
index 49b1e8c1c..f4b0df90f 100644
--- a/solutions/security/cloud/cloud-security-posture-management.md
+++ b/solutions/security/cloud/cloud-security-posture-management.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud security posture management
diff --git a/solutions/security/cloud/cloud-workload-protection-for-vms.md b/solutions/security/cloud/cloud-workload-protection-for-vms.md
index fae4b4659..f54836e16 100644
--- a/solutions/security/cloud/cloud-workload-protection-for-vms.md
+++ b/solutions/security/cloud/cloud-workload-protection-for-vms.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud workload protection for VMs
diff --git a/solutions/security/cloud/cnvm-frequently-asked-questions-faq.md b/solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
index 901f8e588..786560fb6 100644
--- a/solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
+++ b/solutions/security/cloud/cnvm-frequently-asked-questions-faq.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Frequently asked questions (FAQ)
diff --git a/solutions/security/cloud/cspm-frequently-asked-questions-faq.md b/solutions/security/cloud/cspm-frequently-asked-questions-faq.md
index 572e72fe1..5d6086c97 100644
--- a/solutions/security/cloud/cspm-frequently-asked-questions-faq.md
+++ b/solutions/security/cloud/cspm-frequently-asked-questions-faq.md
@@ -8,6 +8,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Frequently asked questions (FAQ)
diff --git a/solutions/security/cloud/cspm-privilege-requirements.md b/solutions/security/cloud/cspm-privilege-requirements.md
index 63e9c9cc4..719bfbd26 100644
--- a/solutions/security/cloud/cspm-privilege-requirements.md
+++ b/solutions/security/cloud/cspm-privilege-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # CSPM privilege requirements
diff --git a/solutions/security/cloud/enable-cloud-security-features.md b/solutions/security/cloud/enable-cloud-security-features.md
index b964e6f68..296c36e3e 100644
--- a/solutions/security/cloud/enable-cloud-security-features.md
+++ b/solutions/security/cloud/enable-cloud-security-features.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   serverless:
     security: all
+products:
+  - id: cloud-serverless
 ---
 
 # Enable cloud security features in {{serverless-short}} [security-enable-cloudsec]
diff --git a/solutions/security/cloud/findings-page-2.md b/solutions/security/cloud/findings-page-2.md
index 5294d9acc..3662fafd5 100644
--- a/solutions/security/cloud/findings-page-2.md
+++ b/solutions/security/cloud/findings-page-2.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Findings page
diff --git a/solutions/security/cloud/findings-page-3.md b/solutions/security/cloud/findings-page-3.md
index 16a7389d1..f227559e7 100644
--- a/solutions/security/cloud/findings-page-3.md
+++ b/solutions/security/cloud/findings-page-3.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Findings page [security-vuln-management-findings]
diff --git a/solutions/security/cloud/findings-page.md b/solutions/security/cloud/findings-page.md
index eaeebd4d8..d47041fd6 100644
--- a/solutions/security/cloud/findings-page.md
+++ b/solutions/security/cloud/findings-page.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Findings page
diff --git a/solutions/security/cloud/get-started-with-cnvm.md b/solutions/security/cloud/get-started-with-cnvm.md
index 0b3a31fcd..21a0ba896 100644
--- a/solutions/security/cloud/get-started-with-cnvm.md
+++ b/solutions/security/cloud/get-started-with-cnvm.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Get started with CNVM
diff --git a/solutions/security/cloud/get-started-with-cspm-for-aws.md b/solutions/security/cloud/get-started-with-cspm-for-aws.md
index 2692df4a4..565da96ef 100644
--- a/solutions/security/cloud/get-started-with-cspm-for-aws.md
+++ b/solutions/security/cloud/get-started-with-cspm-for-aws.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Get started with CSPM for AWS
diff --git a/solutions/security/cloud/get-started-with-cspm-for-azure.md b/solutions/security/cloud/get-started-with-cspm-for-azure.md
index 070d44df4..0bcb230c8 100644
--- a/solutions/security/cloud/get-started-with-cspm-for-azure.md
+++ b/solutions/security/cloud/get-started-with-cspm-for-azure.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Get started with CSPM for Azure
diff --git a/solutions/security/cloud/get-started-with-cspm-for-gcp.md b/solutions/security/cloud/get-started-with-cspm-for-gcp.md
index 5d21d0146..6f1194d5f 100644
--- a/solutions/security/cloud/get-started-with-cspm-for-gcp.md
+++ b/solutions/security/cloud/get-started-with-cspm-for-gcp.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Get started with CSPM for GCP
diff --git a/solutions/security/cloud/get-started-with-kspm.md b/solutions/security/cloud/get-started-with-kspm.md
index b445d11b6..b34ae7a05 100644
--- a/solutions/security/cloud/get-started-with-kspm.md
+++ b/solutions/security/cloud/get-started-with-kspm.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Get started with KSPM
diff --git a/solutions/security/cloud/ingest-aws-security-hub-data.md b/solutions/security/cloud/ingest-aws-security-hub-data.md
index 007ebc6ca..5f5c3cc87 100644
--- a/solutions/security/cloud/ingest-aws-security-hub-data.md
+++ b/solutions/security/cloud/ingest-aws-security-hub-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Ingest AWS Security Hub data
diff --git a/solutions/security/cloud/ingest-cncf-falco-data.md b/solutions/security/cloud/ingest-cncf-falco-data.md
index 83a69285a..c84c87917 100644
--- a/solutions/security/cloud/ingest-cncf-falco-data.md
+++ b/solutions/security/cloud/ingest-cncf-falco-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Ingest CNCF Falco data
diff --git a/solutions/security/cloud/ingest-third-party-cloud-security-data.md b/solutions/security/cloud/ingest-third-party-cloud-security-data.md
index 9a2803863..30313243d 100644
--- a/solutions/security/cloud/ingest-third-party-cloud-security-data.md
+++ b/solutions/security/cloud/ingest-third-party-cloud-security-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Ingest third-party cloud security data
diff --git a/solutions/security/cloud/ingest-wiz-data.md b/solutions/security/cloud/ingest-wiz-data.md
index 12770f9ee..a4be679f1 100644
--- a/solutions/security/cloud/ingest-wiz-data.md
+++ b/solutions/security/cloud/ingest-wiz-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Ingest Wiz data
diff --git a/solutions/security/cloud/kubernetes-security-posture-management.md b/solutions/security/cloud/kubernetes-security-posture-management.md
index 49fad3bf5..e37b977ee 100644
--- a/solutions/security/cloud/kubernetes-security-posture-management.md
+++ b/solutions/security/cloud/kubernetes-security-posture-management.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Kubernetes security posture management
diff --git a/solutions/security/cloud/security-posture-management-overview.md b/solutions/security/cloud/security-posture-management-overview.md
index eb1b0db4b..dfb183a0f 100644
--- a/solutions/security/cloud/security-posture-management-overview.md
+++ b/solutions/security/cloud/security-posture-management-overview.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Security posture management overview
diff --git a/solutions/security/configure-elastic-defend.md b/solutions/security/configure-elastic-defend.md
index f766e1ccf..cdcfba52b 100644
--- a/solutions/security/configure-elastic-defend.md
+++ b/solutions/security/configure-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure endpoint protection with {{elastic-defend}} [endpoint-protection-intro]
diff --git a/solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md b/solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
index 799a80c95..c729bc3a9 100644
--- a/solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
+++ b/solutions/security/configure-elastic-defend/configure-an-integration-policy-for-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure an integration policy for {{elastic-defend}}
diff --git a/solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md b/solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
index 7606b931b..29c063f96 100644
--- a/solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
+++ b/solutions/security/configure-elastic-defend/configure-data-volume-for-elastic-endpoint.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Configure data volume"
+navigation_title: Configure data volume
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/endpoint-data-volume.html
   - https://www.elastic.co/guide/en/serverless/current/security-endpoint-data-volume.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure data volume for {{elastic-endpoint}} [endpoint-data-volume]
diff --git a/solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md b/solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
index 70b789a7b..569726d19 100644
--- a/solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
+++ b/solutions/security/configure-elastic-defend/configure-linux-file-system-monitoring.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure Linux file system monitoring
diff --git a/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md b/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
index 7d65b2d14..fad2a1060 100644
--- a/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
+++ b/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/security/current/offline-endpoint.html
 applies_to:
   stack: all
+products:
+  - id: security
 ---
 
 # Configure offline endpoints and air-gapped environments [offline-endpoint]
diff --git a/solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md b/solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
index b879a8897..faa9cdabf 100644
--- a/solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
+++ b/solutions/security/configure-elastic-defend/configure-self-healing-rollback-for-windows-endpoints.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure self-healing rollback for Windows endpoints
diff --git a/solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md b/solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
index 9c77217ab..130ea218a 100644
--- a/solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
+++ b/solutions/security/configure-elastic-defend/configure-updates-for-protection-artifacts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure updates for protection artifacts [artifact-control]
diff --git a/solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md b/solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
index cb028e33d..1b4f37607 100644
--- a/solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
+++ b/solutions/security/configure-elastic-defend/create-an-elastic-defend-policy-using-api.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
 ---
 
 # Create an Elastic Defend policy using API [create-defend-policy-api]
diff --git a/solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md b/solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
index 8d36ec9a3..bf4427db1 100644
--- a/solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
+++ b/solutions/security/configure-elastic-defend/deploy-on-macos-with-mdm.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Deploy on macOS with MDM"
+navigation_title: Deploy on macOS with MDM
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/deploy-with-mdm.html
   - https://www.elastic.co/guide/en/serverless/current/security-deploy-with-mdm.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Deploy {{elastic-defend}} on macOS with mobile device management [deploy-with-mdm]
diff --git a/solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md b/solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
index 0e9ee6985..0320c0bea 100644
--- a/solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
+++ b/solutions/security/configure-elastic-defend/elastic-defend-feature-privileges.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # {{elastic-defend}} feature privileges
diff --git a/solutions/security/configure-elastic-defend/elastic-defend-requirements.md b/solutions/security/configure-elastic-defend/elastic-defend-requirements.md
index 2ab2f91d8..281f11538 100644
--- a/solutions/security/configure-elastic-defend/elastic-defend-requirements.md
+++ b/solutions/security/configure-elastic-defend/elastic-defend-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # {{elastic-defend}} requirements [elastic-endpoint-deploy-reqs]
diff --git a/solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md b/solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md
index f8a5286e1..52eb5783f 100644
--- a/solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md
+++ b/solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Enable access for macOS Monterey
diff --git a/solutions/security/configure-elastic-defend/enable-access-for-macos-ventura-higher.md b/solutions/security/configure-elastic-defend/enable-access-for-macos-ventura-higher.md
index df700391d..993730da7 100644
--- a/solutions/security/configure-elastic-defend/enable-access-for-macos-ventura-higher.md
+++ b/solutions/security/configure-elastic-defend/enable-access-for-macos-ventura-higher.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Enable access for macOS Ventura and higher [deploy-elastic-endpoint-ven]
diff --git a/solutions/security/configure-elastic-defend/install-elastic-defend.md b/solutions/security/configure-elastic-defend/install-elastic-defend.md
index 22cd88048..df2366b2f 100644
--- a/solutions/security/configure-elastic-defend/install-elastic-defend.md
+++ b/solutions/security/configure-elastic-defend/install-elastic-defend.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Install {{elastic-defend}}"
+navigation_title: Install {{elastic-defend}}
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/install-endpoint.html
   - https://www.elastic.co/guide/en/serverless/current/security-install-edr.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Install the {{elastic-defend}} integration
diff --git a/solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md b/solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
index 23bcf5a6e..0d07ec255 100644
--- a/solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
+++ b/solutions/security/configure-elastic-defend/prevent-elastic-agent-uninstallation.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Prevent {{agent}} uninstallation
diff --git a/solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md b/solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
index 2fef90ead..1887509e1 100644
--- a/solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
+++ b/solutions/security/configure-elastic-defend/turn-off-diagnostic-data-for-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Turn off diagnostic data for {{elastic-defend}} [endpoint-diagnostic-data]
diff --git a/solutions/security/configure-elastic-defend/uninstall-elastic-agent.md b/solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
index 7c602d816..4365cc031 100644
--- a/solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
+++ b/solutions/security/configure-elastic-defend/uninstall-elastic-agent.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Uninstall {{agent}} [uninstall-agent]
diff --git a/solutions/security/dashboards.md b/solutions/security/dashboards.md
index dcb0f4cfe..8246af412 100644
--- a/solutions/security/dashboards.md
+++ b/solutions/security/dashboards.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Dashboards
diff --git a/solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md b/solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
index a7a313a91..811cd4b7a 100644
--- a/solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
+++ b/solutions/security/dashboards/cloud-native-vulnerability-management-dashboard.md
@@ -8,6 +8,9 @@ applies_to:
   stack: beta
   serverless:
     security: beta
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud Native Vulnerability Management Dashboard
diff --git a/solutions/security/dashboards/cloud-security-posture-dashboard.md b/solutions/security/dashboards/cloud-security-posture-dashboard.md
index 70a73124c..6cc83c1f1 100644
--- a/solutions/security/dashboards/cloud-security-posture-dashboard.md
+++ b/solutions/security/dashboards/cloud-security-posture-dashboard.md
@@ -10,6 +10,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cloud Security Posture dashboard
diff --git a/solutions/security/dashboards/data-quality-dashboard.md b/solutions/security/dashboards/data-quality-dashboard.md
index c66399433..a5834ecee 100644
--- a/solutions/security/dashboards/data-quality-dashboard.md
+++ b/solutions/security/dashboards/data-quality-dashboard.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Data Quality dashboard
diff --git a/solutions/security/dashboards/detection-response-dashboard.md b/solutions/security/dashboards/detection-response-dashboard.md
index 5bf372827..ca652cfeb 100644
--- a/solutions/security/dashboards/detection-response-dashboard.md
+++ b/solutions/security/dashboards/detection-response-dashboard.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Detection & Response dashboard
diff --git a/solutions/security/dashboards/detection-rule-monitoring-dashboard.md b/solutions/security/dashboards/detection-rule-monitoring-dashboard.md
index 6b13dc723..19b87f3db 100644
--- a/solutions/security/dashboards/detection-rule-monitoring-dashboard.md
+++ b/solutions/security/dashboards/detection-rule-monitoring-dashboard.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Detection rule monitoring dashboard
diff --git a/solutions/security/dashboards/entity-analytics-dashboard.md b/solutions/security/dashboards/entity-analytics-dashboard.md
index b145bb701..c2aea7978 100644
--- a/solutions/security/dashboards/entity-analytics-dashboard.md
+++ b/solutions/security/dashboards/entity-analytics-dashboard.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Entity Analytics dashboard
diff --git a/solutions/security/dashboards/overview-dashboard.md b/solutions/security/dashboards/overview-dashboard.md
index 5c272e3ba..3bcacfa55 100644
--- a/solutions/security/dashboards/overview-dashboard.md
+++ b/solutions/security/dashboards/overview-dashboard.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Overview dashboard
diff --git a/solutions/security/detect-and-alert.md b/solutions/security/detect-and-alert.md
index b585f3f3e..ed06a1b77 100644
--- a/solutions/security/detect-and-alert.md
+++ b/solutions/security/detect-and-alert.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Detections and alerts [security-detection-engine-overview]
diff --git a/solutions/security/detect-and-alert/about-building-block-rules.md b/solutions/security/detect-and-alert/about-building-block-rules.md
index 351ebb928..b62954348 100644
--- a/solutions/security/detect-and-alert/about-building-block-rules.md
+++ b/solutions/security/detect-and-alert/about-building-block-rules.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # About building block rules [security-building-block-rules]
diff --git a/solutions/security/detect-and-alert/about-detection-rules.md b/solutions/security/detect-and-alert/about-detection-rules.md
index eb1d1bd64..9191736d1 100644
--- a/solutions/security/detect-and-alert/about-detection-rules.md
+++ b/solutions/security/detect-and-alert/about-detection-rules.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # About detection rules [security-about-rules]
diff --git a/solutions/security/detect-and-alert/add-detection-alerts-to-cases.md b/solutions/security/detect-and-alert/add-detection-alerts-to-cases.md
index 21c23b67a..55ab17baf 100644
--- a/solutions/security/detect-and-alert/add-detection-alerts-to-cases.md
+++ b/solutions/security/detect-and-alert/add-detection-alerts-to-cases.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Add detection alerts to cases [security-signals-to-cases]
diff --git a/solutions/security/detect-and-alert/add-manage-exceptions.md b/solutions/security/detect-and-alert/add-manage-exceptions.md
index 2338ee16f..9bc11a0be 100644
--- a/solutions/security/detect-and-alert/add-manage-exceptions.md
+++ b/solutions/security/detect-and-alert/add-manage-exceptions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Add and manage exceptions [add-exceptions]
diff --git a/solutions/security/detect-and-alert/create-detection-rule.md b/solutions/security/detect-and-alert/create-detection-rule.md
index 1774c0a7c..a71dceea1 100644
--- a/solutions/security/detect-and-alert/create-detection-rule.md
+++ b/solutions/security/detect-and-alert/create-detection-rule.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Create a detection rule [security-rules-create]
diff --git a/solutions/security/detect-and-alert/create-manage-shared-exception-lists.md b/solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
index 33b1c5c5b..6661148e3 100644
--- a/solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
+++ b/solutions/security/detect-and-alert/create-manage-shared-exception-lists.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Create and manage shared exception lists [shared-exception-lists]
diff --git a/solutions/security/detect-and-alert/create-manage-value-lists.md b/solutions/security/detect-and-alert/create-manage-value-lists.md
index 9dd19aa00..451436681 100644
--- a/solutions/security/detect-and-alert/create-manage-value-lists.md
+++ b/solutions/security/detect-and-alert/create-manage-value-lists.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Create and manage value lists [value-lists-exceptions]
diff --git a/solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md b/solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
index f0dc1c5e5..feb0f1deb 100644
--- a/solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
+++ b/solutions/security/detect-and-alert/cross-cluster-search-detection-rules.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/security/current/rules-cross-cluster-search.html
 applies_to:
   stack: all
+products:
+  - id: security
 ---
 
 # Cross-cluster search and detection rules [rules-cross-cluster-search]
diff --git a/solutions/security/detect-and-alert/detections-requirements.md b/solutions/security/detect-and-alert/detections-requirements.md
index fff28cd3f..28df0a41f 100644
--- a/solutions/security/detect-and-alert/detections-requirements.md
+++ b/solutions/security/detect-and-alert/detections-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Detections requirements
diff --git a/solutions/security/detect-and-alert/exclude-cold-frozen-data-from-individual-rules.md b/solutions/security/detect-and-alert/exclude-cold-frozen-data-from-individual-rules.md
index afe91ef61..2b7365f49 100644
--- a/solutions/security/detect-and-alert/exclude-cold-frozen-data-from-individual-rules.md
+++ b/solutions/security/detect-and-alert/exclude-cold-frozen-data-from-individual-rules.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/security/current/exclude-cold-frozen-data-individual-rules.html
 applies_to:
   stack: all
+products:
+  - id: security
 ---
 
 # Exclude cold and frozen data from individual rules [exclude-cold-frozen-data-individual-rules]
diff --git a/solutions/security/detect-and-alert/install-manage-elastic-prebuilt-rules.md b/solutions/security/detect-and-alert/install-manage-elastic-prebuilt-rules.md
index 0e627aa90..a9694025a 100644
--- a/solutions/security/detect-and-alert/install-manage-elastic-prebuilt-rules.md
+++ b/solutions/security/detect-and-alert/install-manage-elastic-prebuilt-rules.md
@@ -1,13 +1,15 @@
 ---
+navigation_title: Use Elastic prebuilt rules
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/prebuilt-rules-management.html
   - https://www.elastic.co/guide/en/serverless/current/security-prebuilt-rules-management.html
-
-navigation_title: "Use Elastic prebuilt rules"
 applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Install and manage Elastic prebuilt rules [security-prebuilt-rules-management]
diff --git a/solutions/security/detect-and-alert/launch-timeline-from-investigation-guides.md b/solutions/security/detect-and-alert/launch-timeline-from-investigation-guides.md
index 9f40af7be..eedeef2dc 100644
--- a/solutions/security/detect-and-alert/launch-timeline-from-investigation-guides.md
+++ b/solutions/security/detect-and-alert/launch-timeline-from-investigation-guides.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Launch Timeline from investigation guides [security-interactive-investigation-guides]
diff --git a/solutions/security/detect-and-alert/manage-detection-alerts.md b/solutions/security/detect-and-alert/manage-detection-alerts.md
index 8fd13a8d8..5f4f0730f 100644
--- a/solutions/security/detect-and-alert/manage-detection-alerts.md
+++ b/solutions/security/detect-and-alert/manage-detection-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Manage detection alerts [security-alerts-manage]
diff --git a/solutions/security/detect-and-alert/manage-detection-rules.md b/solutions/security/detect-and-alert/manage-detection-rules.md
index f9ee882b6..1cd33c242 100644
--- a/solutions/security/detect-and-alert/manage-detection-rules.md
+++ b/solutions/security/detect-and-alert/manage-detection-rules.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Manage detection rules [security-rules-ui-management]
diff --git a/solutions/security/detect-and-alert/mitre-attandckr-coverage.md b/solutions/security/detect-and-alert/mitre-attandckr-coverage.md
index cc92c027c..620a1eae4 100644
--- a/solutions/security/detect-and-alert/mitre-attandckr-coverage.md
+++ b/solutions/security/detect-and-alert/mitre-attandckr-coverage.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # MITRE ATT&CK® coverage [security-rules-coverage]
diff --git a/solutions/security/detect-and-alert/monitor-rule-executions.md b/solutions/security/detect-and-alert/monitor-rule-executions.md
index 087940a44..b8bae86f8 100644
--- a/solutions/security/detect-and-alert/monitor-rule-executions.md
+++ b/solutions/security/detect-and-alert/monitor-rule-executions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Monitor rule executions [alerts-ui-monitor]
diff --git a/solutions/security/detect-and-alert/query-alert-indices.md b/solutions/security/detect-and-alert/query-alert-indices.md
index 4de15a0a1..a55db1723 100644
--- a/solutions/security/detect-and-alert/query-alert-indices.md
+++ b/solutions/security/detect-and-alert/query-alert-indices.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Query alert indices [security-query-alert-indices]
diff --git a/solutions/security/detect-and-alert/reduce-notifications-alerts.md b/solutions/security/detect-and-alert/reduce-notifications-alerts.md
index 1ea8737bd..bd1adcdb2 100644
--- a/solutions/security/detect-and-alert/reduce-notifications-alerts.md
+++ b/solutions/security/detect-and-alert/reduce-notifications-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Reduce notifications and alerts [security-reduce-notifications-alerts]
diff --git a/solutions/security/detect-and-alert/rule-exceptions.md b/solutions/security/detect-and-alert/rule-exceptions.md
index 1756fdfdb..87b70f204 100644
--- a/solutions/security/detect-and-alert/rule-exceptions.md
+++ b/solutions/security/detect-and-alert/rule-exceptions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Rule exceptions [detections-ui-exceptions]
diff --git a/solutions/security/detect-and-alert/suppress-detection-alerts.md b/solutions/security/detect-and-alert/suppress-detection-alerts.md
index 84dd27848..7303a1975 100644
--- a/solutions/security/detect-and-alert/suppress-detection-alerts.md
+++ b/solutions/security/detect-and-alert/suppress-detection-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Suppress detection alerts [security-alert-suppression]
diff --git a/solutions/security/detect-and-alert/tune-detection-rules.md b/solutions/security/detect-and-alert/tune-detection-rules.md
index 34c096197..8cb925401 100644
--- a/solutions/security/detect-and-alert/tune-detection-rules.md
+++ b/solutions/security/detect-and-alert/tune-detection-rules.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Tune detection rules [security-tune-detection-signals]
diff --git a/solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md b/solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
index 4eb23925f..c12b62f6e 100644
--- a/solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
+++ b/solutions/security/detect-and-alert/using-logsdb-index-mode-with-elastic-security.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Using logsdb index mode with Elastic Security [detections-logsdb-index-mode-impact]
diff --git a/solutions/security/detect-and-alert/view-detection-alert-details.md b/solutions/security/detect-and-alert/view-detection-alert-details.md
index 37a452a8d..594d67a32 100644
--- a/solutions/security/detect-and-alert/view-detection-alert-details.md
+++ b/solutions/security/detect-and-alert/view-detection-alert-details.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # View detection alert details [security-view-alert-details]
diff --git a/solutions/security/detect-and-alert/visualize-detection-alerts.md b/solutions/security/detect-and-alert/visualize-detection-alerts.md
index 36f0c71ff..8ab57540a 100644
--- a/solutions/security/detect-and-alert/visualize-detection-alerts.md
+++ b/solutions/security/detect-and-alert/visualize-detection-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Visualize detection alerts [security-visualize-alerts]
diff --git a/solutions/security/elastic-security-serverless.md b/solutions/security/elastic-security-serverless.md
index e84e50c8d..9123ba6b3 100644
--- a/solutions/security/elastic-security-serverless.md
+++ b/solutions/security/elastic-security-serverless.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Elastic Security Serverless"
+navigation_title: Elastic Security Serverless
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/what-is-security-serverless.html
 applies_to:
   serverless:
     security: all
+products:
+  - id: cloud-serverless
 ---
 
 # {{sec-serverless}} [what-is-security-serverless]
diff --git a/solutions/security/endpoint-response-actions.md b/solutions/security/endpoint-response-actions.md
index d1f25d439..9dacea383 100644
--- a/solutions/security/endpoint-response-actions.md
+++ b/solutions/security/endpoint-response-actions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Endpoint response actions
diff --git a/solutions/security/endpoint-response-actions/automated-response-actions.md b/solutions/security/endpoint-response-actions/automated-response-actions.md
index 01b8708a9..fc082bba8 100644
--- a/solutions/security/endpoint-response-actions/automated-response-actions.md
+++ b/solutions/security/endpoint-response-actions/automated-response-actions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Automated response actions
diff --git a/solutions/security/endpoint-response-actions/configure-third-party-response-actions.md b/solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
index a0a16d9b7..43a88539e 100644
--- a/solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
+++ b/solutions/security/endpoint-response-actions/configure-third-party-response-actions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure third-party response actions
diff --git a/solutions/security/endpoint-response-actions/isolate-host.md b/solutions/security/endpoint-response-actions/isolate-host.md
index 377da9c33..c9db99400 100644
--- a/solutions/security/endpoint-response-actions/isolate-host.md
+++ b/solutions/security/endpoint-response-actions/isolate-host.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Isolate a host
diff --git a/solutions/security/endpoint-response-actions/response-actions-history.md b/solutions/security/endpoint-response-actions/response-actions-history.md
index 7099e6713..0ade380a8 100644
--- a/solutions/security/endpoint-response-actions/response-actions-history.md
+++ b/solutions/security/endpoint-response-actions/response-actions-history.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Response actions history
diff --git a/solutions/security/endpoint-response-actions/third-party-response-actions.md b/solutions/security/endpoint-response-actions/third-party-response-actions.md
index 6dd63519b..05286dfca 100644
--- a/solutions/security/endpoint-response-actions/third-party-response-actions.md
+++ b/solutions/security/endpoint-response-actions/third-party-response-actions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Third-party response actions
diff --git a/solutions/security/explore.md b/solutions/security/explore.md
index 86ae31252..5c9c9f4f1 100644
--- a/solutions/security/explore.md
+++ b/solutions/security/explore.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Explore [sec-explore-intro]
diff --git a/solutions/security/explore/configure-network-map-data.md b/solutions/security/explore/configure-network-map-data.md
index 4111fd1ce..df94e9103 100644
--- a/solutions/security/explore/configure-network-map-data.md
+++ b/solutions/security/explore/configure-network-map-data.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure network map data
diff --git a/solutions/security/explore/hosts-page.md b/solutions/security/explore/hosts-page.md
index 2d3d65e1c..8d9c611e5 100644
--- a/solutions/security/explore/hosts-page.md
+++ b/solutions/security/explore/hosts-page.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Hosts page
diff --git a/solutions/security/explore/network-page.md b/solutions/security/explore/network-page.md
index 6c5e2c206..7e3e9120d 100644
--- a/solutions/security/explore/network-page.md
+++ b/solutions/security/explore/network-page.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Network page
diff --git a/solutions/security/explore/users-page.md b/solutions/security/explore/users-page.md
index 4c34a7c59..2025c82a7 100644
--- a/solutions/security/explore/users-page.md
+++ b/solutions/security/explore/users-page.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Users page
diff --git a/solutions/security/get-started.md b/solutions/security/get-started.md
index 0beb3a054..d324624a5 100644
--- a/solutions/security/get-started.md
+++ b/solutions/security/get-started.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
 ---
 
 # Get started [getting-started]
diff --git a/solutions/security/get-started/agentless-integrations-faq.md b/solutions/security/get-started/agentless-integrations-faq.md
index 6da77796c..408605f5f 100644
--- a/solutions/security/get-started/agentless-integrations-faq.md
+++ b/solutions/security/get-started/agentless-integrations-faq.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Agentless integrations FAQ [agentless-integration-troubleshooting]
diff --git a/solutions/security/get-started/agentless-integrations.md b/solutions/security/get-started/agentless-integrations.md
index 0a452bd5c..fee0cf7d1 100644
--- a/solutions/security/get-started/agentless-integrations.md
+++ b/solutions/security/get-started/agentless-integrations.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Agentless integrations [agentless-integrations]
diff --git a/solutions/security/get-started/automatic-import.md b/solutions/security/get-started/automatic-import.md
index c5b4d14c4..9a9bcaf0b 100644
--- a/solutions/security/get-started/automatic-import.md
+++ b/solutions/security/get-started/automatic-import.md
@@ -6,6 +6,9 @@ applies_to:
   stack: preview
   serverless:
     security: preview
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Automatic import
diff --git a/solutions/security/get-started/configure-advanced-settings.md b/solutions/security/get-started/configure-advanced-settings.md
index e6e73223b..d45417799 100644
--- a/solutions/security/get-started/configure-advanced-settings.md
+++ b/solutions/security/get-started/configure-advanced-settings.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure advanced settings [security-advanced-settings]
diff --git a/solutions/security/get-started/create-runtime-fields-in-elastic-security.md b/solutions/security/get-started/create-runtime-fields-in-elastic-security.md
index 0d72463fb..28ba28d97 100644
--- a/solutions/security/get-started/create-runtime-fields-in-elastic-security.md
+++ b/solutions/security/get-started/create-runtime-fields-in-elastic-security.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Create runtime fields in {{elastic-sec}} [runtime-fields]
diff --git a/solutions/security/get-started/create-security-project.md b/solutions/security/get-started/create-security-project.md
index f8bdc7968..8a12054aa 100644
--- a/solutions/security/get-started/create-security-project.md
+++ b/solutions/security/get-started/create-security-project.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   serverless:
     security: all
+products:
+  - id: cloud-serverless
 ---
 
 # Create a Security project [security-create-project]
diff --git a/solutions/security/get-started/data-views-elastic-security.md b/solutions/security/get-started/data-views-elastic-security.md
index fefcc6ddd..205d5a481 100644
--- a/solutions/security/get-started/data-views-elastic-security.md
+++ b/solutions/security/get-started/data-views-elastic-security.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # {{data-sources-cap}} and {{elastic-sec}} [security-data-views-in-sec]
diff --git a/solutions/security/get-started/elastic-security-requirements.md b/solutions/security/get-started/elastic-security-requirements.md
index 739a5cb53..eb347f75c 100644
--- a/solutions/security/get-started/elastic-security-requirements.md
+++ b/solutions/security/get-started/elastic-security-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # {{elastic-sec}} requirements [security-requirements-overview]
diff --git a/solutions/security/get-started/elastic-security-ui.md b/solutions/security/get-started/elastic-security-ui.md
index 3c3f60af2..5013cfcf8 100644
--- a/solutions/security/get-started/elastic-security-ui.md
+++ b/solutions/security/get-started/elastic-security-ui.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Elastic Security UI
diff --git a/solutions/security/get-started/enable-threat-intelligence-integrations.md b/solutions/security/get-started/enable-threat-intelligence-integrations.md
index 6a1ffc34c..56382abf2 100644
--- a/solutions/security/get-started/enable-threat-intelligence-integrations.md
+++ b/solutions/security/get-started/enable-threat-intelligence-integrations.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Enable threat intelligence integrations [security-enable-threat-intelligence-integrations]
diff --git a/solutions/security/get-started/ingest-data-to-elastic-security.md b/solutions/security/get-started/ingest-data-to-elastic-security.md
index d181cea1d..c123eac23 100644
--- a/solutions/security/get-started/ingest-data-to-elastic-security.md
+++ b/solutions/security/get-started/ingest-data-to-elastic-security.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Ingest data to {{elastic-sec}} [security-ingest-data]
diff --git a/solutions/security/get-started/spaces-elastic-security.md b/solutions/security/get-started/spaces-elastic-security.md
index 47f7cfeb5..238de14ce 100644
--- a/solutions/security/get-started/spaces-elastic-security.md
+++ b/solutions/security/get-started/spaces-elastic-security.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Spaces and {{elastic-sec}} [security-spaces]
diff --git a/solutions/security/investigate.md b/solutions/security/investigate.md
index 3511fff72..cd268251e 100644
--- a/solutions/security/investigate.md
+++ b/solutions/security/investigate.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Investigation tools [security-investigate-events]
diff --git a/solutions/security/investigate/add-osquery-response-actions.md b/solutions/security/investigate/add-osquery-response-actions.md
index cc4e4c6bf..65ed772ce 100644
--- a/solutions/security/investigate/add-osquery-response-actions.md
+++ b/solutions/security/investigate/add-osquery-response-actions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: preview
   serverless:
     security: preview
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Add Osquery Response Actions [security-osquery-response-action]
diff --git a/solutions/security/investigate/cases-requirements.md b/solutions/security/investigate/cases-requirements.md
index e3e8b0e55..5d49c50cb 100644
--- a/solutions/security/investigate/cases-requirements.md
+++ b/solutions/security/investigate/cases-requirements.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cases requirements [security-cases-requirements]
diff --git a/solutions/security/investigate/cases.md b/solutions/security/investigate/cases.md
index 23ca014e7..79d78162e 100644
--- a/solutions/security/investigate/cases.md
+++ b/solutions/security/investigate/cases.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Cases [security-cases-overview]
diff --git a/solutions/security/investigate/configure-case-settings.md b/solutions/security/investigate/configure-case-settings.md
index d60b77ecd..df747ea34 100644
--- a/solutions/security/investigate/configure-case-settings.md
+++ b/solutions/security/investigate/configure-case-settings.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Configure case settings [security-cases-settings]
diff --git a/solutions/security/investigate/examine-osquery-results.md b/solutions/security/investigate/examine-osquery-results.md
index 28ddfb571..256f088d9 100644
--- a/solutions/security/investigate/examine-osquery-results.md
+++ b/solutions/security/investigate/examine-osquery-results.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Examine Osquery results [security-examine-osquery-results]
diff --git a/solutions/security/investigate/indicators-of-compromise.md b/solutions/security/investigate/indicators-of-compromise.md
index 417d08196..3c20bad4c 100644
--- a/solutions/security/investigate/indicators-of-compromise.md
+++ b/solutions/security/investigate/indicators-of-compromise.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Indicators of compromise
diff --git a/solutions/security/investigate/manage-integration.md b/solutions/security/investigate/manage-integration.md
index c361b1b38..2d78f1b4a 100644
--- a/solutions/security/investigate/manage-integration.md
+++ b/solutions/security/investigate/manage-integration.md
@@ -1,13 +1,13 @@
 ---
+navigation_title: Osquery manager integration
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/manage-osquery-integration.html
-
-navigation_title: "Osquery manager integration"
-
 applies_to:
   stack: preview all
   serverless:
     security: preview all
+products:
+  - id: kibana
 ---
 
 # Manage the integration [manage-osquery-integration]
diff --git a/solutions/security/investigate/notes.md b/solutions/security/investigate/notes.md
index 07e30a9d3..66f3a1278 100644
--- a/solutions/security/investigate/notes.md
+++ b/solutions/security/investigate/notes.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Notes [security-add-manage-notes]
diff --git a/solutions/security/investigate/open-manage-cases.md b/solutions/security/investigate/open-manage-cases.md
index cd8ee8e52..6de7abaad 100644
--- a/solutions/security/investigate/open-manage-cases.md
+++ b/solutions/security/investigate/open-manage-cases.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Open and manage cases [security-cases-open-manage]
diff --git a/solutions/security/investigate/osquery-faq.md b/solutions/security/investigate/osquery-faq.md
index 23f7069cd..1dd0977d9 100644
--- a/solutions/security/investigate/osquery-faq.md
+++ b/solutions/security/investigate/osquery-faq.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: kibana
 ---
 
 # Osquery FAQ [osquery-faq]
diff --git a/solutions/security/investigate/osquery.md b/solutions/security/investigate/osquery.md
index 78fc54770..ad5de75b3 100644
--- a/solutions/security/investigate/osquery.md
+++ b/solutions/security/investigate/osquery.md
@@ -7,6 +7,10 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
+  - id: kibana
 ---
 
 # Osquery [osquery]
diff --git a/solutions/security/investigate/run-osquery-from-alerts.md b/solutions/security/investigate/run-osquery-from-alerts.md
index 8879659e3..e7e5987c8 100644
--- a/solutions/security/investigate/run-osquery-from-alerts.md
+++ b/solutions/security/investigate/run-osquery-from-alerts.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Run Osquery from alerts [security-alerts-run-osquery]
diff --git a/solutions/security/investigate/run-osquery-from-investigation-guides.md b/solutions/security/investigate/run-osquery-from-investigation-guides.md
index 68a75b5ba..258dca385 100644
--- a/solutions/security/investigate/run-osquery-from-investigation-guides.md
+++ b/solutions/security/investigate/run-osquery-from-investigation-guides.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Run Osquery from investigation guides [security-invest-guide-run-osquery]
diff --git a/solutions/security/investigate/session-view.md b/solutions/security/investigate/session-view.md
index 305fbb9bb..e5cb1a1ff 100644
--- a/solutions/security/investigate/session-view.md
+++ b/solutions/security/investigate/session-view.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Session View [security-session-view]
diff --git a/solutions/security/investigate/timeline-templates.md b/solutions/security/investigate/timeline-templates.md
index 7f2def20a..1cf9b03ba 100644
--- a/solutions/security/investigate/timeline-templates.md
+++ b/solutions/security/investigate/timeline-templates.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Timeline templates [security-timeline-templates-ui]
diff --git a/solutions/security/investigate/timeline.md b/solutions/security/investigate/timeline.md
index dc5e16948..5f104893b 100644
--- a/solutions/security/investigate/timeline.md
+++ b/solutions/security/investigate/timeline.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Timeline [security-timelines-ui]
diff --git a/solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md b/solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
index f533795b7..121150ade 100644
--- a/solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
+++ b/solutions/security/investigate/use-placeholder-fields-in-osquery-queries.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Use placeholder fields in Osquery queries [security-osquery-placeholder-fields]
diff --git a/solutions/security/investigate/visual-event-analyzer.md b/solutions/security/investigate/visual-event-analyzer.md
index 2225a7bc1..59c6ee695 100644
--- a/solutions/security/investigate/visual-event-analyzer.md
+++ b/solutions/security/investigate/visual-event-analyzer.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Visual event analyzer [security-visual-event-analyzer]
diff --git a/solutions/security/manage-elastic-defend.md b/solutions/security/manage-elastic-defend.md
index 4bde1b565..7489f9c80 100644
--- a/solutions/security/manage-elastic-defend.md
+++ b/solutions/security/manage-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Manage {{elastic-defend}} [sec-manage-intro]
diff --git a/solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md b/solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
index aeb731bf0..85199d5c1 100644
--- a/solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
+++ b/solutions/security/manage-elastic-defend/allowlist-elastic-endpoint-in-third-party-antivirus-apps.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 
diff --git a/solutions/security/manage-elastic-defend/blocklist.md b/solutions/security/manage-elastic-defend/blocklist.md
index c4f1335b8..6bfd36e64 100644
--- a/solutions/security/manage-elastic-defend/blocklist.md
+++ b/solutions/security/manage-elastic-defend/blocklist.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Blocklist
diff --git a/solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md b/solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
index 69ce0b0e6..1257ac118 100644
--- a/solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
+++ b/solutions/security/manage-elastic-defend/elastic-endpoint-self-protection-features.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # {{elastic-endpoint}} self-protection features [endpoint-self-protection]
diff --git a/solutions/security/manage-elastic-defend/endpoint-protection-rules.md b/solutions/security/manage-elastic-defend/endpoint-protection-rules.md
index 0cbb9bb17..5b9689ae2 100644
--- a/solutions/security/manage-elastic-defend/endpoint-protection-rules.md
+++ b/solutions/security/manage-elastic-defend/endpoint-protection-rules.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Endpoint protection rules [endpoint-protection-rules]
diff --git a/solutions/security/manage-elastic-defend/endpoints.md b/solutions/security/manage-elastic-defend/endpoints.md
index 5202a4b0e..d5bd4e938 100644
--- a/solutions/security/manage-elastic-defend/endpoints.md
+++ b/solutions/security/manage-elastic-defend/endpoints.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Endpoints
diff --git a/solutions/security/manage-elastic-defend/event-capture-elastic-defend.md b/solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
index 19b88ae04..c6dd217c8 100644
--- a/solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
+++ b/solutions/security/manage-elastic-defend/event-capture-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Event capture and {{elastic-defend}} [endpoint-event-capture]
diff --git a/solutions/security/manage-elastic-defend/event-filters.md b/solutions/security/manage-elastic-defend/event-filters.md
index 9ee99f6fc..85e3531a0 100644
--- a/solutions/security/manage-elastic-defend/event-filters.md
+++ b/solutions/security/manage-elastic-defend/event-filters.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Event filters
diff --git a/solutions/security/manage-elastic-defend/host-isolation-exceptions.md b/solutions/security/manage-elastic-defend/host-isolation-exceptions.md
index d6605b106..cec3b50b1 100644
--- a/solutions/security/manage-elastic-defend/host-isolation-exceptions.md
+++ b/solutions/security/manage-elastic-defend/host-isolation-exceptions.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Host isolation exceptions
diff --git a/solutions/security/manage-elastic-defend/identify-antivirus-software-on-hosts.md b/solutions/security/manage-elastic-defend/identify-antivirus-software-on-hosts.md
index 770ce39f4..081e3e9b0 100644
--- a/solutions/security/manage-elastic-defend/identify-antivirus-software-on-hosts.md
+++ b/solutions/security/manage-elastic-defend/identify-antivirus-software-on-hosts.md
@@ -5,6 +5,8 @@ applies_to:
   stack: preview 9.0
   serverless:
     security: preview
+products:
+  - id: cloud-serverless
 ---
 
 # Identify antivirus software on your hosts [identify-third-party-av-products]
diff --git a/solutions/security/manage-elastic-defend/optimize-elastic-defend.md b/solutions/security/manage-elastic-defend/optimize-elastic-defend.md
index 67a34a093..e4bd122b9 100644
--- a/solutions/security/manage-elastic-defend/optimize-elastic-defend.md
+++ b/solutions/security/manage-elastic-defend/optimize-elastic-defend.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Optimize {{elastic-defend}} [endpoint-artifacts]
diff --git a/solutions/security/manage-elastic-defend/policies.md b/solutions/security/manage-elastic-defend/policies.md
index 1fd80a499..ceabdde57 100644
--- a/solutions/security/manage-elastic-defend/policies.md
+++ b/solutions/security/manage-elastic-defend/policies.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Policies
diff --git a/solutions/security/manage-elastic-defend/trusted-applications.md b/solutions/security/manage-elastic-defend/trusted-applications.md
index c0b056962..b16a5d564 100644
--- a/solutions/security/manage-elastic-defend/trusted-applications.md
+++ b/solutions/security/manage-elastic-defend/trusted-applications.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Trusted applications
diff --git a/troubleshoot/deployments/cloud-enterprise/cloud-enterprise.md b/troubleshoot/deployments/cloud-enterprise/cloud-enterprise.md
index 4bb18650a..493d46289 100644
--- a/troubleshoot/deployments/cloud-enterprise/cloud-enterprise.md
+++ b/troubleshoot/deployments/cloud-enterprise/cloud-enterprise.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Elastic Cloud Enterprise"
+navigation_title: Elastic Cloud Enterprise
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Troubleshoot Elastic Cloud Enterprise
diff --git a/troubleshoot/deployments/cloud-enterprise/common-issues.md b/troubleshoot/deployments/cloud-enterprise/common-issues.md
index 6a8494d9a..a2209d20b 100644
--- a/troubleshoot/deployments/cloud-enterprise/common-issues.md
+++ b/troubleshoot/deployments/cloud-enterprise/common-issues.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-issues.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-issues.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Common issues [ece-issues]
diff --git a/troubleshoot/deployments/cloud-enterprise/deployment-health-warnings.md b/troubleshoot/deployments/cloud-enterprise/deployment-health-warnings.md
index a69c78689..981cd98a1 100644
--- a/troubleshoot/deployments/cloud-enterprise/deployment-health-warnings.md
+++ b/troubleshoot/deployments/cloud-enterprise/deployment-health-warnings.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Deployment health warnings"
+navigation_title: Deployment health warnings
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deployment-no-op.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-deployment-no-op.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Troubleshoot deployment health warnings [ece-deployment-no-op]
diff --git a/troubleshoot/deployments/cloud-enterprise/heap-dumps.md b/troubleshoot/deployments/cloud-enterprise/heap-dumps.md
index 1f11c0ea2..fb8ec9fa6 100644
--- a/troubleshoot/deployments/cloud-enterprise/heap-dumps.md
+++ b/troubleshoot/deployments/cloud-enterprise/heap-dumps.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-capture-heap-dumps.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-capture-heap-dumps.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Heap dumps [ece-capture-heap-dumps]
diff --git a/troubleshoot/deployments/cloud-enterprise/node-bootlooping.md b/troubleshoot/deployments/cloud-enterprise/node-bootlooping.md
index 87aa9ddc8..b2f468f5c 100644
--- a/troubleshoot/deployments/cloud-enterprise/node-bootlooping.md
+++ b/troubleshoot/deployments/cloud-enterprise/node-bootlooping.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Node bootlooping"
+navigation_title: Node bootlooping
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-config-change-errors.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-config-change-errors.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Troubleshoot node bootlooping in {{ece}} [ece-config-change-errors]
diff --git a/troubleshoot/deployments/cloud-enterprise/rebuilding-broken-zookeeper-quorum.md b/troubleshoot/deployments/cloud-enterprise/rebuilding-broken-zookeeper-quorum.md
index c2653036d..16bd82313 100644
--- a/troubleshoot/deployments/cloud-enterprise/rebuilding-broken-zookeeper-quorum.md
+++ b/troubleshoot/deployments/cloud-enterprise/rebuilding-broken-zookeeper-quorum.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Zookeeper quorum"
+navigation_title: Zookeeper quorum
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-zookeeper-quorum.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-zookeeper-quorum.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Rebuilding a broken Zookeeper quorum [ece-troubleshooting-zookeeper-quorum]
diff --git a/troubleshoot/deployments/cloud-enterprise/remove-cloud-enterprise.md b/troubleshoot/deployments/cloud-enterprise/remove-cloud-enterprise.md
index 9f93f7670..48ec097e8 100644
--- a/troubleshoot/deployments/cloud-enterprise/remove-cloud-enterprise.md
+++ b/troubleshoot/deployments/cloud-enterprise/remove-cloud-enterprise.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Removing containers"
+navigation_title: Removing containers
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-uninstall.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-uninstall.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Remove Elastic Cloud Enterprise containers  [ece-uninstall]
diff --git a/troubleshoot/deployments/cloud-enterprise/run-ece-diagnostics-tool.md b/troubleshoot/deployments/cloud-enterprise/run-ece-diagnostics-tool.md
index 83bc9f24e..e4391eec2 100644
--- a/troubleshoot/deployments/cloud-enterprise/run-ece-diagnostics-tool.md
+++ b/troubleshoot/deployments/cloud-enterprise/run-ece-diagnostics-tool.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Diagnostics"
+navigation_title: Diagnostics
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-run-ece-diagnostics.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-run-ece-diagnostics.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Run ECE diagnostics tool [ece-run-ece-diagnostics]
diff --git a/troubleshoot/deployments/cloud-enterprise/thread-dumps.md b/troubleshoot/deployments/cloud-enterprise/thread-dumps.md
index 318505803..37c459e03 100644
--- a/troubleshoot/deployments/cloud-enterprise/thread-dumps.md
+++ b/troubleshoot/deployments/cloud-enterprise/thread-dumps.md
@@ -1,9 +1,11 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-capture-thread-dumps.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-capture-thread-dumps.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Thread dumps [ece-capture-thread-dumps]
diff --git a/troubleshoot/deployments/cloud-enterprise/troubleshooting-container-engines.md b/troubleshoot/deployments/cloud-enterprise/troubleshooting-container-engines.md
index ee4d6d27a..1d6af2fb2 100644
--- a/troubleshoot/deployments/cloud-enterprise/troubleshooting-container-engines.md
+++ b/troubleshoot/deployments/cloud-enterprise/troubleshooting-container-engines.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Container engines"
+navigation_title: Container engines
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-containers.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-containers.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Troubleshoot container engines [ece-troubleshooting-containers]
diff --git a/troubleshoot/deployments/cloud-enterprise/use-emergency-roles-token.md b/troubleshoot/deployments/cloud-enterprise/use-emergency-roles-token.md
index 06f0b12f6..423b431a4 100644
--- a/troubleshoot/deployments/cloud-enterprise/use-emergency-roles-token.md
+++ b/troubleshoot/deployments/cloud-enterprise/use-emergency-roles-token.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Emergency roles token"
+navigation_title: Emergency roles token
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-emergency.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-troubleshooting-emergency.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Use the emergency roles token [ece-troubleshooting-emergency]
diff --git a/troubleshoot/deployments/cloud-enterprise/verify-zookeeper-sync-status.md b/troubleshoot/deployments/cloud-enterprise/verify-zookeeper-sync-status.md
index f94b19f94..e778ec499 100644
--- a/troubleshoot/deployments/cloud-enterprise/verify-zookeeper-sync-status.md
+++ b/troubleshoot/deployments/cloud-enterprise/verify-zookeeper-sync-status.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "ZooKeeper sync status"
+navigation_title: ZooKeeper sync status
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-zookeeper-sync.html
 applies_to:
   deployment:
     ece: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-zookeeper-sync.html
+products:
+  - id: cloud-enterprise
 ---
 
 # Verify ZooKeeper sync status [ece-zookeeper-sync]
diff --git a/troubleshoot/deployments/cloud-on-k8s/common-problems.md b/troubleshoot/deployments/cloud-on-k8s/common-problems.md
index 5987e644f..ad6a0ade8 100644
--- a/troubleshoot/deployments/cloud-on-k8s/common-problems.md
+++ b/troubleshoot/deployments/cloud-on-k8s/common-problems.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Common issues"
+navigation_title: Common issues
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-common-problems.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-common-problems.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Troubleshoot common Elastic Cloud on Kubernetes issues [k8s-common-problems]
diff --git a/troubleshoot/deployments/cloud-on-k8s/jvm-heap-dumps.md b/troubleshoot/deployments/cloud-on-k8s/jvm-heap-dumps.md
index 2cb7e71db..c7b0830b8 100644
--- a/troubleshoot/deployments/cloud-on-k8s/jvm-heap-dumps.md
+++ b/troubleshoot/deployments/cloud-on-k8s/jvm-heap-dumps.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "JVM heap dumps"
+navigation_title: JVM heap dumps
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-jvm-heap-dumps.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-jvm-heap-dumps.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Troubleshoot JVM heap dumps [k8s-jvm-heap-dumps]
diff --git a/troubleshoot/deployments/cloud-on-k8s/kubernetes.md b/troubleshoot/deployments/cloud-on-k8s/kubernetes.md
index aff5eef9a..f0e390f80 100644
--- a/troubleshoot/deployments/cloud-on-k8s/kubernetes.md
+++ b/troubleshoot/deployments/cloud-on-k8s/kubernetes.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Elastic Cloud on Kubernetes"
-applies_to:
-  deployment:
-    eck: all 
+navigation_title: Elastic Cloud on Kubernetes
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-troubleshooting.html
+applies_to:
+  deployment:
+    eck: all
+products:
+  - id: cloud-kubernetes
 ---
 
 # Troubleshoot Elastic Cloud on Kubernetes [k8s-troubleshooting]
diff --git a/troubleshoot/deployments/cloud-on-k8s/run-eck-diagnostics.md b/troubleshoot/deployments/cloud-on-k8s/run-eck-diagnostics.md
index 4aadd8cc8..c8afaa6f7 100644
--- a/troubleshoot/deployments/cloud-on-k8s/run-eck-diagnostics.md
+++ b/troubleshoot/deployments/cloud-on-k8s/run-eck-diagnostics.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Diagnostics"
+navigation_title: Diagnostics
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-take-eck-dump.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-take-eck-dump.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Run eck-diagnostics [k8s-take-eck-dump]
diff --git a/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md b/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
index 8d04ee355..b8a710ac8 100644
--- a/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
+++ b/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Resources and logs"
+navigation_title: Resources and logs
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-troubleshooting-methods.html
 applies_to:
   deployment:
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-troubleshooting-methods.html
+products:
+  - id: cloud-kubernetes
 ---
 
 # Troubleshoot ECK resources and logs  [k8s-troubleshooting-methods]
diff --git a/troubleshoot/deployments/elastic-cloud.md b/troubleshoot/deployments/elastic-cloud.md
index 5c10a370d..62ee32a9e 100644
--- a/troubleshoot/deployments/elastic-cloud.md
+++ b/troubleshoot/deployments/elastic-cloud.md
@@ -1,12 +1,15 @@
 ---
-navigation_title: "Elastic Cloud"
+navigation_title: Elastic Cloud
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting.html
+  - https://www.elastic.co/guide/en/cloud/current/ec-monitoring-diagnose-resolve.html
 applies_to:
   deployment:
     ess: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting.html
-  - https://www.elastic.co/guide/en/cloud/current/ec-monitoring-diagnose-resolve.html
+products:
+  - id: kibana
+  - id: cloud-hosted
 ---
 
 # Troubleshoot {{ecloud}}
diff --git a/troubleshoot/deployments/elastic-cloud/sso.md b/troubleshoot/deployments/elastic-cloud/sso.md
index d25731f80..6788c37fe 100644
--- a/troubleshoot/deployments/elastic-cloud/sso.md
+++ b/troubleshoot/deployments/elastic-cloud/sso.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "SAML single sign-on (SSO)"
+navigation_title: SAML single sign-on (SSO)
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-saml-sso.html
 applies_to:
   deployment:
     ess: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-saml-sso.html
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot {{ecloud}} SSO [ec_troubleshoot_sso]
diff --git a/troubleshoot/deployments/serverless.md b/troubleshoot/deployments/serverless.md
index bdb017c1f..89c6c68a0 100644
--- a/troubleshoot/deployments/serverless.md
+++ b/troubleshoot/deployments/serverless.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Serverless status"
-applies_to:
-  serverless: all
+navigation_title: Serverless status
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/general-serverless-status.html
+applies_to:
+  serverless: all
+products:
+  - id: cloud-serverless
 ---
 
 # Check Serverless status and get updates [general-serverless-status]
diff --git a/troubleshoot/elasticsearch.md b/troubleshoot/elasticsearch.md
index 0ce178723..9ea5c208f 100644
--- a/troubleshoot/elasticsearch.md
+++ b/troubleshoot/elasticsearch.md
@@ -1,7 +1,9 @@
 ---
-navigation_title: "Elasticsearch"
+navigation_title: Elasticsearch
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshooting.html
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot {{es}} [troubleshooting]
diff --git a/troubleshoot/elasticsearch/add-repository.md b/troubleshoot/elasticsearch/add-repository.md
index 4a3506397..46adb0977 100644
--- a/troubleshoot/elasticsearch/add-repository.md
+++ b/troubleshoot/elasticsearch/add-repository.md
@@ -2,6 +2,8 @@
 navigation_title: Broken repositories
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/add-repository.html
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot broken repositories [add-repository]
diff --git a/troubleshoot/elasticsearch/add-tier.md b/troubleshoot/elasticsearch/add-tier.md
index a2bc83636..2b2fc7ae1 100644
--- a/troubleshoot/elasticsearch/add-tier.md
+++ b/troubleshoot/elasticsearch/add-tier.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Preferred data tier
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/add-tier.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move this page to a new index allocation subsection
diff --git a/troubleshoot/elasticsearch/all-shards-failed.md b/troubleshoot/elasticsearch/all-shards-failed.md
index c2d1f336c..ddb642659 100644
--- a/troubleshoot/elasticsearch/all-shards-failed.md
+++ b/troubleshoot/elasticsearch/all-shards-failed.md
@@ -1,11 +1,11 @@
 ---
 applies_to:
-  stack: 
+  stack:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
 navigation_title: "Error: All shards failed"
 ---
 
diff --git a/troubleshoot/elasticsearch/allow-all-cluster-allocation.md b/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
index 90bb3a2bf..dc9cf5e38 100644
--- a/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
+++ b/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Data allocation
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/allow-all-cluster-allocation.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Allow Elasticsearch to allocate the data in the system [allow-all-cluster-allocation]
diff --git a/troubleshoot/elasticsearch/allow-all-index-allocation.md b/troubleshoot/elasticsearch/allow-all-index-allocation.md
index 9d9d8b7d6..caa2c2cac 100644
--- a/troubleshoot/elasticsearch/allow-all-index-allocation.md
+++ b/troubleshoot/elasticsearch/allow-all-index-allocation.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Index allocation
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/allow-all-index-allocation.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % Need to retitle to be about the problem, not the solution
diff --git a/troubleshoot/elasticsearch/circuit-breaker-errors.md b/troubleshoot/elasticsearch/circuit-breaker-errors.md
index bf5a14e97..61b251c0d 100644
--- a/troubleshoot/elasticsearch/circuit-breaker-errors.md
+++ b/troubleshoot/elasticsearch/circuit-breaker-errors.md
@@ -1,4 +1,6 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/circuit-breaker-errors.html
 applies_to:
   stack:
   deployment:
@@ -6,8 +8,8 @@ applies_to:
     ess:
     ece:
     self:
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/circuit-breaker-errors.html
+products:
+  - id: elasticsearch
 ---
 
 # Circuit breaker errors [circuit-breaker-errors]
diff --git a/troubleshoot/elasticsearch/clients.md b/troubleshoot/elasticsearch/clients.md
index ca3b7340d..358394d12 100644
--- a/troubleshoot/elasticsearch/clients.md
+++ b/troubleshoot/elasticsearch/clients.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Clients"
+navigation_title: Clients
 ---
 
 # Troubleshoot {{es}} clients
diff --git a/troubleshoot/elasticsearch/corruption-troubleshooting.md b/troubleshoot/elasticsearch/corruption-troubleshooting.md
index 126982cb6..6e2b13779 100644
--- a/troubleshoot/elasticsearch/corruption-troubleshooting.md
+++ b/troubleshoot/elasticsearch/corruption-troubleshooting.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Data corruption
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/corruption-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot data corruption [corruption-troubleshooting]
diff --git a/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md b/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
index 152df48e5..0acd8678d 100644
--- a/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
+++ b/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Decrease disk usage
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/decrease-disk-usage-data-node.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Decrease the disk usage of data nodes [decrease-disk-usage-data-node]
diff --git a/troubleshoot/elasticsearch/diagnose-unassigned-shards.md b/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
index 87c32a44b..a71ffcf60 100644
--- a/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
+++ b/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Unassigned shards
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnose-unassigned-shards.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move to a new Unassigned shards subsection
diff --git a/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md b/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
index 835b2c553..4bfe0d55b 100644
--- a/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
+++ b/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Corrupted repositories
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnosing-corrupted-repositories.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Diagnose corrupted repositories [diagnosing-corrupted-repositories]
diff --git a/troubleshoot/elasticsearch/diagnosing-invalid-repositories.md b/troubleshoot/elasticsearch/diagnosing-invalid-repositories.md
index c36271d02..96d5b4d5e 100644
--- a/troubleshoot/elasticsearch/diagnosing-invalid-repositories.md
+++ b/troubleshoot/elasticsearch/diagnosing-invalid-repositories.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Invalid repositories
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnosing-invalid-repositories.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Diagnose invalid repositories [diagnosing-invalid-repositories]
diff --git a/troubleshoot/elasticsearch/diagnosing-unknown-repositories.md b/troubleshoot/elasticsearch/diagnosing-unknown-repositories.md
index b88e07335..3b6972f2f 100644
--- a/troubleshoot/elasticsearch/diagnosing-unknown-repositories.md
+++ b/troubleshoot/elasticsearch/diagnosing-unknown-repositories.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Unknown repositories
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnosing-unknown-repositories.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Diagnose unknown repositories [diagnosing-unknown-repositories]
diff --git a/troubleshoot/elasticsearch/diagnostic.md b/troubleshoot/elasticsearch/diagnostic.md
index fdf0ef083..eda36de0b 100644
--- a/troubleshoot/elasticsearch/diagnostic.md
+++ b/troubleshoot/elasticsearch/diagnostic.md
@@ -1,4 +1,7 @@
 ---
+navigation_title: Diagnostics
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnostic.html
 applies_to:
   stack:
   deployment:
@@ -6,9 +9,8 @@ applies_to:
     ess:
     ece:
     self:
-navigation_title: Diagnostics
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/diagnostic.html
+products:
+  - id: elasticsearch
 ---
 
 # Capture diagnostics [diagnostic]
diff --git a/troubleshoot/elasticsearch/discovery-troubleshooting.md b/troubleshoot/elasticsearch/discovery-troubleshooting.md
index 7c12ef15b..20feb8af4 100644
--- a/troubleshoot/elasticsearch/discovery-troubleshooting.md
+++ b/troubleshoot/elasticsearch/discovery-troubleshooting.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Discovery
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/discovery-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot discovery [discovery-troubleshooting]
diff --git a/troubleshoot/elasticsearch/elasticsearch-hadoop/elasticsearch-for-apache-hadoop.md b/troubleshoot/elasticsearch/elasticsearch-hadoop/elasticsearch-for-apache-hadoop.md
index cc2f9c0ef..a3f4421d9 100644
--- a/troubleshoot/elasticsearch/elasticsearch-hadoop/elasticsearch-for-apache-hadoop.md
+++ b/troubleshoot/elasticsearch/elasticsearch-hadoop/elasticsearch-for-apache-hadoop.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Apache Hadoop
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/hadoop/current/troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot Elasticsearch for Apache Hadoop [troubleshooting]
diff --git a/troubleshoot/elasticsearch/failed-to-parse-field-of-type.md b/troubleshoot/elasticsearch/failed-to-parse-field-of-type.md
index 877aaad95..3a2de1046 100644
--- a/troubleshoot/elasticsearch/failed-to-parse-field-of-type.md
+++ b/troubleshoot/elasticsearch/failed-to-parse-field-of-type.md
@@ -1,11 +1,11 @@
 ---
 applies_to:
-  stack: 
+  stack:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
 navigation_title: "Error: Failed to parse field of type in document with id"
 ---
 
diff --git a/troubleshoot/elasticsearch/fix-common-cluster-issues.md b/troubleshoot/elasticsearch/fix-common-cluster-issues.md
index 2cd9eb015..b5b65d957 100644
--- a/troubleshoot/elasticsearch/fix-common-cluster-issues.md
+++ b/troubleshoot/elasticsearch/fix-common-cluster-issues.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Common cluster issues
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-common-cluster-issues.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Fix common cluster issues [fix-common-cluster-issues]
diff --git a/troubleshoot/elasticsearch/fix-data-node-out-of-disk.md b/troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
index 9e4f03d30..f6e7e5a70 100644
--- a/troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
+++ b/troubleshoot/elasticsearch/fix-data-node-out-of-disk.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Data nodes out of disk
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-data-node-out-of-disk.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move to new "out of disk" subsection
diff --git a/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md b/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
index 07991869f..59cae1613 100644
--- a/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
+++ b/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Master nodes out of disk
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-master-node-out-of-disk.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move to new "out of disk" subsection
diff --git a/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md b/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
index 086a28fad..6e872c035 100644
--- a/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
+++ b/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Other nodes out of disk
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-other-node-out-of-disk.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move to new "out of disk" subsection
diff --git a/troubleshoot/elasticsearch/fix-watermark-errors.md b/troubleshoot/elasticsearch/fix-watermark-errors.md
index 6b90b7882..ef7873a5b 100644
--- a/troubleshoot/elasticsearch/fix-watermark-errors.md
+++ b/troubleshoot/elasticsearch/fix-watermark-errors.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
-navigation_title: "Watermark errors"
+navigation_title: Watermark errors
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-watermark-errors.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/troubleshoot/elasticsearch/high-cpu-usage.md b/troubleshoot/elasticsearch/high-cpu-usage.md
index 536659400..8b713ea0e 100644
--- a/troubleshoot/elasticsearch/high-cpu-usage.md
+++ b/troubleshoot/elasticsearch/high-cpu-usage.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: High CPU usage
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/high-cpu-usage.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Symptom: High CPU usage [high-cpu-usage]
diff --git a/troubleshoot/elasticsearch/high-jvm-memory-pressure.md b/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
index 28b447cd6..c25ca8633 100644
--- a/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
+++ b/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/high-jvm-memory-pressure.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # High JVM memory pressure [high-jvm-memory-pressure]
diff --git a/troubleshoot/elasticsearch/hotspotting.md b/troubleshoot/elasticsearch/hotspotting.md
index 229d1c18c..92cc92741 100644
--- a/troubleshoot/elasticsearch/hotspotting.md
+++ b/troubleshoot/elasticsearch/hotspotting.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
-navigation_title: "Hot spotting"
+navigation_title: Hot spotting
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/hotspotting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/troubleshoot/elasticsearch/increase-capacity-data-node.md b/troubleshoot/elasticsearch/increase-capacity-data-node.md
index dacf001e6..787f3b77f 100644
--- a/troubleshoot/elasticsearch/increase-capacity-data-node.md
+++ b/troubleshoot/elasticsearch/increase-capacity-data-node.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Increase disk capacity
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/increase-capacity-data-node.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Increase the disk capacity of data nodes [increase-capacity-data-node]
diff --git a/troubleshoot/elasticsearch/increase-cluster-shard-limit.md b/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
index 9e05b8104..c9d836460 100644
--- a/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
+++ b/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Total number of shards per node reached
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/increase-cluster-shard-limit.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move to a new Unassigned shards subsection
diff --git a/troubleshoot/elasticsearch/increase-shard-limit.md b/troubleshoot/elasticsearch/increase-shard-limit.md
index c92fcd7a3..9a5357cf9 100644
--- a/troubleshoot/elasticsearch/increase-shard-limit.md
+++ b/troubleshoot/elasticsearch/increase-shard-limit.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Total number of shards for an index exceeded
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/increase-shard-limit.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw retitle; move to a new Unassigned shards subsection
diff --git a/troubleshoot/elasticsearch/increase-tier-capacity.md b/troubleshoot/elasticsearch/increase-tier-capacity.md
index da23936a4..711989b15 100644
--- a/troubleshoot/elasticsearch/increase-tier-capacity.md
+++ b/troubleshoot/elasticsearch/increase-tier-capacity.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Not enough nodes to allocate shard replicas
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/increase-tier-capacity.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Warning: Not enough nodes to allocate all shard replicas [increase-tier-capacity]
diff --git a/troubleshoot/elasticsearch/index-lifecycle-management-errors.md b/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
index 3ed0bdba8..f1605666e 100644
--- a/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
+++ b/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
-navigation_title: "Index lifecycle management errors"
+navigation_title: Index lifecycle management errors
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/index-lifecycle-error-handling.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % TODO restructure ILM and SLM dtopics
diff --git a/troubleshoot/elasticsearch/mapping-explosion.md b/troubleshoot/elasticsearch/mapping-explosion.md
index 8d66c6110..d3ad88de2 100644
--- a/troubleshoot/elasticsearch/mapping-explosion.md
+++ b/troubleshoot/elasticsearch/mapping-explosion.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-explosion.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Mapping explosion [mapping-explosion]
diff --git a/troubleshoot/elasticsearch/monitoring-troubleshooting.md b/troubleshoot/elasticsearch/monitoring-troubleshooting.md
index be2c76213..088b6ada3 100644
--- a/troubleshoot/elasticsearch/monitoring-troubleshooting.md
+++ b/troubleshoot/elasticsearch/monitoring-troubleshooting.md
@@ -1,4 +1,7 @@
 ---
+navigation_title: Monitoring
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/monitoring-troubleshooting.html
 applies_to:
   stack:
   deployment:
@@ -6,9 +9,8 @@ applies_to:
     ess:
     ece:
     self:
-navigation_title: Monitoring
-mapped_pages:
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/monitoring-troubleshooting.html
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot monitoring [monitoring-troubleshooting]
diff --git a/troubleshoot/elasticsearch/red-yellow-cluster-status.md b/troubleshoot/elasticsearch/red-yellow-cluster-status.md
index 7e426fd1e..3a8a878eb 100644
--- a/troubleshoot/elasticsearch/red-yellow-cluster-status.md
+++ b/troubleshoot/elasticsearch/red-yellow-cluster-status.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Red or yellow health status
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/red-yellow-cluster-status.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Red or yellow cluster health status [red-yellow-cluster-status]
diff --git a/troubleshoot/elasticsearch/rejected-requests.md b/troubleshoot/elasticsearch/rejected-requests.md
index 9c7182fd1..21699a351 100644
--- a/troubleshoot/elasticsearch/rejected-requests.md
+++ b/troubleshoot/elasticsearch/rejected-requests.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/rejected-requests.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Rejected requests [rejected-requests]
diff --git a/troubleshoot/elasticsearch/remote-clusters.md b/troubleshoot/elasticsearch/remote-clusters.md
index a5f7cb296..043c819fb 100644
--- a/troubleshoot/elasticsearch/remote-clusters.md
+++ b/troubleshoot/elasticsearch/remote-clusters.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Remote clusters
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/remote-clusters-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 
diff --git a/troubleshoot/elasticsearch/repeated-snapshot-failures.md b/troubleshoot/elasticsearch/repeated-snapshot-failures.md
index cd55f29bc..457827a96 100644
--- a/troubleshoot/elasticsearch/repeated-snapshot-failures.md
+++ b/troubleshoot/elasticsearch/repeated-snapshot-failures.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Snapshot policy failures
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/repeated-snapshot-failures.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Fix repeated snapshot policy failures [repeated-snapshot-failures]
diff --git a/troubleshoot/elasticsearch/restore-from-snapshot.md b/troubleshoot/elasticsearch/restore-from-snapshot.md
index 96ede45ad..4f0e6f32f 100644
--- a/troubleshoot/elasticsearch/restore-from-snapshot.md
+++ b/troubleshoot/elasticsearch/restore-from-snapshot.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/restore-from-snapshot.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Restore from snapshot [restore-from-snapshot]
diff --git a/troubleshoot/elasticsearch/security.md b/troubleshoot/elasticsearch/security.md
index 38e21995c..c5306533c 100644
--- a/troubleshoot/elasticsearch/security.md
+++ b/troubleshoot/elasticsearch/security.md
@@ -2,6 +2,8 @@
 navigation_title: Security
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-troubleshooting.html
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot security in {{es}} [security-troubleshooting]
diff --git a/troubleshoot/elasticsearch/security/security-trb-extraargs.md b/troubleshoot/elasticsearch/security/security-trb-extraargs.md
index 3b3138fef..164b09970 100644
--- a/troubleshoot/elasticsearch/security/security-trb-extraargs.md
+++ b/troubleshoot/elasticsearch/security/security-trb-extraargs.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: "Error: Extra arguments provided"
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-trb-extraargs.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Error: Extra arguments were provided [security-trb-extraargs]
diff --git a/troubleshoot/elasticsearch/security/security-trb-roles.md b/troubleshoot/elasticsearch/security/security-trb-roles.md
index 71cd63f1b..ea8c455ff 100644
--- a/troubleshoot/elasticsearch/security/security-trb-roles.md
+++ b/troubleshoot/elasticsearch/security/security-trb-roles.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Authorization errors
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-trb-roles.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot authorization errors  [security-trb-roles]
diff --git a/troubleshoot/elasticsearch/security/security-trb-settings.md b/troubleshoot/elasticsearch/security/security-trb-settings.md
index 522d579f5..0e3493c36 100644
--- a/troubleshoot/elasticsearch/security/security-trb-settings.md
+++ b/troubleshoot/elasticsearch/security/security-trb-settings.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Nodes info API response
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-trb-settings.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot a nodes info API response [security-trb-settings]
diff --git a/troubleshoot/elasticsearch/security/token-invalid-expired.md b/troubleshoot/elasticsearch/security/token-invalid-expired.md
index a4bce9b4b..860b01c04 100644
--- a/troubleshoot/elasticsearch/security/token-invalid-expired.md
+++ b/troubleshoot/elasticsearch/security/token-invalid-expired.md
@@ -1,11 +1,11 @@
 ---
 applies_to:
-  stack: 
+  stack:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
 navigation_title: "Error: Token invalid or expired"
 ---
 
diff --git a/troubleshoot/elasticsearch/security/trb-security-internalserver.md b/troubleshoot/elasticsearch/security/trb-security-internalserver.md
index 516fddd9d..a0bb435ba 100644
--- a/troubleshoot/elasticsearch/security/trb-security-internalserver.md
+++ b/troubleshoot/elasticsearch/security/trb-security-internalserver.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Kibana internal server error
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-internalserver.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Internal server error in Kibana [trb-security-internalserver]
diff --git a/troubleshoot/elasticsearch/security/trb-security-kerberos.md b/troubleshoot/elasticsearch/security/trb-security-kerberos.md
index 4ae0ddee5..e21c96772 100644
--- a/troubleshoot/elasticsearch/security/trb-security-kerberos.md
+++ b/troubleshoot/elasticsearch/security/trb-security-kerberos.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Kerberos
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-kerberos.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Common Kerberos exceptions [trb-security-kerberos]
diff --git a/troubleshoot/elasticsearch/security/trb-security-maccurl.md b/troubleshoot/elasticsearch/security/trb-security-maccurl.md
index 2f56391dd..04d608fd2 100644
--- a/troubleshoot/elasticsearch/security/trb-security-maccurl.md
+++ b/troubleshoot/elasticsearch/security/trb-security-maccurl.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Certificate verification with curl on Mac
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-maccurl.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot failed certificate verification with curl on Mac [trb-security-maccurl]
diff --git a/troubleshoot/elasticsearch/security/trb-security-path.md b/troubleshoot/elasticsearch/security/trb-security-path.md
index 71a438f52..ad1af1e84 100644
--- a/troubleshoot/elasticsearch/security/trb-security-path.md
+++ b/troubleshoot/elasticsearch/security/trb-security-path.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Configuration file locations
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-path.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Diagnose configuration file location issues [trb-security-path]
diff --git a/troubleshoot/elasticsearch/security/trb-security-saml.md b/troubleshoot/elasticsearch/security/trb-security-saml.md
index 63f0cb4b2..c62bef70c 100644
--- a/troubleshoot/elasticsearch/security/trb-security-saml.md
+++ b/troubleshoot/elasticsearch/security/trb-security-saml.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: SAML
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-saml.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Common SAML issues [trb-security-saml]
diff --git a/troubleshoot/elasticsearch/security/trb-security-setup.md b/troubleshoot/elasticsearch/security/trb-security-setup.md
index edbd9a81d..52b108849 100644
--- a/troubleshoot/elasticsearch/security/trb-security-setup.md
+++ b/troubleshoot/elasticsearch/security/trb-security-setup.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Password setup failures
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-setup.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Diagnose password setup connection failures [trb-security-setup]
diff --git a/troubleshoot/elasticsearch/security/trb-security-ssl.md b/troubleshoot/elasticsearch/security/trb-security-ssl.md
index 8cbe0705b..e0d655caa 100644
--- a/troubleshoot/elasticsearch/security/trb-security-ssl.md
+++ b/troubleshoot/elasticsearch/security/trb-security-ssl.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: SSL/TLS exceptions
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-ssl.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Common SSL/TLS exceptions [trb-security-ssl]
diff --git a/troubleshoot/elasticsearch/security/trb-security-sslhandshake.md b/troubleshoot/elasticsearch/security/trb-security-sslhandshake.md
index d805f8784..e47dd00bf 100644
--- a/troubleshoot/elasticsearch/security/trb-security-sslhandshake.md
+++ b/troubleshoot/elasticsearch/security/trb-security-sslhandshake.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: SSLHandshakeException
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trb-security-sslhandshake.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot SSLHandshakeException and failed node connections [trb-security-sslhandshake]
diff --git a/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md b/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
index 83456a8b4..3effce118 100644
--- a/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
+++ b/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Active Directory
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/trouble-shoot-active-directory.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot Active Directory lockouts [trouble-shoot-active-directory]
diff --git a/troubleshoot/elasticsearch/start-ilm.md b/troubleshoot/elasticsearch/start-ilm.md
index bb6ce8564..155bc9ea7 100644
--- a/troubleshoot/elasticsearch/start-ilm.md
+++ b/troubleshoot/elasticsearch/start-ilm.md
@@ -1,15 +1,17 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Lifecycle management
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/start-ilm.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/start-slm.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % TODO reframe how-to stuff as troubleshooting content
diff --git a/troubleshoot/elasticsearch/task-queue-backlog.md b/troubleshoot/elasticsearch/task-queue-backlog.md
index d8362bd2e..556ef60b6 100644
--- a/troubleshoot/elasticsearch/task-queue-backlog.md
+++ b/troubleshoot/elasticsearch/task-queue-backlog.md
@@ -1,13 +1,15 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/task-queue-backlog.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Task queue backlog [task-queue-backlog]
diff --git a/troubleshoot/elasticsearch/transform-troubleshooting.md b/troubleshoot/elasticsearch/transform-troubleshooting.md
index abb9f3149..265eb54dd 100644
--- a/troubleshoot/elasticsearch/transform-troubleshooting.md
+++ b/troubleshoot/elasticsearch/transform-troubleshooting.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Transforms
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot transforms [transform-troubleshooting]
diff --git a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
index 44b7f8c32..fd4b68790 100644
--- a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+++ b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Incomplete migration to data tiers
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshoot-migrate-to-tiers.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % old title: Mix of index allocation filters and data tier node roles
diff --git a/troubleshoot/elasticsearch/troubleshooting-searches.md b/troubleshoot/elasticsearch/troubleshooting-searches.md
index 04c885d85..c9b29bc51 100644
--- a/troubleshoot/elasticsearch/troubleshooting-searches.md
+++ b/troubleshoot/elasticsearch/troubleshooting-searches.md
@@ -1,15 +1,18 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Searches
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshooting-searches.html
   - https://www.elastic.co/guide/en/serverless/current/devtools-dev-tools-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Troubleshoot searches [troubleshooting-searches]
diff --git a/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md b/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
index fa2e0d6cf..927294dea 100644
--- a/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
+++ b/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Shard capacity issues
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshooting-shards-capacity-issues.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot shard capacity health issues [troubleshooting-shards-capacity-issues]
diff --git a/troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md b/troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
index 5dc7c954f..bc11a31ae 100644
--- a/troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
+++ b/troubleshoot/elasticsearch/troubleshooting-unbalanced-cluster.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Unbalanced clusters
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshooting-unbalanced-cluster.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 % marciw move so this is with other cluster topics
diff --git a/troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md b/troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
index 7b8aae995..9d2fa42fd 100644
--- a/troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
+++ b/troubleshoot/elasticsearch/troubleshooting-unstable-cluster.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Unstable clusters
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/troubleshooting-unstable-cluster.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot an unstable cluster [troubleshooting-unstable-cluster]
diff --git a/troubleshoot/elasticsearch/unable-to-retrieve-node-fs-stats.md b/troubleshoot/elasticsearch/unable-to-retrieve-node-fs-stats.md
index 462360d11..9bc80c563 100644
--- a/troubleshoot/elasticsearch/unable-to-retrieve-node-fs-stats.md
+++ b/troubleshoot/elasticsearch/unable-to-retrieve-node-fs-stats.md
@@ -1,11 +1,11 @@
 ---
 applies_to:
-  stack: 
+  stack:
   deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
+    eck:
+    ess:
+    ece:
+    self:
 navigation_title: "Error: Unable to retrieve node fs stats"
 ---
 
diff --git a/troubleshoot/elasticsearch/watcher-troubleshooting.md b/troubleshoot/elasticsearch/watcher-troubleshooting.md
index d6813d2c7..24a4703f0 100644
--- a/troubleshoot/elasticsearch/watcher-troubleshooting.md
+++ b/troubleshoot/elasticsearch/watcher-troubleshooting.md
@@ -1,14 +1,16 @@
 ---
-applies_to:
-  stack: 
-  deployment:
-    eck: 
-    ess: 
-    ece: 
-    self: 
 navigation_title: Watcher
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-troubleshooting.html
+applies_to:
+  stack:
+  deployment:
+    eck:
+    ess:
+    ece:
+    self:
+products:
+  - id: elasticsearch
 ---
 
 # Troubleshoot Watcher [watcher-troubleshooting]
diff --git a/troubleshoot/index.md b/troubleshoot/index.md
index ac845d976..031f2eb69 100644
--- a/troubleshoot/index.md
+++ b/troubleshoot/index.md
@@ -1,11 +1,15 @@
 ---
-navigation_title: "Troubleshoot"
+navigation_title: Troubleshoot
 mapped_pages:
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/get-support-help.html
   - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/troubleshooting-and-faqs.html
   - https://www.elastic.co/guide/en/cloud/current/ec-get-help.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-get-help.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-getting-help.html
+products:
+  - id: elastic-stack
+  - id: cloud-hosted
+  - id: cloud-enterprise
 ---
 
 # Troubleshooting
diff --git a/troubleshoot/ingest.md b/troubleshoot/ingest.md
index 2b702b5b9..c37259769 100644
--- a/troubleshoot/ingest.md
+++ b/troubleshoot/ingest.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Ingest tools"
+navigation_title: Ingest tools
 applies_to:
   stack: ga
   serverless: ga
diff --git a/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md b/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
index 6a043bbcf..f1b4a454d 100644
--- a/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
+++ b/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
@@ -4,6 +4,8 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: beats
 ---
 
 # Elastic Logging Plugin for Docker [log-driver-troubleshooting]
diff --git a/troubleshoot/ingest/elastic-serverless-forwarder.md b/troubleshoot/ingest/elastic-serverless-forwarder.md
index b87a14163..95d885b52 100644
--- a/troubleshoot/ingest/elastic-serverless-forwarder.md
+++ b/troubleshoot/ingest/elastic-serverless-forwarder.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Elastic Serverless Forwarder"
+navigation_title: Elastic Serverless Forwarder
+mapped_pages:
+  - https://www.elastic.co/guide/en/esf/current/aws-serverless-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/esf/current/aws-serverless-troubleshooting.html
+products:
+  - id: elastic-serverless-forwarder
 ---
 
 
diff --git a/troubleshoot/ingest/fleet/common-problems.md b/troubleshoot/ingest/fleet/common-problems.md
index c2ad71de1..0b87e8bfc 100644
--- a/troubleshoot/ingest/fleet/common-problems.md
+++ b/troubleshoot/ingest/fleet/common-problems.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Common problems [fleet-troubleshooting]
diff --git a/troubleshoot/ingest/fleet/fleet-elastic-agent.md b/troubleshoot/ingest/fleet/fleet-elastic-agent.md
index 3a2957db3..6c79b41a7 100644
--- a/troubleshoot/ingest/fleet/fleet-elastic-agent.md
+++ b/troubleshoot/ingest/fleet/fleet-elastic-agent.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Fleet and Elastic Agent [troubleshooting-intro]
diff --git a/troubleshoot/ingest/fleet/frequently-asked-questions.md b/troubleshoot/ingest/fleet/frequently-asked-questions.md
index d989b8d51..9658c962a 100644
--- a/troubleshoot/ingest/fleet/frequently-asked-questions.md
+++ b/troubleshoot/ingest/fleet/frequently-asked-questions.md
@@ -4,6 +4,9 @@ mapped_pages:
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: fleet
+  - id: elastic-agent
 ---
 
 # Frequently asked questions [fleet-faq]
diff --git a/troubleshoot/ingest/logstash.md b/troubleshoot/ingest/logstash.md
index 1acb8ce71..3ddffdef6 100644
--- a/troubleshoot/ingest/logstash.md
+++ b/troubleshoot/ingest/logstash.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Logstash"
+navigation_title: Logstash
 mapped_pages:
   - https://www.elastic.co/guide/en/logstash/current/troubleshooting.html
   - https://www.elastic.co/guide/en/logstash/current/ts-logstash.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: logstash
 ---
 
 # Troubleshoot Logstash [ts-logstash]
diff --git a/troubleshoot/ingest/logstash/azure-event-hub.md b/troubleshoot/ingest/logstash/azure-event-hub.md
index 36c9ca537..bdb0ccfc7 100644
--- a/troubleshoot/ingest/logstash/azure-event-hub.md
+++ b/troubleshoot/ingest/logstash/azure-event-hub.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Azure Event Hub"
+navigation_title: Azure Event Hub
 mapped_pages:
   - https://www.elastic.co/guide/en/logstash/current/ts-plugins.html#ts-azure
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: logstash
 ---
 
 # Troubleshoot Logstash plugin for Azure Event Hub [ts-azure]
diff --git a/troubleshoot/ingest/logstash/health-report-pipelines.md b/troubleshoot/ingest/logstash/health-report-pipelines.md
index 1129b16f1..7e2562b3c 100644
--- a/troubleshoot/ingest/logstash/health-report-pipelines.md
+++ b/troubleshoot/ingest/logstash/health-report-pipelines.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Health report pipelines"
+navigation_title: Health report pipelines
 mapped_pages:
   - https://www.elastic.co/guide/en/logstash/current/health-report-pipeline-status.html
   - https://www.elastic.co/guide/en/logstash/current/health-report-pipeline-flow-worker-utilization.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: logstash
 ---
 
 # Troubleshoot health report pipelines
diff --git a/troubleshoot/ingest/logstash/kafka.md b/troubleshoot/ingest/logstash/kafka.md
index 5f95c6b37..f1aebb7fb 100644
--- a/troubleshoot/ingest/logstash/kafka.md
+++ b/troubleshoot/ingest/logstash/kafka.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Kafka"
+navigation_title: Kafka
 mapped_pages:
   - https://www.elastic.co/guide/en/logstash/current/ts-plugins.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: logstash
 ---
 
 # Troubleshoot Logstash plugin for Kafka [ts-kafka]
diff --git a/troubleshoot/ingest/logstash/plugins.md b/troubleshoot/ingest/logstash/plugins.md
index a96aa1a23..b84dea1cb 100644
--- a/troubleshoot/ingest/logstash/plugins.md
+++ b/troubleshoot/ingest/logstash/plugins.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Plugins"
+navigation_title: Plugins
 mapped_pages:
   - https://www.elastic.co/guide/en/logstash/current/ts-plugins-general.html
 applies_to:
   stack: ga
   serverless: ga
+products:
+  - id: logstash
 ---
 
 # Troubleshoot Logstash plugins [ts-plugins-general]
diff --git a/troubleshoot/kibana.md b/troubleshoot/kibana.md
index 8e0c2ceab..c1bcef91f 100644
--- a/troubleshoot/kibana.md
+++ b/troubleshoot/kibana.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Kibana"
+navigation_title: Kibana
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 # Troubleshoot Kibana [kibana-troubleshooting]
diff --git a/troubleshoot/kibana/access.md b/troubleshoot/kibana/access.md
index df1ea8304..f85f70c36 100644
--- a/troubleshoot/kibana/access.md
+++ b/troubleshoot/kibana/access.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Server status"
-applies_to:
-  stack: all
+navigation_title: Server status
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/access.html#status
+applies_to:
+  stack: all
+products:
+  - id: kibana
 ---
 
 # Check {{kib}} server status [access]
diff --git a/troubleshoot/kibana/alerts.md b/troubleshoot/kibana/alerts.md
index 8cad976f9..fae34eb2e 100644
--- a/troubleshoot/kibana/alerts.md
+++ b/troubleshoot/kibana/alerts.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Alerts"
+navigation_title: Alerts
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/alerting-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/alerting-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 # Troubleshoot {{kib}} alerts [alerting-troubleshooting]
diff --git a/troubleshoot/kibana/capturing-diagnostics.md b/troubleshoot/kibana/capturing-diagnostics.md
index fff44b6ad..f4a2a730a 100644
--- a/troubleshoot/kibana/capturing-diagnostics.md
+++ b/troubleshoot/kibana/capturing-diagnostics.md
@@ -1,13 +1,15 @@
 ---
-navigation_title: "Diagnostics"
+navigation_title: Diagnostics
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kibana-diagnostic.html
 applies_to:
   deployment:
     ess: all
     ece: all
     self: all
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kibana-diagnostic.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/troubleshoot/kibana/error-server-not-ready.md b/troubleshoot/kibana/error-server-not-ready.md
index 9ab711f5a..605884d2c 100644
--- a/troubleshoot/kibana/error-server-not-ready.md
+++ b/troubleshoot/kibana/error-server-not-ready.md
@@ -1,13 +1,15 @@
 ---
 navigation_title: "Error: Server not ready"
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/access.html#not-ready
 applies_to:
   deployment:
     ess: all
     ece: all
     self: all
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/access.html#not-ready
+products:
+  - id: kibana
 ---
 
 # Error: {{kib}} server is not ready yet [not-ready]
diff --git a/troubleshoot/kibana/graph.md b/troubleshoot/kibana/graph.md
index 03ce232ca..fdd9e3eb0 100644
--- a/troubleshoot/kibana/graph.md
+++ b/troubleshoot/kibana/graph.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Graph"
+navigation_title: Graph
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/graph-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/graph-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/troubleshoot/kibana/maps.md b/troubleshoot/kibana/maps.md
index ae7b0f73a..02930e8f2 100644
--- a/troubleshoot/kibana/maps.md
+++ b/troubleshoot/kibana/maps.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Maps"
+navigation_title: Maps
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/maps-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/maps-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/troubleshoot/kibana/migration-failures.md b/troubleshoot/kibana/migration-failures.md
index 1bf1ced45..fe12582fe 100644
--- a/troubleshoot/kibana/migration-failures.md
+++ b/troubleshoot/kibana/migration-failures.md
@@ -1,13 +1,15 @@
 ---
-navigation_title: "Migration and upgrades"
+navigation_title: Migration and upgrades
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/resolve-migrations-failures.html
 applies_to:
   deployment:
     ess: all
     ece: all
     self: all
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/resolve-migrations-failures.html
+products:
+  - id: kibana
 ---
 
 # Troubleshoot {{kib}} migration and upgrades [resolve-migrations-failures]
diff --git a/troubleshoot/kibana/monitoring.md b/troubleshoot/kibana/monitoring.md
index 24e59db28..9d83fef42 100644
--- a/troubleshoot/kibana/monitoring.md
+++ b/troubleshoot/kibana/monitoring.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Monitoring"
+navigation_title: Monitoring
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/monitor-troubleshooting.html
 applies_to:
   deployment:
     self: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/monitor-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 # Troubleshoot {{kib}} monitoring [monitor-troubleshooting]
diff --git a/troubleshoot/kibana/reporting.md b/troubleshoot/kibana/reporting.md
index 38010802f..19f38a356 100644
--- a/troubleshoot/kibana/reporting.md
+++ b/troubleshoot/kibana/reporting.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Reporting"
+navigation_title: Reporting
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html
 applies_to:
   stack: all
   serverless: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html
+products:
+  - id: kibana
 ---
 
 
diff --git a/troubleshoot/kibana/task-manager.md b/troubleshoot/kibana/task-manager.md
index 3f56f89c4..ba838dd98 100644
--- a/troubleshoot/kibana/task-manager.md
+++ b/troubleshoot/kibana/task-manager.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Task Manager"
-applies_to:
-  stack: preview
+navigation_title: Task Manager
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/task-manager-troubleshooting.html
+applies_to:
+  stack: preview
+products:
+  - id: kibana
 ---
 
 # Troubleshoot {{kib}} Task Manager [task-manager-troubleshooting]
diff --git a/troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md b/troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
index 49ef28aff..23cb107f2 100644
--- a/troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
+++ b/troubleshoot/kibana/trace-elasticsearch-query-to-the-origin-in-kibana.md
@@ -1,13 +1,15 @@
 ---
-navigation_title: "Trace {{es}} query"
+navigation_title: Trace {{es}} query
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting-trace-query.html
 applies_to:
   deployment:
     ess: all
     ece: all
     self: all
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting-trace-query.html
+products:
+  - id: kibana
 ---
 
 # Trace an {{es}} query in {{kib}} [kibana-troubleshooting-trace-query]
diff --git a/troubleshoot/kibana/using-kibana-server-logs.md b/troubleshoot/kibana/using-kibana-server-logs.md
index 33b5b1e66..bc549474a 100644
--- a/troubleshoot/kibana/using-kibana-server-logs.md
+++ b/troubleshoot/kibana/using-kibana-server-logs.md
@@ -1,13 +1,15 @@
 ---
-navigation_title: "Server logs"
+navigation_title: Server logs
+mapped_pages:
+  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting-kibana-server-logs.html
 applies_to:
   deployment:
     ess: all
     ece: all
     self: all
     eck: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/kibana/current/kibana-troubleshooting-kibana-server-logs.html
+products:
+  - id: kibana
 ---
 
 # Using Kibana server logs [kibana-troubleshooting-kibana-server-logs]
diff --git a/troubleshoot/monitoring/cluster-response-time.md b/troubleshoot/monitoring/cluster-response-time.md
index f885fc916..b7cf32c13 100644
--- a/troubleshoot/monitoring/cluster-response-time.md
+++ b/troubleshoot/monitoring/cluster-response-time.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Cluster response time"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Cluster response time
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-scenario_why_are_my_cluster_response_times_suddenly_so_much_worse.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/echscenario_why_are_my_cluster_response_times_suddenly_so_much_worse.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot slow cluster response time [ec-scenario_why_are_my_cluster_response_times_suddenly_so_much_worse]
diff --git a/troubleshoot/monitoring/deployment-health-warnings.md b/troubleshoot/monitoring/deployment-health-warnings.md
index 99161e0b9..b26fed9ba 100644
--- a/troubleshoot/monitoring/deployment-health-warnings.md
+++ b/troubleshoot/monitoring/deployment-health-warnings.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Deployment health warnings"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Deployment health warnings
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-deployment-no-op.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-deployment-no-op.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot deployment health warnings [ec-deployment-no-op]
diff --git a/troubleshoot/monitoring/high-availability.md b/troubleshoot/monitoring/high-availability.md
index 3c5c2df90..e302000a4 100644
--- a/troubleshoot/monitoring/high-availability.md
+++ b/troubleshoot/monitoring/high-availability.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Cluster performance metrics"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Cluster performance metrics
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-scenario_is_my_cluster_really_highly_available.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/echscenario_is_my_cluster_really_highly_available.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot cluster availability using performance metrics [ec-scenario_is_my_cluster_really_highly_available]
diff --git a/troubleshoot/monitoring/high-memory-pressure.md b/troubleshoot/monitoring/high-memory-pressure.md
index dad3bed12..3085f585f 100644
--- a/troubleshoot/monitoring/high-memory-pressure.md
+++ b/troubleshoot/monitoring/high-memory-pressure.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "High memory pressure"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: High memory pressure
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-metrics-memory-pressure.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-metrics-memory-pressure.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot high memory pressure
diff --git a/troubleshoot/monitoring/node-bootlooping.md b/troubleshoot/monitoring/node-bootlooping.md
index 623db6525..cbed40c23 100644
--- a/troubleshoot/monitoring/node-bootlooping.md
+++ b/troubleshoot/monitoring/node-bootlooping.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Node bootlooping"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Node bootlooping
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-config-change-errors.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-config-change-errors.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot node bootlooping in {{ech}} [ec-config-change-errors]
@@ -49,14 +51,14 @@ If you’re unable to remediate the failing plan’s root cause, you can attempt
 The most frequent cause of a failed deployment configuration change is due to invalid or mislocated [secure settings](/deploy-manage/security/secure-settings.md). This can frequently be discovered by searching {{es}} logs for one of the following error messages:
 
 ```sh
-# Typical Error Message 
+# Typical Error Message
 #------------------------------
 [ERROR][org.elasticsearch.bootstrap.Elasticsearch] ... fatal exception while booting Elasticsearch
 IllegalStateException: security initialization failed
 
 java.lang.IllegalArgumentException: unknown secure setting
 
-org.elasticsearch.common.settings.SettingsException: 
+org.elasticsearch.common.settings.SettingsException:
 The configuration setting [xpack.security.authc.realms.foobar.foobar1.foobar2.client_secret] is required
 #------------------------------
 ```
diff --git a/troubleshoot/monitoring/node-moves-outages.md b/troubleshoot/monitoring/node-moves-outages.md
index a869e9127..76e6d032b 100644
--- a/troubleshoot/monitoring/node-moves-outages.md
+++ b/troubleshoot/monitoring/node-moves-outages.md
@@ -1,10 +1,12 @@
 ---
-navigation_title: "Node moves and outages"
+navigation_title: Node moves and outages
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-deployment-node-move.html
 applies_to:
   deployment:
     ess: all
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-deployment-node-move.html
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot node moves and outages [ec-deployment-node-move]
diff --git a/troubleshoot/monitoring/performance.md b/troubleshoot/monitoring/performance.md
index fcbc42a3a..82fc6e847 100644
--- a/troubleshoot/monitoring/performance.md
+++ b/troubleshoot/monitoring/performance.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Performance"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Performance
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-scenario_why_is_performance_degrading_over_time.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/echscenario_why_is_performance_degrading_over_time.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Troubleshoot performance degrading over time[ec-scenario_why_is_performance_degrading_over_time]
diff --git a/troubleshoot/monitoring/unavailable-nodes.md b/troubleshoot/monitoring/unavailable-nodes.md
index cfb7d630c..47ca48770 100644
--- a/troubleshoot/monitoring/unavailable-nodes.md
+++ b/troubleshoot/monitoring/unavailable-nodes.md
@@ -1,8 +1,5 @@
 ---
-navigation_title: "Unavailable nodes"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Unavailable nodes
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-scenario_why_is_my_node_unavailable.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/echscenario_why_is_my_node_unavailable.html
@@ -11,6 +8,11 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-jvm-heap-usage-exceed-allowed-threshold.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-cpu-usage-exceed-allowed-threshold.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-nodes-unavailable-missing.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 % TODO fix the layout and formatting
diff --git a/troubleshoot/monitoring/unavailable-shards.md b/troubleshoot/monitoring/unavailable-shards.md
index 26d6f64e5..074fadaa1 100644
--- a/troubleshoot/monitoring/unavailable-shards.md
+++ b/troubleshoot/monitoring/unavailable-shards.md
@@ -1,14 +1,16 @@
 ---
-navigation_title: "Unavailable shards"
-applies_to:
-  deployment:
-    ess: all
+navigation_title: Unavailable shards
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-scenario_why_are_shards_unavailable.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/echscenario_why_are_shards_unavailable.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-analyze_shards_with-api.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-analyze_shards_with-kibana.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-remediate-issues-allocation-explain-API.html
+applies_to:
+  deployment:
+    ess: all
+products:
+  - id: cloud-hosted
 ---
 
 # Diagnose unavailable shards [ec-scenario_why_are_shards_unavailable]
diff --git a/troubleshoot/observability.md b/troubleshoot/observability.md
index 9f81d9c2c..2e4a68673 100644
--- a/troubleshoot/observability.md
+++ b/troubleshoot/observability.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Observability"
+navigation_title: Observability
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 # Troubleshoot Observability [troubleshooting]
diff --git a/troubleshoot/observability/amazon-data-firehose.md b/troubleshoot/observability/amazon-data-firehose.md
index 3f671b17e..187387d20 100644
--- a/troubleshoot/observability/amazon-data-firehose.md
+++ b/troubleshoot/observability/amazon-data-firehose.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "Amazon Data Firehose"
+navigation_title: Amazon Data Firehose
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/monitor-aws-firehose-troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 
diff --git a/troubleshoot/observability/apm-agent-dotnet/apm-net-agent.md b/troubleshoot/observability/apm-agent-dotnet/apm-net-agent.md
index 74e8e3564..6a81c8b64 100644
--- a/troubleshoot/observability/apm-agent-dotnet/apm-net-agent.md
+++ b/troubleshoot/observability/apm-agent-dotnet/apm-net-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM .NET agent"
+navigation_title: APM .NET agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/dotnet/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM .NET agent
diff --git a/troubleshoot/observability/apm-agent-go/apm-go-agent.md b/troubleshoot/observability/apm-agent-go/apm-go-agent.md
index 05fe4bb63..c6a73e94b 100644
--- a/troubleshoot/observability/apm-agent-go/apm-go-agent.md
+++ b/troubleshoot/observability/apm-agent-go/apm-go-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM Go Agent"
+navigation_title: APM Go Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/go/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Go Agent
diff --git a/troubleshoot/observability/apm-agent-java/apm-java-agent.md b/troubleshoot/observability/apm-agent-java/apm-java-agent.md
index 10efa1099..734acc7cf 100644
--- a/troubleshoot/observability/apm-agent-java/apm-java-agent.md
+++ b/troubleshoot/observability/apm-agent-java/apm-java-agent.md
@@ -1,16 +1,18 @@
 ---
-navigation_title: "APM Java Agent"
+navigation_title: APM Java Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/java/current/trouble-shooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Java Agent [trouble-shooting]
 
-Something isn’t quite working as expected? Here are some guidelines how to find out what’s going wrong. 
+Something isn’t quite working as expected? Here are some guidelines how to find out what’s going wrong.
 
 As a first step, check if your stack is compatible with the currently [supported technologies](apm-agent-java://reference/set-up-apm-java-agent.md#supported-technologies).
 
diff --git a/troubleshoot/observability/apm-agent-nodejs/apm-nodejs-agent.md b/troubleshoot/observability/apm-agent-nodejs/apm-nodejs-agent.md
index 1236dcac1..125f550dd 100644
--- a/troubleshoot/observability/apm-agent-nodejs/apm-nodejs-agent.md
+++ b/troubleshoot/observability/apm-agent-nodejs/apm-nodejs-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM Node.js Agent"
+navigation_title: APM Node.js Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/nodejs/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Node.js Agent [troubleshooting]
diff --git a/troubleshoot/observability/apm-agent-php/apm-php-agent.md b/troubleshoot/observability/apm-agent-php/apm-php-agent.md
index e1875c95d..f973bccb2 100644
--- a/troubleshoot/observability/apm-agent-php/apm-php-agent.md
+++ b/troubleshoot/observability/apm-agent-php/apm-php-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM PHP Agent"
+navigation_title: APM PHP Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/php/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM PHP Agent [troubleshooting]
diff --git a/troubleshoot/observability/apm-agent-python/apm-python-agent.md b/troubleshoot/observability/apm-agent-python/apm-python-agent.md
index 086fe1de9..169f04150 100644
--- a/troubleshoot/observability/apm-agent-python/apm-python-agent.md
+++ b/troubleshoot/observability/apm-agent-python/apm-python-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM Python Agent"
+navigation_title: APM Python Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/python/current/troubleshooting.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Python Agent [troubleshooting]
diff --git a/troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md b/troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md
index b715f35a6..3100939b4 100644
--- a/troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md
+++ b/troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM Ruby Agent"
+navigation_title: APM Ruby Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/debugging.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Ruby Agent [debugging]
diff --git a/troubleshoot/observability/apm-agent-rum-js/apm-real-user-monitoring-javascript-agent.md b/troubleshoot/observability/apm-agent-rum-js/apm-real-user-monitoring-javascript-agent.md
index 01e498bd3..64043790e 100644
--- a/troubleshoot/observability/apm-agent-rum-js/apm-real-user-monitoring-javascript-agent.md
+++ b/troubleshoot/observability/apm-agent-rum-js/apm-real-user-monitoring-javascript-agent.md
@@ -1,22 +1,24 @@
 ---
-navigation_title: "APM Real User Monitoring JavaScript Agent"
+navigation_title: APM Real User Monitoring JavaScript Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/rum-js/current/troubleshooting.html
 applies_to:
   stack: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM Real User Monitoring JavaScript Agent [troubleshooting]
 
 
-## Some errors in the application appear to be originating from the agent’s JavaScript file [errors-originating-from-agent] 
+## Some errors in the application appear to be originating from the agent’s JavaScript file [errors-originating-from-agent]
 
 In some cases when you look at the stack trace of an error, it appears to be originating from the agent’s JavaScript file. However, since we need to patch some browser APIs in order to provide some of the core functionalities of the agent, our JavaScript file appears in the error stack trace. Often, the error is generated from another part your application, you can follow the stack trace further to identify the offending code.
 
 Of course, there are errors that might have been caused by the agent itself and we appreciate it if you [report them back to us](#get-in-touch).
 
 
-## Some errors in the application only show `script error` [cross-origin-script-error] 
+## Some errors in the application only show `script error` [cross-origin-script-error]
 
 In some cases when you look at the details of an error, the only information you can see is the message `Script error`. This happens when an error originates from a JavaScript file served from a different origin than the page’s origin.
 
@@ -38,23 +40,23 @@ In order to get visibility of the error’s detail, you must do two things.
     ```
 
 
-::::{note} 
+::::{note}
 `Access-Control-Allow-Origin: *` will not match `localhost` in some browsers (e.g. [in Chrome](https://bugs.chromium.org/p/chromium/issues/detail?id=67743)), causing `Script error` messages in local development environments when the configuration is otherwise correct.
 ::::
 
 
-::::{tip} 
+::::{tip}
 To learn more about how browsers handle script errors, see the MDN page on the [onerror](https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers/onerror#notes) event.
 ::::
 
 
 
-## No stack trace available in the Span detail view [no-stack-trace-available] 
+## No stack trace available in the Span detail view [no-stack-trace-available]
 
 The RUM JS agent does not support stack traces for spans due to performance concerns related to gathering stack information.
 
 
-## Debugging [debugging] 
+## Debugging [debugging]
 
 In order to debug the agent consider performing the following steps:
 
@@ -64,7 +66,7 @@ In order to debug the agent consider performing the following steps:
 4. Monitor the Console and Network panel in your browsers developer tools
 
 
-## Disable events payload compression [disable-events-payload-compression] 
+## Disable events payload compression [disable-events-payload-compression]
 
 In browsers such as Chrome, the RUM agent event payload is compressed with gzip. Because of this compression, you will not see readable content when inspecting the event with the Network panel of your browser developer tools.
 
@@ -78,14 +80,14 @@ There are two ways to disable the payload compression:
 The effect of this will remain until the tab or browser is closed.
 
 
-## Disable the Agent [disable-agent] 
+## Disable the Agent [disable-agent]
 
 In the unlikely event the agent causes disruptions to a production application, you can disable the agent while you troubleshoot.
 
 To disable the agent, set [`active`](apm-agent-rum-js://reference/configuration.md#active) to `false`.
 
 
-## Get in touch [get-in-touch] 
+## Get in touch [get-in-touch]
 
 If you have any questions, create a new topic in the [Elastic APM discuss forum](https://discuss.elastic.co/c/apm).
 
diff --git a/troubleshoot/observability/apm-agent-swift/apm-ios-agent.md b/troubleshoot/observability/apm-agent-swift/apm-ios-agent.md
index ebd13460e..37d715e63 100644
--- a/troubleshoot/observability/apm-agent-swift/apm-ios-agent.md
+++ b/troubleshoot/observability/apm-agent-swift/apm-ios-agent.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "APM iOS Agent"
+navigation_title: APM iOS Agent
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/swift/current/troubleshooting.html
 applies_to:
   stack: all
+products:
+  - id: apm-agent
 ---
 
 # Troubleshoot APM iOS Agent [troubleshooting]
diff --git a/troubleshoot/observability/apm.md b/troubleshoot/observability/apm.md
index ba0f8ada1..ee20b47ba 100644
--- a/troubleshoot/observability/apm.md
+++ b/troubleshoot/observability/apm.md
@@ -1,11 +1,13 @@
 ---
-navigation_title: "APM"
+navigation_title: APM
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-troubleshoot-apm.html
 applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 
diff --git a/troubleshoot/observability/apm/_agent_is_not_instrumenting_code.md b/troubleshoot/observability/apm/_agent_is_not_instrumenting_code.md
index dad639228..1400b4d1a 100644
--- a/troubleshoot/observability/apm/_agent_is_not_instrumenting_code.md
+++ b/troubleshoot/observability/apm/_agent_is_not_instrumenting_code.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Agent is not instrumenting code [_agent_is_not_instrumenting_code]
diff --git a/troubleshoot/observability/apm/_collection_of_diagnostic_information.md b/troubleshoot/observability/apm/_collection_of_diagnostic_information.md
index 94ea3fbc6..c423d2fd2 100644
--- a/troubleshoot/observability/apm/_collection_of_diagnostic_information.md
+++ b/troubleshoot/observability/apm/_collection_of_diagnostic_information.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: apm-agent
 ---
 
 # Collection of diagnostic information [_collection_of_diagnostic_information]
@@ -33,7 +35,7 @@ If there are multiple PHP processes in your system, we allow you to specify dire
 * `%p` - In this place, the agent will substitute the process identifier.
 * `%t` - In this place, the agent will substitute the UNIX timestamp.
 
-::::{important} 
+::::{important}
 After setting the path, remember to **fully restart the process** for which you are collecting diagnostic information. This may vary depending on the context, such as PHP, PHP-FPM, Apache, or PHP-CGI. Diagnostic information will be recorded after the first HTTP request is made or at the beginning of script execution for PHP-CLI.<br> <br> Be aware that the information contained in the output file may include sensitive data, such as passwords, security tokens or environment variables from your system. Make sure to review the data and mask sensitive information before sharing the file publicly.<br> <br> After collecting diagnostic information, remember to disable this feature and restore the previous configuration in php.ini or the environment variable.
 ::::
 
diff --git a/troubleshoot/observability/apm/apm-server-performance-diagnostic.md b/troubleshoot/observability/apm/apm-server-performance-diagnostic.md
index ecc4cddb0..65fb2a177 100644
--- a/troubleshoot/observability/apm/apm-server-performance-diagnostic.md
+++ b/troubleshoot/observability/apm/apm-server-performance-diagnostic.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-performance-diagnostic.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # APM Server performance diagnostic [apm-performance-diagnostic]
diff --git a/troubleshoot/observability/apm/apm-server-response-codes.md b/troubleshoot/observability/apm/apm-server-response-codes.md
index 883fd2e4b..2f21389ba 100644
--- a/troubleshoot/observability/apm/apm-server-response-codes.md
+++ b/troubleshoot/observability/apm/apm-server-response-codes.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 # APM Server response codes [apm-common-response-codes]
diff --git a/troubleshoot/observability/apm/common-problems.md b/troubleshoot/observability/apm/common-problems.md
index 17daadb3d..5e9302e50 100644
--- a/troubleshoot/observability/apm/common-problems.md
+++ b/troubleshoot/observability/apm/common-problems.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Common problems [apm-common-problems]
diff --git a/troubleshoot/observability/apm/enable-apm-server-binary-debugging.md b/troubleshoot/observability/apm/enable-apm-server-binary-debugging.md
index 79c238e3d..980aef995 100644
--- a/troubleshoot/observability/apm/enable-apm-server-binary-debugging.md
+++ b/troubleshoot/observability/apm/enable-apm-server-binary-debugging.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "APM Server binary debugging"
+navigation_title: APM Server binary debugging
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-enable-apm-server-debugging.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 
diff --git a/troubleshoot/observability/apm/processing-performance.md b/troubleshoot/observability/apm/processing-performance.md
index 538af8d44..d78dde657 100644
--- a/troubleshoot/observability/apm/processing-performance.md
+++ b/troubleshoot/observability/apm/processing-performance.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-processing-and-performance.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # Processing and performance [apm-processing-and-performance]
diff --git a/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md b/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
index 276f02118..3cced12e9 100644
--- a/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
+++ b/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
@@ -3,6 +3,8 @@ mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-server-es-down.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 # APM Server or Elasticsearch is down [apm-server-es-down]
diff --git a/troubleshoot/observability/explore-data.md b/troubleshoot/observability/explore-data.md
index 49c1f4cf3..31ea74071 100644
--- a/troubleshoot/observability/explore-data.md
+++ b/troubleshoot/observability/explore-data.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 # Explore data [exploratory-data-visualizations]
diff --git a/troubleshoot/observability/inspect.md b/troubleshoot/observability/inspect.md
index 5dab62d6a..8e10b907f 100644
--- a/troubleshoot/observability/inspect.md
+++ b/troubleshoot/observability/inspect.md
@@ -5,6 +5,8 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
 ---
 
 # Inspect [inspect]
diff --git a/troubleshoot/observability/troubleshoot-logs.md b/troubleshoot/observability/troubleshoot-logs.md
index 883c7af66..cd1fde645 100644
--- a/troubleshoot/observability/troubleshoot-logs.md
+++ b/troubleshoot/observability/troubleshoot-logs.md
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Troubleshoot logs [logs-troubleshooting]
diff --git a/troubleshoot/observability/troubleshoot-mapping-issues.md b/troubleshoot/observability/troubleshoot-mapping-issues.md
index b7c5ab3ec..75dc52c5e 100644
--- a/troubleshoot/observability/troubleshoot-mapping-issues.md
+++ b/troubleshoot/observability/troubleshoot-mapping-issues.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Uptime"
+navigation_title: Uptime
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/troubleshoot-uptime-mapping-issues.html
 applies_to:
   stack: deprecated 8.15.0
+products:
+  - id: observability
 ---
 
 # Troubleshoot Uptime mapping issues [troubleshoot-uptime-mapping-issues]
diff --git a/troubleshoot/observability/troubleshoot-service-level-objectives-slos.md b/troubleshoot/observability/troubleshoot-service-level-objectives-slos.md
index 1b6538f20..28b2793bf 100644
--- a/troubleshoot/observability/troubleshoot-service-level-objectives-slos.md
+++ b/troubleshoot/observability/troubleshoot-service-level-objectives-slos.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "SLOs"
+navigation_title: SLOs
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/slo-troubleshoot-slos.html
   - https://www.elastic.co/guide/en/serverless/current/slo-troubleshoot-slos.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Troubleshoot service-level objectives (SLOs) [slo-troubleshoot-slos]
diff --git a/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment.md b/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment.md
index 579b8ae3c..19872fb8f 100644
--- a/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment.md
+++ b/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Universal Profiling"
+navigation_title: Universal Profiling
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-troubleshooting.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 
diff --git a/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment/troubleshoot-universal-profiling-backend.md b/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment/troubleshoot-universal-profiling-backend.md
index 6f2bcb217..e7640f4a8 100644
--- a/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment/troubleshoot-universal-profiling-backend.md
+++ b/troubleshoot/observability/troubleshoot-your-universal-profiling-agent-deployment/troubleshoot-universal-profiling-backend.md
@@ -1,9 +1,11 @@
 ---
-navigation_title: "Troubleshoot the backend"
+navigation_title: Troubleshoot the backend
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/profiling-self-managed-troubleshooting.html
 applies_to:
   stack: all
+products:
+  - id: observability
 ---
 
 
diff --git a/troubleshoot/observability/troubleshooting-infrastructure-monitoring.md b/troubleshoot/observability/troubleshooting-infrastructure-monitoring.md
index 1baeacb91..27f094165 100644
--- a/troubleshoot/observability/troubleshooting-infrastructure-monitoring.md
+++ b/troubleshoot/observability/troubleshooting-infrastructure-monitoring.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Infrastructure monitoring"
+navigation_title: Infrastructure monitoring
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/troubleshooting-infrastructure-monitoring.html
   - https://www.elastic.co/guide/en/serverless/current/observability-troubleshooting-infrastructure-monitoring.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Troubleshoot infrastructure monitoring [troubleshooting-infrastructure-monitoring]
diff --git a/troubleshoot/observability/troubleshooting-infrastructure-monitoring/understanding-no-results-found-message.md b/troubleshoot/observability/troubleshooting-infrastructure-monitoring/understanding-no-results-found-message.md
index 07a8b1f0f..5fd2e5351 100644
--- a/troubleshoot/observability/troubleshooting-infrastructure-monitoring/understanding-no-results-found-message.md
+++ b/troubleshoot/observability/troubleshooting-infrastructure-monitoring/understanding-no-results-found-message.md
@@ -6,6 +6,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Understand "no results found" message [handle-no-results-found-message]
diff --git a/troubleshoot/observability/troubleshooting-synthetics.md b/troubleshoot/observability/troubleshooting-synthetics.md
index 9ed3e7b0b..838cfc304 100644
--- a/troubleshoot/observability/troubleshooting-synthetics.md
+++ b/troubleshoot/observability/troubleshooting-synthetics.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Synthetics"
+navigation_title: Synthetics
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/synthetics-troubleshooting.html
   - https://www.elastic.co/guide/en/serverless/current/observability-synthetics-troubleshooting.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     observability: all
+products:
+  - id: observability
+  - id: cloud-serverless
 ---
 
 # Troubleshoot Synthetics [synthetics-troubleshooting]
diff --git a/troubleshoot/security.md b/troubleshoot/security.md
index 51a469db3..1f05b9fa4 100644
--- a/troubleshoot/security.md
+++ b/troubleshoot/security.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Security"
+navigation_title: Security
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/troubleshooting-ov.html
   - https://www.elastic.co/guide/en/serverless/current/security-troubleshooting-ov.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Troubleshoot Security [troubleshooting-ov]
diff --git a/troubleshoot/security/detection-rules.md b/troubleshoot/security/detection-rules.md
index bebce1925..a931bab56 100644
--- a/troubleshoot/security/detection-rules.md
+++ b/troubleshoot/security/detection-rules.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Detection rules"
+navigation_title: Detection rules
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/ts-detection-rules.html
   - https://www.elastic.co/guide/en/serverless/current/security-ts-detection-rules.html
@@ -9,6 +9,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Troubleshoot detection rules [ts-detection-rules]
diff --git a/troubleshoot/security/elastic-defend.md b/troubleshoot/security/elastic-defend.md
index d5315d27c..c98c23a53 100644
--- a/troubleshoot/security/elastic-defend.md
+++ b/troubleshoot/security/elastic-defend.md
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---
 
 # Troubleshoot {{elastic-defend}} [ts-management]
diff --git a/troubleshoot/security/indicators-of-compromise.md b/troubleshoot/security/indicators-of-compromise.md
index f65a5bf55..3b65c55ab 100644
--- a/troubleshoot/security/indicators-of-compromise.md
+++ b/troubleshoot/security/indicators-of-compromise.md
@@ -1,5 +1,5 @@
 ---
-navigation_title: "Indicators of compromise"
+navigation_title: Indicators of compromise
 mapped_pages:
   - https://www.elastic.co/guide/en/security/current/indicators-of-compromise.html
   - https://www.elastic.co/guide/en/serverless/current/security-indicators-of-compromise.html
@@ -7,6 +7,9 @@ applies_to:
   stack: all
   serverless:
     security: all
+products:
+  - id: security
+  - id: cloud-serverless
 ---