diff --git a/troubleshoot/elasticsearch/hotspotting.md b/troubleshoot/elasticsearch/hotspotting.md
index 46a73e954f..b78598825d 100644
--- a/troubleshoot/elasticsearch/hotspotting.md
+++ b/troubleshoot/elasticsearch/hotspotting.md
@@ -4,11 +4,6 @@ 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/index-lifecycle-management-errors.md b/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
index 0b15af6617..814c100b33 100644
--- a/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
+++ b/troubleshoot/elasticsearch/index-lifecycle-management-errors.md
@@ -4,16 +4,11 @@ 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
+% TODO restructure ILM and SLM topics
 % TODO dropdowns or break it up
 
 # Fix index lifecycle management errors [index-lifecycle-error-handling]
diff --git a/troubleshoot/elasticsearch/mapping-explosion.md b/troubleshoot/elasticsearch/mapping-explosion.md
index 7348feed7a..90ac6ae27a 100644
--- a/troubleshoot/elasticsearch/mapping-explosion.md
+++ b/troubleshoot/elasticsearch/mapping-explosion.md
@@ -3,11 +3,7 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-explosion.html
 applies_to:
   stack:
-  deployment:
-    eck:
-    ess:
-    ece:
-    self:
+  serverless:
 products:
   - id: elasticsearch
 ---
diff --git a/troubleshoot/elasticsearch/rejected-requests.md b/troubleshoot/elasticsearch/rejected-requests.md
index bd46bca07b..0d49a22fed 100644
--- a/troubleshoot/elasticsearch/rejected-requests.md
+++ b/troubleshoot/elasticsearch/rejected-requests.md
@@ -3,11 +3,6 @@ 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
 ---
diff --git a/troubleshoot/elasticsearch/security/security-trb-settings.md b/troubleshoot/elasticsearch/security/security-trb-settings.md
index 0e3493c363..13e09caf4a 100644
--- a/troubleshoot/elasticsearch/security/security-trb-settings.md
+++ b/troubleshoot/elasticsearch/security/security-trb-settings.md
@@ -4,11 +4,6 @@ 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
 ---
diff --git a/troubleshoot/elasticsearch/security/token-invalid-expired.md b/troubleshoot/elasticsearch/security/token-invalid-expired.md
index 860b01c041..63f2ad7c87 100644
--- a/troubleshoot/elasticsearch/security/token-invalid-expired.md
+++ b/troubleshoot/elasticsearch/security/token-invalid-expired.md
@@ -1,11 +1,6 @@
 ---
 applies_to:
   stack:
-  deployment:
-    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 a0bb435ba5..3666e1e728 100644
--- a/troubleshoot/elasticsearch/security/trb-security-internalserver.md
+++ b/troubleshoot/elasticsearch/security/trb-security-internalserver.md
@@ -3,11 +3,7 @@ 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
diff --git a/troubleshoot/elasticsearch/security/trb-security-kerberos.md b/troubleshoot/elasticsearch/security/trb-security-kerberos.md
index e21c967726..8d79b5ca54 100644
--- a/troubleshoot/elasticsearch/security/trb-security-kerberos.md
+++ b/troubleshoot/elasticsearch/security/trb-security-kerberos.md
@@ -4,11 +4,6 @@ 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
 ---
diff --git a/troubleshoot/elasticsearch/security/trb-security-maccurl.md b/troubleshoot/elasticsearch/security/trb-security-maccurl.md
index 04d608fd20..c8435fb799 100644
--- a/troubleshoot/elasticsearch/security/trb-security-maccurl.md
+++ b/troubleshoot/elasticsearch/security/trb-security-maccurl.md
@@ -4,11 +4,6 @@ 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
 ---
diff --git a/troubleshoot/elasticsearch/security/trb-security-path.md b/troubleshoot/elasticsearch/security/trb-security-path.md
index ad1af1e848..312b867e53 100644
--- a/troubleshoot/elasticsearch/security/trb-security-path.md
+++ b/troubleshoot/elasticsearch/security/trb-security-path.md
@@ -3,11 +3,7 @@ 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
diff --git a/troubleshoot/elasticsearch/security/trb-security-saml.md b/troubleshoot/elasticsearch/security/trb-security-saml.md
index c62bef70cd..db194bb637 100644
--- a/troubleshoot/elasticsearch/security/trb-security-saml.md
+++ b/troubleshoot/elasticsearch/security/trb-security-saml.md
@@ -4,11 +4,6 @@ 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
 ---
@@ -17,6 +12,12 @@ products:
 
 Some of the common SAML problems are shown below with tips on how to resolve these issues.
 
+:::{note}
+This topic describes troubleshooting SAML SSO at the deployment or cluster level, for the purposes of authenticating with a {{kib}} instance. To learn about SAML SSO, for your organization or orchestrator, refer to the following topics:
+* [Elastic Cloud SAML SSO](/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md)
+* [{{ece}} SAML](/deploy-manage/users-roles/cloud-enterprise-orchestrator/saml.md) and [SSO](/deploy-manage/users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md)
+:::
+
 1. **Symptoms:**
 
     Authentication in {{kib}} fails and the following error is printed in the {{es}} logs:
diff --git a/troubleshoot/elasticsearch/security/trb-security-setup.md b/troubleshoot/elasticsearch/security/trb-security-setup.md
index 49294261c6..5f420b0cfb 100644
--- a/troubleshoot/elasticsearch/security/trb-security-setup.md
+++ b/troubleshoot/elasticsearch/security/trb-security-setup.md
@@ -3,11 +3,7 @@ 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
@@ -17,6 +13,10 @@ products:
 
 The [elasticsearch-setup-passwords command](elasticsearch://reference/elasticsearch/command-line-tools/setup-passwords.md) sets passwords for the built-in users by sending user management API requests. If your cluster uses SSL/TLS for the HTTP (REST) interface, the command attempts to establish a connection with the HTTPS protocol. If the connection attempt fails, the command fails.
 
+:::{admonition} Deprecated in 8.0
+The `elasticsearch-setup-passwords` tool is deprecated and will be removed in a future release. To manually reset the password for the built-in users (including the elastic user), use the [`elasticsearch-reset-password`](elasticsearch://reference/elasticsearch/command-line-tools/reset-password.md) tool, the {{es}} [change password API]({{es-apis}}/operation/operation-security-change-password), or the [user management features](/deploy-manage/users-roles/cluster-or-deployment-auth/native.md#managing-native-users) in {{kib}}.
+:::
+
 **Symptoms:**
 
 1. {{es}} is running HTTPS, but the command fails to detect it and returns the following errors:
diff --git a/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md b/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
index 3effce118d..93fe248323 100644
--- a/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
+++ b/troubleshoot/elasticsearch/security/trouble-shoot-active-directory.md
@@ -1,19 +1,17 @@
 ---
-navigation_title: Active Directory
+navigation_title: Active Directory account lockout
 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]
+# Troubleshoot Active Directory account lockout [trouble-shoot-active-directory]
 
 **Symptoms:**
 
diff --git a/troubleshoot/elasticsearch/start-ilm.md b/troubleshoot/elasticsearch/start-ilm.md
index ebc599f21e..ff82b12724 100644
--- a/troubleshoot/elasticsearch/start-ilm.md
+++ b/troubleshoot/elasticsearch/start-ilm.md
@@ -13,25 +13,7 @@ products:
 
 If the automatic [{{slm}}](/deploy-manage/tools/snapshot-and-restore/create-snapshots.md#automate-snapshots-slm) ({{slm-init}}) or [{{ilm}}](/manage-data/lifecycle/index-lifecycle-management.md) ({{ilm-init}}) service is not operating as expected, you might need to check its lifecycle status, stop, or restart the service. You may also want to halt services during routine maintenance.
 
-All of the procedures on this page use the {{es}} APIs. To run these steps using {{kib}}:
-
-1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
-2. On the **Hosted deployments** panel, click the name of your deployment.
-
-    ::::{note}
-    If the name of your deployment is disabled your {{kib}} instances might be unhealthy, in which case contact [Elastic Support](https://support.elastic.co). If your deployment doesn’t include {{kib}}, all you need to do is [enable it first](../../deploy-manage/deploy/elastic-cloud/access-kibana.md).
-    ::::
-
-3. Open your deployment’s side navigation menu (placed under the Elastic logo in the upper left corner) and go to **Dev Tools > Console**.
-
-    :::{image} /troubleshoot/images/elasticsearch-reference-kibana-console.png
-    :alt: {{kib}} Console
-    :screenshot:
-    :::
-
-4. Use the Dev Tools Console to run the API requests as described.
-
-
+You can perform the following procedures using either [API console](/explore-analyze/query-filter/tools/console.md), or direct [{{es}} API](elasticsearch://reference/elasticsearch/rest-apis/index.md) calls.
 
 ## Check status, stop, and restart {{slm-init}} [check-stop-start-slm]
 
diff --git a/troubleshoot/elasticsearch/task-queue-backlog.md b/troubleshoot/elasticsearch/task-queue-backlog.md
index 2862ae6daa..da2fbfe873 100644
--- a/troubleshoot/elasticsearch/task-queue-backlog.md
+++ b/troubleshoot/elasticsearch/task-queue-backlog.md
@@ -3,11 +3,6 @@ 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
 ---
@@ -123,4 +118,4 @@ Related symptoms:
 * [High CPU usage](high-cpu-usage.md)
 * [Rejected requests](rejected-requests.md)
 * [Hot spotting](hotspotting.md)
-* [Troubeshooting overview](/troubleshoot/index.md)
+* [Troubleshooting overview](/troubleshoot/index.md)
diff --git a/troubleshoot/elasticsearch/transform-troubleshooting.md b/troubleshoot/elasticsearch/transform-troubleshooting.md
index fe79cca7f4..318fcfa81a 100644
--- a/troubleshoot/elasticsearch/transform-troubleshooting.md
+++ b/troubleshoot/elasticsearch/transform-troubleshooting.md
@@ -4,13 +4,10 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-troubleshooting.html
 applies_to:
   stack:
-  deployment:
-    eck:
-    ess:
-    ece:
-    self:
+  serverless:
 products:
   - id: elasticsearch
+  - id: cloud-serverless
 ---
 
 # Troubleshoot transforms [transform-troubleshooting]
@@ -26,5 +23,5 @@ If you encounter problems with your transforms, you can gather more information
 * Lightweight audit messages are stored in `.transform-notifications-read`. Search by your `transform_id`.
 * The [get transform statistics API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-get-transform-stats) provides information about the transform status and failures.
 * If the transform exists as a task, you can use the [task management API](https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-tasks) to gather task information. For example: `GET _tasks?actions=data_frame/transforms*&detailed`. Typically, the task exists when the transform is in a started or failed state.
-* The {{es}} logs from the node that was running the transform might also contain useful information. You can identify the node from the notification messages. Alternatively, if the task still exists, you can get that information from the get transform statistics API. For more information, see [*Elasticsearch application logging*](../../deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md).
+* {applies_to}`serverless: unavailable` The {{es}} logs from the node that was running the transform might also contain useful information. You can identify the node from the notification messages. Alternatively, if the task still exists, you can get that information from the get transform statistics API. For more information, refer to [](/deploy-manage/monitor/logging-configuration/elasticsearch-log4j-configuration-self-managed.md).
 
diff --git a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
index fd4b687902..debce93d71 100644
--- a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+++ b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
@@ -4,11 +4,6 @@ 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
 ---
@@ -17,111 +12,21 @@ products:
 
 # Troubleshoot incomplete migration to data tiers [troubleshoot-migrate-to-tiers]
 
-Elasticsearch standardized the implementation of [hot-warm-cold architectures](https://www.elastic.co/blog/elasticsearch-data-lifecycle-management-with-data-tiers) to [data tiers](../../manage-data/lifecycle/data-tiers.md) in version 7.10. Some indices and deployments might have not fully transitioned to [data tiers](../../manage-data/lifecycle/data-tiers.md) and mix the new way of implementing the hot-warm-cold architecture with [legacy](../../deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md) based node attributes.
+{{es}} standardized the implementation of [hot-warm-cold architectures](https://www.elastic.co/blog/elasticsearch-data-lifecycle-management-with-data-tiers) to [data tiers](../../manage-data/lifecycle/data-tiers.md) in version 7.10. Some indices and deployments might have not fully transitioned to [data tiers](../../manage-data/lifecycle/data-tiers.md) and mix the new way of implementing the hot-warm-cold architecture with [legacy](../../deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md) based node attributes.
 
 This could lead to unassigned shards or shards not transitioning to the desired [tier](../../manage-data/lifecycle/data-tiers.md).
 
-In order to fix this follow the next steps:
+To fix this issue, use the following steps.
 
-:::::::{tab-set}
+You can run the following steps using either [API console](/explore-analyze/query-filter/tools/console.md), or direct [{{es}} API](elasticsearch://reference/elasticsearch/rest-apis/index.md) calls.
 
-::::::{tab-item} {{ech}}
-In order to get the shards assigned we need to call the [migrate to data tiers routing](../../manage-data/lifecycle/data-tiers.md) API which will resolve the conflicting routing configurations towards using the standardized [data tiers](../../manage-data/lifecycle/data-tiers.md). This will also future-proof the system by migrating the index templates and ILM policies if needed.
+:::{tip}
+To learn how to assign tiers to your data nodes, refer to [](/manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md).
+:::
 
-**Use {{kib}}**
+To get the shards assigned, call the [migrate to data tiers routing](../../manage-data/lifecycle/data-tiers.md) API, which resolves the conflicting routing configurations to using the standardized [data tiers](../../manage-data/lifecycle/data-tiers.md). This also future-proofs the system by migrating the index templates and ILM policies if needed.
 
-1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
-2. On the **Hosted deployments** panel, click the name of your deployment.
-
-    ::::{note}
-    If the name of your deployment is disabled your {{kib}} instances might be unhealthy, in which case contact [Elastic Support](https://support.elastic.co). If your deployment doesn’t include {{kib}}, all you need to do is [enable it first](../../deploy-manage/deploy/elastic-cloud/access-kibana.md).
-    ::::
-
-3. Open your deployment’s side navigation menu (placed under the Elastic logo in the upper left corner) and go to **Dev Tools > Console**.
-
-    :::{image} /troubleshoot/images/elasticsearch-reference-kibana-console.png
-    :alt: {{kib}} Console
-    :screenshot:
-    :::
-
-4. First, let’s [stop](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-stop) {{ilm}}
-
-    ```console
-    POST /_ilm/stop
-    ```
-
-    The response will look like this:
-
-    ```console-result
-    {
-      "acknowledged": true
-    }
-    ```
-
-5. Wait for {{ilm}} to stop. Check the status until it returns `STOPPED` as follows:
-
-    ```console
-    GET /_ilm/status
-    ```
-
-    When {{ilm}} has successfully stopped the response will look like this:
-
-    ```console-result
-    {
-      "operation_mode": "STOPPED"
-    }
-    ```
-
-6. [Migrate to data tiers](../../manage-data/lifecycle/data-tiers.md)
-
-    ```console
-    POST /_ilm/migrate_to_data_tiers
-    ```
-
-    The response will look like this:
-
-    ```console-result
-    {
-      "dry_run": false,
-      "migrated_ilm_policies":["policy_with_allocate_action"], <1>
-      "migrated_indices":["warm-index-to-migrate-000001"], <2>
-      "migrated_legacy_templates":["a-legacy-template"], <3>
-      "migrated_composable_templates":["a-composable-template"], <4>
-      "migrated_component_templates":["a-component-template"] <5>
-    }
-    ```
-
-    1. The ILM policies that were updated.
-    2. The indices that were migrated to [tier preference](elasticsearch://reference/elasticsearch/index-settings/data-tier-allocation.md#tier-preference-allocation-filter) routing.
-    3. The legacy index templates that were updated to not contain custom routing settings for the provided data attribute.
-    4. The composable index templates that were updated to not contain custom routing settings for the provided data attribute.
-    5. The component templates that were updated to not contain custom routing settings for the provided data attribute.
-
-7. [Restart](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-start) {{ilm}}
-
-    ```console
-    POST /_ilm/start
-    ```
-
-    The response will look like this:
-
-    ```console-result
-    {
-      "acknowledged": true
-    }
-    ```
-::::::
-
-::::::{tab-item} Self-managed
-In order to get the shards assigned we need to make sure the deployment is using the [data tiers](../../manage-data/lifecycle/data-tiers.md) node roles and then call the [migrate to data tiers routing](../../manage-data/lifecycle/data-tiers.md) API which will resolve the conflicting routing configurations towards using the standardized [data tiers](../../manage-data/lifecycle/data-tiers.md). This will also future-proof the system by migrating the index templates and ILM policies if needed.
-
-1. In case your deployment is not yet using [data tiers](../../manage-data/lifecycle/data-tiers.md) [assign data nodes](../../manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md#assign-data-tier) to the appropriate data tier. Configure the appropriate roles for each data node to assign it to one or more data tiers: `data_hot`, `data_content`, `data_warm`, `data_cold`, or `data_frozen`. For example, the following setting configures a node to be a data-only node in the hot and content tiers.
-
-    ```yaml
-    node.roles [ data_hot, data_content ]
-    ```
-
-2. [Stop](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-stop) {{ilm}}
+1. [Stop](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-stop) {{ilm}}
 
     ```console
     POST /_ilm/stop
@@ -135,7 +40,7 @@ In order to get the shards assigned we need to make sure the deployment is using
     }
     ```
 
-3. Wait for {{ilm}} to stop. Check the status until it returns `STOPPED` as follows:
+2. Wait for {{ilm}} to stop. Check the status until it returns `STOPPED` as follows:
 
     ```console
     GET /_ilm/status
@@ -149,7 +54,7 @@ In order to get the shards assigned we need to make sure the deployment is using
     }
     ```
 
-4. [Migrate to data tiers](../../manage-data/lifecycle/data-tiers.md)
+3. [Migrate to data tiers](../../manage-data/lifecycle/data-tiers.md)
 
     ```console
     POST /_ilm/migrate_to_data_tiers
@@ -174,7 +79,7 @@ In order to get the shards assigned we need to make sure the deployment is using
     4. The composable index templates that were updated to not contain custom routing settings for the provided data attribute.
     5. The component templates that were updated to not contain custom routing settings for the provided data attribute.
 
-5. [Restart](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-start) {{ilm}}
+4. [Restart](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-start) {{ilm}}:
 
     ```console
     POST /_ilm/start
@@ -187,6 +92,3 @@ In order to get the shards assigned we need to make sure the deployment is using
       "acknowledged": true
     }
     ```
-::::::
-
-:::::::
diff --git a/troubleshoot/elasticsearch/troubleshooting-searches.md b/troubleshoot/elasticsearch/troubleshooting-searches.md
index d0361ad782..46f83e93d2 100644
--- a/troubleshoot/elasticsearch/troubleshooting-searches.md
+++ b/troubleshoot/elasticsearch/troubleshooting-searches.md
@@ -5,11 +5,7 @@ mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/devtools-dev-tools-troubleshooting.html
 applies_to:
   stack:
-  deployment:
-    eck:
-    ess:
-    ece:
-    self:
+  serverless:
 products:
   - id: elasticsearch
   - id: cloud-serverless
@@ -17,12 +13,12 @@ products:
 
 # Troubleshoot searches [troubleshooting-searches]
 
-When you query your data, Elasticsearch may return an error, no search results, or results in an unexpected order. This guide describes how to troubleshoot searches.
+When you query your data, {{es}} might return an error, no search results, or results in an unexpected order. This guide describes how to troubleshoot searches.
 
 
 ## Ensure the data stream, index, or alias exists [troubleshooting-searches-exists]
 
-Elasticsearch returns an `index_not_found_exception` when the data stream, index or alias you try to query does not exist. This can happen when you misspell the name or when the data has been indexed to a different data stream or index.
+{{es}} returns an `index_not_found_exception` when the data stream, index or alias you try to query does not exist. This can happen when you misspell the name or when the data has been indexed to a different data stream or index.
 
 Use the [exists API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists) to check whether a data stream, index, or alias exists:
 
@@ -183,9 +179,9 @@ GET my-index-000001/_search?sort=@timestamp:desc&size=1
 
 ## Validate, explain, and profile queries [troubleshooting-searches-validate-explain-profile]
 
-When a query returns unexpected results, Elasticsearch offers several tools to investigate why.
+When a query returns unexpected results, {{es}} offers several tools to investigate why.
 
-The [validate API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-validate-query) enables you to validate a query. Use the `rewrite` parameter to return the Lucene query an Elasticsearch query is rewritten into:
+The [validate API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-validate-query) enables you to validate a query. Use the `rewrite` parameter to return the Lucene query an {{es}} query is rewritten into:
 
 ```console
 GET /my-index-000001/_validate/query?rewrite=true
@@ -234,6 +230,9 @@ For static settings, you need to create a new index with the correct settings. N
 
 
 ## Find slow queries [troubleshooting-slow-searches]
+```{applies_to}
+stack:
+```
 
 [Slow logs](/deploy-manage/monitor/logging-configuration/slow-logs.md) can help pinpoint slow performing search requests. Enabling [audit logging](elasticsearch://reference/elasticsearch/configuration-reference/auding-settings.md) on top can help determine query source. Add the following settings to the [`elasticsearch.yml`](/deploy-manage/stack-settings.md) configuration file to trace queries. The resulting logging is verbose, so disable these settings when not troubleshooting.
 
diff --git a/troubleshoot/elasticsearch/unable-to-parse-response-body.md b/troubleshoot/elasticsearch/unable-to-parse-response-body.md
index 80f5b38f12..d900fc7c76 100644
--- a/troubleshoot/elasticsearch/unable-to-parse-response-body.md
+++ b/troubleshoot/elasticsearch/unable-to-parse-response-body.md
@@ -1,11 +1,6 @@
 ---
 applies_to:
   stack:
-  deployment:
-    eck:
-    ess:
-    ece:
-    self:
 navigation_title: "Error: Unable to parse response body"
 ---
 
diff --git a/troubleshoot/elasticsearch/watcher-troubleshooting.md b/troubleshoot/elasticsearch/watcher-troubleshooting.md
index 24a4703f08..476c5506ba 100644
--- a/troubleshoot/elasticsearch/watcher-troubleshooting.md
+++ b/troubleshoot/elasticsearch/watcher-troubleshooting.md
@@ -4,11 +4,6 @@ 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
 ---