From 42d194f5524a873d812a42403ee310f32e4fd27c Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 15:32:11 +0100
Subject: [PATCH 1/7] convert some tabs into applies-switch

---
 .../autoscaling/autoscaling-in-ece-and-ech.md |  6 +-
 .../autoscaling/trained-model-autoscaling.md  | 20 +++---
 deploy-manage/deploy/cloud-on-k8s.md          |  8 +--
 .../deploy/elastic-cloud/tools-apis.md        | 10 ++-
 deploy-manage/manage-spaces.md                | 17 ++---
 .../kibana-monitoring-data.md                 |  6 +-
 .../security/_snippets/cluster-comparison.md  | 18 ++---
 deploy-manage/security/ip-filtering-cloud.md  | 17 +++--
 .../enabling-audit-logs.md                    | 10 +--
 .../security/network-security-api.md          | 65 +++++++------------
 .../security/network-security-policies.md     |  6 +-
 .../security/private-connectivity-gcp.md      | 12 ++--
 .../security/remote-cluster-filtering.md      | 49 ++++++--------
 .../security/secure-cluster-communications.md | 46 +++++--------
 deploy-manage/security/secure-settings.md     | 15 ++---
 deploy-manage/stack-settings.md               |  8 +--
 .../defining-roles.md                         |  6 +-
 .../cluster-or-deployment-auth/file-based.md  | 12 ++--
 .../cluster-or-deployment-auth/kerberos.md    |  8 +--
 .../cluster-or-deployment-auth/saml.md        |  8 +--
 get-started/evaluate-elastic.md               |  6 +-
 manage-data/data-store/index-basics.md        |  8 +--
 ...icsearch-service-with-logstash-as-proxy.md |  6 +-
 ...nal-database-into-elasticsearch-service.md |  6 +-
 ...ta-with-nodejs-on-elasticsearch-service.md |  6 +-
 ...ta-with-python-on-elasticsearch-service.md |  6 +-
 manage-data/lifecycle/data-tiers.md           |  6 +-
 .../migrate-index-management.md               |  6 +-
 ...lasticsearch-to-manage-time-series-data.md | 12 ++--
 reference/fleet/elastic-agent-container.md    | 18 ++---
 .../fleet/running-on-eks-managed-by-fleet.md  | 12 ++--
 .../running-on-kubernetes-managed-by-fleet.md | 12 ++--
 .../fleet/running-on-kubernetes-standalone.md | 13 ++--
 ...ransaction-latency-failure-correlations.md | 19 +++---
 solutions/observability/apm/ingest/jaeger.md  |  6 +-
 ...-opentelemetry-collectors-language-sdks.md | 18 ++---
 .../get-started/logs-essentials.md            |  1 +
 ...ickstart-collect-data-with-aws-firehose.md | 18 ++---
 ...kstart-monitor-hosts-with-elastic-agent.md | 18 ++---
 ...kstart-monitor-hosts-with-opentelemetry.md | 18 ++---
 ...r-kubernetes-cluster-with-elastic-agent.md | 36 ++++------
 ...rt-monitor-your-application-performance.md | 18 ++---
 ...tic-distributions-of-opentelemetry-edot.md | 18 ++---
 .../detect-metric-anomalies.md                |  9 +--
 .../get-started-with-system-metrics.md        | 18 ++---
 .../logs/get-started-with-system-logs.md      |  9 +--
 ...tream-any-log-file-using-edot-collector.md | 18 ++---
 .../observability/logs/stream-any-log-file.md |  9 +--
 solutions/observability/streams/streams.md    |  6 +-
 solutions/observability/synthetics/cli.md     |  9 +--
 .../synthetics/configure-projects.md          | 10 ++-
 .../create-monitors-with-projects.md          | 18 ++---
 .../grant-access-to-secured-resources.md      |  9 +--
 .../synthetics/manage-data-retention.md       |  9 +--
 troubleshoot/elasticsearch/add-tier.md        |  6 +-
 .../allow-all-cluster-allocation.md           |  6 +-
 .../allow-all-index-allocation.md             |  6 +-
 .../decrease-disk-usage-data-node.md          |  6 +-
 .../diagnose-unassigned-shards.md             |  6 +-
 .../diagnosing-corrupted-repositories.md      |  6 +-
 .../fix-master-node-out-of-disk.md            |  6 +-
 .../fix-other-node-out-of-disk.md             |  6 +-
 troubleshoot/elasticsearch/high-cpu-usage.md  |  6 +-
 .../elasticsearch/high-jvm-memory-pressure.md |  6 +-
 .../increase-capacity-data-node.md            |  6 +-
 .../increase-cluster-shard-limit.md           |  6 +-
 .../elasticsearch/increase-shard-limit.md     |  6 +-
 .../elasticsearch/increase-tier-capacity.md   |  6 +-
 .../repeated-snapshot-failures.md             |  6 +-
 .../elasticsearch/restore-from-snapshot.md    |  6 +-
 .../troubleshoot-migrate-to-tiers.md          |  6 +-
 .../troubleshooting-shards-capacity-issues.md | 12 ++--
 .../apm/apm-server-response-codes.md          | 18 ++---
 .../observability/troubleshoot-logs.md        |  6 +-
 .../troubleshooting-synthetics.md             | 12 ++--
 75 files changed, 383 insertions(+), 525 deletions(-)

diff --git a/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md b/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
index 4b5addf714..48a4d23747 100644
--- a/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
+++ b/deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md
@@ -249,9 +249,9 @@ Although autoscaling can scale some tiers by CPU, the primary measurement of tie
 
 Run this example API request to create a deployment with autoscaling:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{ece}}
+:::{applies-item} ece:
 
 ```sh
 curl -k -X POST -H "Authorization: ApiKey $ECE_API_KEY" https://$COORDINATOR_HOST:12443/api/v1/deployments -H 'content-type: application/json' -d '
@@ -455,7 +455,7 @@ curl -k -X POST -H "Authorization: ApiKey $ECE_API_KEY" https://$COORDINATOR_HOS
 
 :::
 
-:::{tab-item} {{ech}}
+:::{applies-item} ess:
 
 ```sh
 curl -XPOST \
diff --git a/deploy-manage/autoscaling/trained-model-autoscaling.md b/deploy-manage/autoscaling/trained-model-autoscaling.md
index 7e52604a03..8a4a8eb6e2 100644
--- a/deploy-manage/autoscaling/trained-model-autoscaling.md
+++ b/deploy-manage/autoscaling/trained-model-autoscaling.md
@@ -114,9 +114,9 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 #### Adaptive resources enabled
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} ECH, ECE
+:::{applies-item} { "ess":, "ece": }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -128,7 +128,7 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 :::
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 
 | Level | Allocations | Threads | VCUs |
 | --- | --- | --- | --- |
@@ -142,9 +142,9 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 #### Adaptive resources disabled
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} ECH, ECE
+:::{applies-item} { "ess":, "ece": }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -164,9 +164,9 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 #### Adaptive resources enabled
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} ECH, ECE
+:::{applies-item} { "ess":, "ece": }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -178,7 +178,7 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 :::
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 
 | Level | Allocations | Threads | VCUs |
 | --- | --- | --- | --- |
@@ -192,9 +192,9 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 #### Adaptive resources disabled
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} ECH, ECE
+:::{applies-item} { "ess":, "ece": }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
diff --git a/deploy-manage/deploy/cloud-on-k8s.md b/deploy-manage/deploy/cloud-on-k8s.md
index 869a29fb9a..709a450ced 100644
--- a/deploy-manage/deploy/cloud-on-k8s.md
+++ b/deploy-manage/deploy/cloud-on-k8s.md
@@ -73,23 +73,23 @@ This section outlines the supported Kubernetes and {{stack}} versions for ECK. C
 
 ECK is compatible with the following Kubernetes distributions and related technologies:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} ECK 3.2
+:::{applies-item} eck: ga 3.2+
 * Kubernetes 1.30-1.34
 * OpenShift 4.15-4.20
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
 * Helm: {{eck_helm_minimum_version}}+
 :::
 
-:::{tab-item} ECK 3.1
+:::{applies-item} eck: ga =3.1
 * Kubernetes 1.29-1.33
 * OpenShift 4.15-4.19
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
 * Helm: {{eck_helm_minimum_version}}+
 :::
 
-:::{tab-item} ECK 3.0
+:::{applies-item} eck: ga =3.0
 * Kubernetes 1.28-1.32
 * OpenShift 4.14-4.18
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
diff --git a/deploy-manage/deploy/elastic-cloud/tools-apis.md b/deploy-manage/deploy/elastic-cloud/tools-apis.md
index 46ab3bb7f6..52c56ccad4 100644
--- a/deploy-manage/deploy/elastic-cloud/tools-apis.md
+++ b/deploy-manage/deploy/elastic-cloud/tools-apis.md
@@ -46,10 +46,9 @@ Note that some [restrictions](/deploy-manage/deploy/elastic-cloud/restrictions-k
 Refer to [{{es}} API conventions](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md) to learn about headers, request body conventions, and examples for {{es-serverless}} and {{es}} REST APIs.
 :::
 
-:::::{tab-set}
-:group: serverless-hosted
-::::{tab-item} {{serverless-short}}
-:sync: serverless
+:::::{applies-switch}
+
+::::{applies-item} serverless:
 
 The following APIs are available for {{es-serverless}} users:
 
@@ -59,8 +58,7 @@ The following APIs are available for {{es-serverless}} users:
 - [{{kib}} {{serverless-short}} APIs](https://www.elastic.co/docs/api/doc/serverless): Use these APIs to manage resources such as connectors, data views, and saved objects for your {{serverless-full}} project.
 ::::
 
-::::{tab-item} {{ech}}
-:sync: hosted
+::::{applies-item} ech:
 
 The following APIs are available for {{ech}} users:
 
diff --git a/deploy-manage/manage-spaces.md b/deploy-manage/manage-spaces.md
index b8b2588ec3..861fd2b0a5 100644
--- a/deploy-manage/manage-spaces.md
+++ b/deploy-manage/manage-spaces.md
@@ -51,11 +51,9 @@ The maximum number of spaces that you can have differs by deployment type:
 
 To create a space:
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} {{serverless-short}}
-:sync: serverless
+::::{applies-item} serverless:
 
 1. Click **Create space** or select the space you want to edit.
 2. Provide:
@@ -67,8 +65,7 @@ To create a space:
 4. Save the space.
 ::::
 
-::::{tab-item} {{stack}}
-:sync: stack
+::::{applies-item} stack:
 
 1. Select **Create space** and provide a name, description, and URL identifier.
    The URL identifier is a short text string that becomes part of the {{kib}} URL when you are inside that space. {{kib}} suggests a URL identifier based on the name of your space, but you can customize the identifier to your liking. You cannot change the space identifier once you create the space.
@@ -95,8 +92,8 @@ You can edit all of the space settings you just defined at any time, except for
 
 Elastic also allows you to manage spaces using APIs:
 
-* **Serverless projects:** [Spaces API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-spaces-space)
-* **{{stack}} deployments:** [Spaces API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-spaces-copy-saved-objects)
+* {applies_to}`serverless:` [Spaces API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-spaces-space)
+* {applies_to}`stack:` [Spaces API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-spaces-copy-saved-objects)
 
 
 ## Define access to a space [spaces-control-user-access]
@@ -105,8 +102,8 @@ Users can access spaces based on the roles that they have.
 
 * Certain reserved roles can view and access all spaces by default. You can’t prevent those roles from accessing a space. Instead, you can grant different roles to your users.
 * When creating or editing a role, you can define which existing spaces that role can access, and with which permissions. Role management differs between {{stack}} deployments and serverless projects.
-  - For Serverless projects, check [Custom roles](/deploy-manage/users-roles/cloud-organization/user-roles.md).
-  - For {{stack}} deployments, check [Creating or editing a role](/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md).
+  - {applies_to}`serverless:` Check [Custom roles](/deploy-manage/users-roles/cloud-organization/user-roles.md).
+  - {applies_to}`stack:` Check [Creating or editing a role](/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md).
 
 
 If you're managing an {{stack}} deployment, then you can also assign roles and define permissions for a space from the **Permissions** tab of the space settings.
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
index 8c82e1bc8e..d5cb391170 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
@@ -62,8 +62,8 @@ deployment:
 
 ## View monitoring data in {{kib}} [view-monitoring-data-in-kibana]
 
-:::::{tab-set}
-::::{tab-item} In ECK and self-managed
+:::::{applies-switch}
+::::{applies-item} { "eck":, "self": }
 
 1. Open the {{kib}} monitoring instance in your web browser.
 
@@ -79,7 +79,7 @@ deployment:
 If you are using a separate monitoring cluster, you do not need to turn on data collection. The dashboards appear when there is data in the monitoring cluster.
 :::
 ::::
-::::{tab-item} In ECH and ECE
+::::{applies-item} { "ess":, "ece": }
 :::{include} /deploy-manage/monitor/stack-monitoring/_snippets/cloud-monitoring-access.md
 :::
 ::::
diff --git a/deploy-manage/security/_snippets/cluster-comparison.md b/deploy-manage/security/_snippets/cluster-comparison.md
index 4d7b329574..5898607c4d 100644
--- a/deploy-manage/security/_snippets/cluster-comparison.md
+++ b/deploy-manage/security/_snippets/cluster-comparison.md
@@ -9,11 +9,9 @@ Security feature availability varies by deployment type, with each feature havin
 
 Select your deployment type below to see what's available and how implementation responsibilities are distributed:
 
-::::{tab-set}
-:group: deployment-type
+::::{applies-switch}
 
-:::{tab-item} ECH
-:sync: cloud-hosted
+:::{applies-item} ess:
 
 | Category | Security feature | Status | Notes |
 |------------------|------------|--------------|-------------|
@@ -29,8 +27,7 @@ Select your deployment type below to see what's available and how implementation
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 | Category| Security feature | Status | Notes |
 |------------------|------------|--------------|-------------|
@@ -46,8 +43,7 @@ Select your deployment type below to see what's available and how implementation
 
 :::
 
-:::{tab-item} ECE
-:sync: ece
+:::{applies-item} ece:
 
 | Category| Security feature | Status | Notes |
 |------------------|------------|--------------|-------------|
@@ -63,8 +59,7 @@ Select your deployment type below to see what's available and how implementation
 
 :::
 
-:::{tab-item} ECK
-:sync: eck
+:::{applies-item} eck:
 
 | Category| Security feature | Status | Notes |
 |------------------|------------|--------------|-------------|
@@ -81,8 +76,7 @@ Select your deployment type below to see what's available and how implementation
 :::
 
 
-:::{tab-item} Self-managed
-:sync: self-managed
+:::{applies-item} self:
 
 | Category| Security feature | Status | Notes |
 |------------------|------------|--------------|-------------|
diff --git a/deploy-manage/security/ip-filtering-cloud.md b/deploy-manage/security/ip-filtering-cloud.md
index 445fc8773a..63d8631b56 100644
--- a/deploy-manage/security/ip-filtering-cloud.md
+++ b/deploy-manage/security/ip-filtering-cloud.md
@@ -85,15 +85,15 @@ You can apply multiple policies to a single deployment. For {{ech}} deployments,
 
 #### From a deployment or project
 
-::::{tab-set}
-:::{tab-item} Serverless
+::::{applies-switch}
+:::{applies-item} serverless:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Serverless projects** page, select your project.
 3. Select the **Network security** tab on the left-hand side menu bar.
 4. Select **Apply policies** > **IP filter**.
 6. Choose the IP filter you want to apply and select **Apply**.
 :::
-:::{tab-item} Hosted
+:::{applies-item} ess:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Hosted deployments** page, select your deployment.
 3. Select the **Security** tab on the left-hand side menu bar.
@@ -116,18 +116,17 @@ If you want to a specific IP filter from a deployment or project, or delete the
 
 #### From your deployment or project
 
-::::{tab-set}
-:group: hosted-serverless
-:::{tab-item} Serverless project
-:sync: serverless
+::::{applies-switch}
+
+:::{applies-item} serverless:
 1. Find your project on the home page or on the **Serverless projects** page, then select **Manage** to access its settings menus.
 
     On the **Hosted deployments** page you can 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.
 2. On the **Network security** page, find the IP filter that you want to disconnect. 
 3. Under **Actions**, click the **Delete** icon.
 :::
-:::{tab-item} Hosted deployment
-:sync: hosted
+:::{applies-item} ess:
+
 1. Find your deployment on the home page or on the **Hosted deployments** page, then select **Manage** to access its settings menus.
 
     On the **Hosted deployments** page you can 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.
diff --git a/deploy-manage/security/logging-configuration/enabling-audit-logs.md b/deploy-manage/security/logging-configuration/enabling-audit-logs.md
index 43328f8c2d..980edc4e79 100644
--- a/deploy-manage/security/logging-configuration/enabling-audit-logs.md
+++ b/deploy-manage/security/logging-configuration/enabling-audit-logs.md
@@ -50,9 +50,9 @@ Audit logs are disabled by default and must be explicitly enabled.
 ::::
 
 
-::::::{tab-set}
+::::::{applies-switch}
 
-:::::{tab-item} Self-managed
+:::::{applies-item} self:
 
 **To enable audit logging in {{es}}**:
 
@@ -67,7 +67,7 @@ Audit logs are disabled by default and must be explicitly enabled.
 To learn how to consume these logs in an {{es}} cluster, refer to [](/deploy-manage/monitor/stack-monitoring/collecting-log-data-with-filebeat.md).
 :::::
 
-:::::{tab-item} {{ech}}
+:::::{applies-item} ess:
 
 To enable audit logging in an {{ech}} deployment:
 
@@ -90,7 +90,7 @@ To enable audit logging in an {{ech}} deployment:
 A plan change will run on your deployment. When it finishes, audit logs will be delivered to your monitoring deployment.
 :::::
 
-:::::{tab-item} ECE
+:::::{applies-item} ece:
 
 
 To enable audit logging in an ECE deployment:
@@ -115,7 +115,7 @@ To enable audit logging in an ECE deployment:
 A plan change will run on your deployment. When it finishes, audit logs will be delivered to your monitoring deployment.
 :::::
 
-:::::{tab-item} ECK
+:::::{applies-item} eck:
 
 
 To enable audit logging in an ECK-managed cluster, add `xpack.security.audit.enabled: true` to the `config` section of each {{es}} `nodeSet` and to the `config` section of the {{kib}} object's specification. 
diff --git a/deploy-manage/security/network-security-api.md b/deploy-manage/security/network-security-api.md
index b89799e505..f482ec5fd6 100644
--- a/deploy-manage/security/network-security-api.md
+++ b/deploy-manage/security/network-security-api.md
@@ -77,11 +77,9 @@ Both policies and rule sets consist of multiple unique entries, each representin
 
 Send a request like the following to create an IP filter ingress policy or rule set:
 
-::::{tab-set}
-:group: ech-serverless-ece
+::::{applies-switch}
 
-:::{tab-item} {{ech}}
-:sync: ech
+:::{applies-item} ess:
 
 ```json
 curl \
@@ -112,8 +110,8 @@ https://api.elastic-cloud.com/api/v1/deployments/traffic-filter/rulesets \
 1. The region is always the same region as the deployment you want to associate with an IP filter policy. For details, check the [list of available regions](cloud://reference/cloud-hosted/ec-regions-templates-instances.md).
 2. The type of policy. In the JSON object, we use `ip` for IP filter policies. Currently, we support `ip`, `egress_firewall`, `vpce` (AWS Private Link), `azure_private_endpoint` and `gcp_private_service_connect_endpoint`. These are described in further detail below.
 :::
-:::{tab-item} {{serverless-full}}
-:sync: serverless
+:::{applies-item} serverless:
+
 ```json
 curl \
 -H "Authorization: ApiKey $API_KEY" \
@@ -144,8 +142,7 @@ https://api.elastic-cloud.com/api/v1/serverless/traffic-filters \
 
 2. The type of policy. In the JSON object, we use `ip` for IP filter policies. Currently, only `ip` is supported.
 :::
-:::{tab-item} {{ece}}
-:sync: ece
+:::{applies-item} ece:
 
 ```json
 curl \
@@ -341,11 +338,10 @@ Send a request like the following to update an IP filter ingress policy or rule
 
 Policies in {{ecloud}} are the equivalent of rule sets in {{ece}}.
 
-::::{tab-set}
-:group: ech-ece
+::::{applies-switch}
+
+:::{applies-item} ess:
 
-:::{tab-item} {{ech}}
-:sync: ech
 ```json
 curl -XPUT \
 -H "Authorization: ApiKey $API_KEY" \
@@ -372,8 +368,8 @@ https://api.elastic-cloud.com/api/v1/deployments/traffic-filter/rulesets/$POLICY
 '
 ```
 :::
-:::{tab-item} {{serverless-full}}
-:sync: serverless
+:::{applies-item} serverless:
+
 ```json
 curl -X PATCH \
 -H "Authorization: ApiKey $API_KEY" \
@@ -393,8 +389,7 @@ https://api.elastic-cloud.com/api/v1/serverless/traffic-filters/$POLICY_ID \
 '
 ```
 :::
-:::{tab-item} {{ece}}
-:sync: ece
+:::{applies-item} ece:
 
 ```json
 curl -XPUT \
@@ -431,11 +426,10 @@ Send a request like the following to associate a policy or rule set with a proje
 
 Policies in {{ecloud}} are the equivalent of rule sets in {{ece}}.
 
-:::::{tab-set}
-:group: ech-serverless-ece
+:::::{applies-switch}
+
+::::{applies-item} ess:
 
-::::{tab-item} {{ech}}
-:sync: ech
 ```json
 curl -XPOST \
 -H "Authorization: ApiKey $API_KEY" \
@@ -450,8 +444,8 @@ https://api.elastic-cloud.com/api/v1/deployments/traffic-filter/rulesets/$POLICY
 ```
 ::::
 
-::::{tab-item} {{serverless-full}}
-:sync: serverless
+::::{applies-item} serverless:
+
 To associate a network security policy to a project, you must update the project object.
 
 ```json
@@ -479,8 +473,7 @@ When adding, updating, or removing a policy association, you must provide a comp
 :::
 ::::
 
-::::{tab-item} {{ece}}
-:sync: ece
+::::{applies-item} ece:
 
 ```json
 curl -XPOST \
@@ -504,11 +497,9 @@ Send a request like the following to remove a policy or rule set from a project
 
 Policies in {{ecloud}} are the equivalent of rule sets in {{ece}}.
 
-::::{tab-set}
-:group: ech-serverless-ece
+::::{applies-switch}
 
-:::{tab-item} {{ech}}
-:sync: ech
+:::{applies-item} ess:
 
 ```json
 curl -XDELETE \
@@ -518,8 +509,7 @@ https://api.elastic-cloud.com/api/v1/deployments/traffic-filter/rulesets/$POLICY
 ```
 :::
 
-:::{tab-item} {{serverless-full}}
-:sync: serverless
+:::{applies-item} serverless:
 
 To remove a network security policy from a project, you must update the project object. Pass a complete list of policies in the `PATCH` request body, excluding the policy that you want to remove from the list.
 
@@ -543,8 +533,7 @@ https://api.elastic-cloud.com/api/v1/admin/serverless/projects/elasticsearch \ <
 :::
 :::
 
-:::{tab-item} {{ece}}
-:sync: ece
+:::{applies-item} ece:
 
 ```json
 curl -XDELETE \
@@ -562,11 +551,9 @@ Send a request like the following to delete a policy or rule set.
 
 Policies in {{ecloud}} are the equivalent of rule sets in {{ece}}.
 
-::::{tab-set}
-:group: ech-serverless-ece
+::::{applies-switch}
 
-:::{tab-item} {{ech}}
-:sync: ech
+:::{applies-item} ess:
 
 ```json
 curl -XDELETE \
@@ -574,8 +561,7 @@ curl -XDELETE \
 https://api.elastic-cloud.com/api/v1/deployments/traffic-filter/rulesets/$POLICY_ID \
 ```
 :::
-:::{tab-item} {{serverless-full}}
-:sync: serverless
+:::{applies-item} serverless:
 
 ```json
 curl -XDELETE \
@@ -583,8 +569,7 @@ curl -XDELETE \
 https://api.elastic-cloud.com/api/v1/serverless/traffic-filters/$POLICY_ID \
 ```
 :::
-:::{tab-item} {{ece}}
-:sync: ece
+:::{applies-item} ece:
 
 ```json
 curl -XDELETE \
diff --git a/deploy-manage/security/network-security-policies.md b/deploy-manage/security/network-security-policies.md
index a7c2163560..80760b9b27 100644
--- a/deploy-manage/security/network-security-policies.md
+++ b/deploy-manage/security/network-security-policies.md
@@ -57,8 +57,8 @@ To identify which network security policies are automatically applied to new dep
 
 To identify the network security policies that are applied to your deployment or project:
 
-::::{tab-set}
-:::{tab-item} Serverless
+::::{applies-switch}
+:::{applies-item} serverless:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Serverless projects** page, select your project.
 3. Select the **Network security** tab on the left-hand side menu bar.
@@ -66,7 +66,7 @@ To identify the network security policies that are applied to your deployment or
 Network security policies are listed on the page. From this page, you can view and remove existing policies and attach new policies.
 
 :::
-:::{tab-item} Hosted
+:::{applies-item} ess:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Hosted deployments** page, select your deployment.
 3. Select the **Security** tab on the left-hand side menu bar.
diff --git a/deploy-manage/security/private-connectivity-gcp.md b/deploy-manage/security/private-connectivity-gcp.md
index d38b3f2a1d..27cd278fe7 100644
--- a/deploy-manage/security/private-connectivity-gcp.md
+++ b/deploy-manage/security/private-connectivity-gcp.md
@@ -302,18 +302,18 @@ If you want to a specific policy from a deployment, or delete the policy, then y
 
 #### From your deployment
 
-::::{tab-set}
-:group: hosted-serverless
-:::{tab-item} Serverless project
-:sync: serverless
+::::{applies-switch}
+
+:::{applies-item} serverless:
+
 1. Find your project on the home page or on the **Serverless projects** page, then select **Manage** to access its settings menus.
 
     On the **Hosted deployments** page you can 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.
 2. On the **Network security** page, find the policy that you want to disconnect. 
 3. Under **Actions**, click the **Delete** icon.
 :::
-:::{tab-item} Hosted deployment
-:sync: hosted
+:::{applies-item} ess:
+
 1. Find your deployment on the home page or on the **Hosted deployments** page, then select **Manage** to access its settings menus.
 
     On the **Hosted deployments** page you can 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.
diff --git a/deploy-manage/security/remote-cluster-filtering.md b/deploy-manage/security/remote-cluster-filtering.md
index 1b60bbcd15..63eea6949b 100644
--- a/deploy-manage/security/remote-cluster-filtering.md
+++ b/deploy-manage/security/remote-cluster-filtering.md
@@ -45,10 +45,10 @@ This guide covers the following remote cluster filtering tasks:
 
 ## Create a remote cluster filter [create-remote-cluster-filter]
 
-:::::{tab-set}
-:group: deployment
-::::{tab-item} {{ech}}
-:sync: ech
+:::::{applies-switch}
+
+::::{applies-item} ess:
+
 Remote cluster filters are presented in {{ecloud}} as a type of Private Connection filter. To create a remote cluster filter:
 
 :::{include} _snippets/network-security-page.md
@@ -80,8 +80,7 @@ Remote cluster filters are presented in {{ecloud}} as a type of Private Connecti
 9.   Click **Create**.
 ::::
 
-::::{tab-item} {{ece}}
-:sync: ece
+::::{applies-item} ece:
 
 To create a remote cluster filter:
 
@@ -111,11 +110,9 @@ To create a remote cluster filter:
 
 After you've created the network security policy or rule set, you'll need to associate it with your deployment. To do that:
 
-:::::::{tab-set}
-:group: deployment
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
-:sync: ech
+::::::{applies-item} ess:
 
 #### From a deployment
 
@@ -131,8 +128,8 @@ After you've created the network security policy or rule set, you'll need to ass
 7. Click **Update** to save your changes.
 ::::::
 
-::::::{tab-item} {{ece}}
-:sync: ece
+::::::{applies-item} ece:
+
 :::{include} _snippets/associate-filter-ece.md
 :::
 
@@ -144,11 +141,9 @@ After you've created the network security policy or rule set, you'll need to ass
 
 To remove a network security policy or rule set association from your deployment:
 
-:::::::{tab-set}
-:group: deployment
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
-:sync: ech
+::::::{applies-item} ess:
 
 You can remove associations from your deployments directly from the policy settings or from the deployment security page.
 
@@ -169,8 +164,7 @@ You can remove associations from your deployments directly from the policy setti
 
 ::::::
 
-::::::{tab-item} {{ece}}
-:sync: ece
+::::::{applies-item} ece:
 
 :::{include} _snippets/detach-filter-ece.md
 :::
@@ -183,11 +177,9 @@ You can remove associations from your deployments directly from the policy setti
 
 You can edit a remote cluster filter policy name or change the list of allowed Organization IDs and {{es}} cluster IDs. To do that:
 
-:::::::{tab-set}
-:group: deployment
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
-:sync: ech
+::::::{applies-item} ess:
 
 :::{include} _snippets/network-security-page.md
 :::
@@ -195,8 +187,7 @@ You can edit a remote cluster filter policy name or change the list of allowed O
 5. Select **Update** to save your changes.
 ::::::
 
-::::::{tab-item} {{ece}}
-:sync: ece
+::::::{applies-item} ece:
 
 1. [Log into the Cloud UI](/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md).
 2. From the **Platform** menu, select **Security**.
@@ -213,19 +204,17 @@ If you need to remove a remote cluster filter policy, you must first [remove any
 
 To delete a filter:
 
-:::::::{tab-set}
-:group: deployment
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
-:sync: ech
+::::::{applies-item} ess:
 
 :::{include} _snippets/network-security-page.md
 :::
 4. Find the rule set you want to edit, then select the **Delete** {icon}`trash` button. The icon is inactive if there are deployments associated with the filter.
 ::::::
 
-::::::{tab-item} {{ece}}
-:sync: ece
+::::::{applies-item} ece:
+
 
 1. [Log into the Cloud UI](/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md).
 2. From the **Platform** menu, select **Security**.
diff --git a/deploy-manage/security/secure-cluster-communications.md b/deploy-manage/security/secure-cluster-communications.md
index 2671732d3e..72cabfa671 100644
--- a/deploy-manage/security/secure-cluster-communications.md
+++ b/deploy-manage/security/secure-cluster-communications.md
@@ -59,21 +59,18 @@ Securing this layer prevents unauthorized nodes from joining your cluster and pr
 
 The way that transport layer security is managed depends on your deployment type:
 
-:::::{tab-set}
-:group: deployments
+:::::{applies-switch}
+
+::::{applies-item} { "serverless":, "ess": }
 
-::::{tab-item} ECH and Serverless
-:sync: ech
 {{es}} transport security is fully managed by Elastic, and no configuration is required.
 ::::
 
-::::{tab-item} ECE
-:sync: ece
+::::{applies-item} ece:
 {{es}} transport security is fully managed by the {{ece}} platform, and no configuration is required.
 ::::
 
-::::{tab-item} ECK
-:sync: eck
+::::{applies-item} eck:
 
 :::{include} ./_snippets/eck-transport.md
 :::
@@ -83,8 +80,7 @@ The way that transport layer security is managed depends on your deployment type
 
 ::::
 
-::::{tab-item} Self-managed
-:sync: self
+::::{applies-item} self:
 {{es}} transport security can be [automatically configured](self-auto-setup.md), or manually set up by following the steps in [](set-up-basic-security.md).
 
 For additional TLS configuration options, refer to [](./self-tls.md).
@@ -106,18 +102,15 @@ While HTTP TLS encryption is optional in self-managed environments, it is strong
 
 The way that HTTP layer security is managed depends on your deployment type:
 
-:::::{tab-set}
-:group: deployments
+:::::{applies-switch}
 
-::::{tab-item} ECH and Serverless
-:sync: ech
+::::{applies-item} { "serverless":, "ess": }
 
 HTTP TLS for {{es}} and {{kib}} is fully managed by Elastic. No configuration is required.
 {{kib}} instances are automatically configured to connect securely to {{es}}, without requiring manual setup.
 ::::
 
-::::{tab-item} ECE
-:sync: ece
+::::{applies-item} ece:
 
 HTTP TLS for deployments is managed at the platform proxy level. Refer to these guides for ECE-specific security customizations:
 * [Manage security certificates in ECE](./secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md)
@@ -127,16 +120,14 @@ HTTP TLS for deployments is managed at the platform proxy level. Refer to these
 {{kib}} instances are automatically configured to connect securely to {{es}}, without requiring manual setup.
 ::::
 
-::::{tab-item} ECK
-:sync: eck
+::::{applies-item} eck:
 
 :::{include} ./_snippets/eck-http.md
 :::
 
 ::::
 
-::::{tab-item} Self-managed
-:sync: self
+::::{applies-item} self:
 
 HTTP TLS certificates for {{es}} can be [automatically configured](self-auto-setup.md), or manually set up by following the steps in [Set up HTTP SSL](./set-up-basic-security-plus-https.md).
 
@@ -157,31 +148,26 @@ For additional TLS configuration options, refer to [](./self-tls.md).
 
 Managing certificates is critical for secure communications. Certificates have limited lifetimes and must be renewed before expiry to prevent service disruptions. Each deployment type provides different tools or responsibilities for managing certificates lifecycle.
 
-::::{tab-set}
-:group: deployments
+::::{applies-switch}
 
-:::{tab-item} ECH and Serverless
-:sync: ech
+:::{applies-item} { "serverless":, "ess": }
 
 Certificate lifecycle is fully managed by Elastic, including renewal and rotation.
 :::
 
-:::{tab-item} ECE
-:sync: ece
+:::{applies-item} ece:
 
 In ECE, the platform automatically renews internal certificates. However, you must manually renew your custom proxy and Cloud UI certificates. For more details, refer to [Manage security certificates](secure-your-elastic-cloud-enterprise-installation/manage-security-certificates.md).
 :::
 
-:::{tab-item} ECK
-:sync: eck
+:::{applies-item} eck:
 
 :::{include} ./_snippets/eck-lifecycle.md
 :::
 
 :::
 
-:::{tab-item} Self-managed
-:sync: self
+:::{applies-item} self:
 
 You are responsible for certificate lifecycle management, including monitoring expiration dates, renewing certificates, and redeploying them as needed. If you used Elastic tools to generate your certificates, refer to [Update TLS certificates](./updating-certificates.md) for guidance on rotating or replacing them.
 :::
diff --git a/deploy-manage/security/secure-settings.md b/deploy-manage/security/secure-settings.md
index 346c1d073c..fa0672d732 100644
--- a/deploy-manage/security/secure-settings.md
+++ b/deploy-manage/security/secure-settings.md
@@ -59,11 +59,10 @@ For example, you can search for `secure_bind_password` in the [security settings
 
 The instructions below cover how to manage {{es}} keystore settings for each deployment type.
 
-:::::{tab-set}
-:group: deployment-type
+:::::{applies-switch}
+
+::::{applies-item} { "ess":, "ece"}
 
-::::{tab-item} ECH and ECE
-:sync: cloud
 % ### ECE and ECH
 You can manage {{es}} secure settings in the **Security > {{es}} keystore** section of your deployment page in the {{ecloud}} Console or ECE Cloud UI.
 
@@ -111,16 +110,16 @@ When your secure settings are no longer needed, delete them from the keystore.
 5. On the **Confirm to delete** window, select **Confirm**.
 ::::
 
-::::{tab-item} ECK
-:sync: eck
+::::{applies-item} eck:
+
 % ### ECK
 In ECK, the operator simplifies secure settings configuration by relying on Kubernetes secrets.
 
 Refer to [Configure secure settings on ECK](./k8s-secure-settings.md) for details and examples.
 ::::
 
-::::{tab-item} Self-managed
-:sync: self-managed
+::::{applies-item} self
+
 % ### Self-managed
 In self-managed deployments, you're responsible for configuring and maintaining the {{es}} keystore on each node individually.
 
diff --git a/deploy-manage/stack-settings.md b/deploy-manage/stack-settings.md
index 9803cd0843..7b2dd50d1c 100644
--- a/deploy-manage/stack-settings.md
+++ b/deploy-manage/stack-settings.md
@@ -63,9 +63,9 @@ The way that you configure your {{stack}} settings is determined by your deploym
 * If a feature requires both standard `elasticsearch.yml` settings and [secure settings](/deploy-manage/security/secure-settings.md), configure the secure settings first. Updating standard user settings can trigger a cluster rolling restart in self managed clusters and ECH and ECE deployments. If the required secure settings are not yet in place, the nodes might fail to start. Adding secure settings does not trigger a restart.
 :::
 
-:::::{tab-set}
+:::::{applies-switch}
 
-::::{tab-item} ECH and ECE
+::::{applies-item} { "ess":,"ece": }
 
 For {{ech}} and {{ece}} deployments, you edit {{stack}} settings through the {{ecloud}} Console or ECE Cloud UI. These settings are internally mapped to the appropriate YAML configuration files, such as `elasticsearch.yml` and `kibana.yml`, and they affect all users of that cluster.
 
@@ -85,7 +85,7 @@ For further details and examples, refer to the resource for your deployment type
 
 ::::
 
-::::{tab-item} ECK
+::::{applies-item} eck:
 
 Stack settings are defined as part of your resource specification.
 
@@ -101,7 +101,7 @@ Stack settings are defined as part of your resource specification.
 
 ::::
 
-::::{tab-item} Self managed
+::::{applies-item} self:
 
 The method and location where you can update your {{stack}} settings depends on the component and installation method.
 
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 e69ddb0e34..809be930cc 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
@@ -108,8 +108,8 @@ click_admins:
 
 To configure file-based role management:
 
-::::{tab-set}
-:::{tab-item} Self hosted
+::::{applies-switch}
+:::{applies-item} self:
 
 Place the `roles.yml` file in `ES_PATH_CONF`. {{es}} continuously monitors the `roles.yml` file and automatically picks up and applies any changes to it.
 
@@ -117,7 +117,7 @@ The `roles.yml` file is managed locally by the node and is not globally by the c
 
 A safer approach would be to apply the change on one of the nodes and have the `roles.yml` distributed/copied to all other nodes in the cluster (either manually or using a configuration management system such as Puppet or Chef).
 :::
-:::{tab-item} ECK
+:::{applies-item} eck:
 
 You can set up file-based role management in {{eck}} by referencing Kubernetes secrets containing the roles specification.
 
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 ddba35c3b0..f0c8b60b6e 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
@@ -101,13 +101,13 @@ You can edit files and secrets that contain `users` and `users_roles` manually,
 
 **Manually**
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Self-managed
+:::{tab-item} self:
 In a self-managed cluster, you can edit the contents of `ES_PATH_CONF/users` and `ES_PATH_CONF/users_roles` directly.
 :::
 
-:::{tab-item} {{eck}}
+:::{tab-item} eck:
 You can pass `users` and `user_roles` files to {{eck}} using a file realm secret:
 
 ```yaml subs=true
@@ -155,16 +155,16 @@ stringData:
 
 To avoid editing these files manually, you can use the [elasticsearch-users](elasticsearch://reference/elasticsearch/command-line-tools/users-command.md) tool:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Self-managed
+:::{applies-item} self:
 
 ```
 bin/elasticsearch-users useradd myuser -p mypassword -r monitoring_user
 ```
 :::
 
-:::{tab-item} {{eck}}
+:::{applies-item} eck:
 The following is an example of invoking the `elasticsearch-users` tool in a Docker container:
 
 ```sh
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 d992c486da..75b6904ab4 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
@@ -121,9 +121,9 @@ The way that you provide Kerberos config files to {{es}} depends on your deploym
 
 For detailed information of available realm settings, see [Kerberos realm settings](elasticsearch://reference/elasticsearch/configuration-reference/security-settings.md#ref-kerberos-settings).
 
-:::::{tab-set}
+:::::{applies-switch}
 
-::::{tab-item} Self-managed
+::::{applies-item} self:
 
 1. Configure the JVM to find the Kerberos configuration file.
 
@@ -164,7 +164,7 @@ For detailed information of available realm settings, see [Kerberos realm settin
 4. Restart {{es}}.
 ::::
 
-::::{tab-item} ECH and ECE
+::::{applies-item} { "ech":, "ece":}
 
 1. Create a [custom bundle](elasticsearch://reference/elasticsearch-plugins/plugin-management.md) that contains your `krb5.conf` and `keytab` files, and add it to your cluster.
 
@@ -186,7 +186,7 @@ For detailed information of available realm settings, see [Kerberos realm settin
     ::::
 ::::
 
-::::{tab-item} ECK
+::::{applies-item} eck:
 
 1. Install your `krb5.conf` and `keytab` files as a [custom configuration files](/deploy-manage/deploy/cloud-on-k8s/custom-configuration-files-plugins.md#use-a-volume-and-volume-mount-together-with-a-configmap-or-secret). Mount them in a sub-directory of the main config directory, for example `/usr/share/elasticsearch/config/kerberos`, and use a `Secret` instead of a `ConfigMap` to store the information.
 
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 0d548fab29..0eae49d7b4 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/saml.md
@@ -422,7 +422,7 @@ By default, {{es}} will sign *all* outgoing SAML messages if a signing certifica
 :::
 
 ::::{tab-set}
-:::{tab-item} PEM formatted keys
+:::{tab-item} PEM-formatted keys
 
 If you want to use **PEM formatted** keys and certificates for signing, then you should configure the following settings on the SAML realm:
 
@@ -540,13 +540,13 @@ deployment:
   eck:
 ```
 
-::::{tab-set}
-::: {tab-item} Self-managed
+::::{applies-switch}
+:::{applies-item} self:
 ```sh
 bin/elasticsearch-saml-metadata --realm saml1
 ```
 :::
-::: {tab-item} ECK
+:::{applies-item} eck:
 To generate the Service Provider metadata using the `elasticsearch-saml-metadata` command in {{eck}}, you need to run the command using `kubectl`, and then copy the generated metadata file to your local machine. For example:
 
 ```sh
diff --git a/get-started/evaluate-elastic.md b/get-started/evaluate-elastic.md
index 81da74b59c..84a0593b2b 100644
--- a/get-started/evaluate-elastic.md
+++ b/get-started/evaluate-elastic.md
@@ -76,9 +76,9 @@ With your trial goal in mind, identify which Elastic solution best addresses you
 
 Once you know what you want to evaluate, choose the deployment option that best supports your goals. Elastic offers two primary deployment options on {{ecloud}}.
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{serverless-full}}
+:::{applies-item} serverless:
 
 - Fully managed with automatic scaling.
 - Simplified configuration and maintenance.
@@ -87,7 +87,7 @@ Once you know what you want to evaluate, choose the deployment option that best
 
 :::
 
-:::{tab-item} {{ech}}
+:::{applies-item} ess:
 
 - Access to all solutions in a single deployment.
 - More control over cluster configuration and sizing.
diff --git a/manage-data/data-store/index-basics.md b/manage-data/data-store/index-basics.md
index e97ff1e96e..2534776f8c 100644
--- a/manage-data/data-store/index-basics.md
+++ b/manage-data/data-store/index-basics.md
@@ -89,11 +89,9 @@ To add these privileges, go to **Stack Management > Security > Roles** or use th
 
 Investigate your indices and perform operations from the **Indices** view.
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} {{serverless-short}}
-:sync: serverless
+::::{applies-item} serverless:
 
 :::{image} /manage-data/images/serverless-index-management-indices.png
 :alt: Index Management indices
@@ -113,7 +111,7 @@ Investigate your indices and perform operations from the **Indices** view.
 * To filter the list of indices, use the search bar or click a badge. Badges indicate if an index is a [follower index](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-follow) or a [rollup index](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-get-rollup-index-caps).
 ::::
 
-::::{tab-item} {{stack}}
+::::{applies-item} stack:
 :sync: stack
 
 :::{image} /manage-data/images/elasticsearch-reference-management_index_labels.png
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 8462ac8af5..0c34c7edc0 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
@@ -27,9 +27,9 @@ The configuration in this example makes use of the System module, available for
 
 ## Create a deployment [ec-beats-logstash-trial]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Elastic Cloud Hosted
+:::{applies-item} ess:
 1. [Get a free trial](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 2. Log into [Elastic Cloud](https://cloud.elastic.co?page=docs&placement=docs-body).
 3. Select **Create deployment**.
@@ -40,7 +40,7 @@ The configuration in this example makes use of the System module, available for
 Prefer not to subscribe to yet another service? You can also get {{ech}} through [AWS, Azure, and GCP marketplaces](../../../deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
 :::
 
-:::{tab-item} Elastic Cloud Enterprise
+:::{applies-item} ece:
 1. Log into the Elastic Cloud Enterprise admin console.
 2. Select **Create deployment**.
 3. Give your deployment a name. You can leave all other settings at their default values.
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 95f9b0585a..260ccde2d1 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
@@ -27,9 +27,9 @@ For this tutorial you need a source MySQL instance for Logstash to read from. A
 
 ## Create a deployment [ec-db-logstash-trial]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Elastic Cloud Hosted
+:::{applies-item} ess:
 1. [Get a free trial](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 2. Log into [Elastic Cloud](https://cloud.elastic.co?page=docs&placement=docs-body).
 3. Select **Create deployment**.
@@ -40,7 +40,7 @@ For this tutorial you need a source MySQL instance for Logstash to read from. A
 Prefer not to subscribe to yet another service? You can also get {{ech}} through [AWS, Azure, and GCP marketplaces](../../../deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
 :::
 
-:::{tab-item} Elastic Cloud Enterprise
+:::{applies-item} ece:
 1. Log into the Elastic Cloud Enterprise admin console.
 2. Select **Create deployment**.
 3. Give your deployment a name. You can leave all other settings at their default values.
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 0300bc4e46..f8de4509e1 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
@@ -23,9 +23,9 @@ If you are an Node.js application programmer who is new to the Elastic Stack, th
 
 ## Create a deployment [ec_get_elasticsearch_service]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Elastic Cloud Hosted
+:::{applies-item} ess:
 1. [Get a free trial](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 2. Log into [Elastic Cloud](https://cloud.elastic.co?page=docs&placement=docs-body).
 3. Select **Create deployment**.
@@ -36,7 +36,7 @@ If you are an Node.js application programmer who is new to the Elastic Stack, th
 Prefer not to subscribe to yet another service? You can also get {{ech}} through [AWS, Azure, and GCP marketplaces](../../../deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
 :::
 
-:::{tab-item} Elastic Cloud Enterprise
+:::{applies-item} ece:
 1. Log into the Elastic Cloud Enterprise admin console.
 2. Select **Create deployment**.
 3. Give your deployment a name. You can leave all other settings at their default values.
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 9368137cc6..b2cde4195a 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
@@ -44,9 +44,9 @@ elasticsearch>=7.0.0,<8.0.0
 
 ## Create a deployment [ec_get_elasticsearch_service_2]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Elastic Cloud Hosted
+:::{applies-item} ess:
 1. [Get a free trial](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 2. Log into [Elastic Cloud](https://cloud.elastic.co?page=docs&placement=docs-body).
 3. Select **Create deployment**.
@@ -57,7 +57,7 @@ elasticsearch>=7.0.0,<8.0.0
 Prefer not to subscribe to yet another service? You can also get {{ech}} through [AWS, Azure, and GCP marketplaces](../../../deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
 :::
 
-:::{tab-item} Elastic Cloud Enterprise
+:::{applies-item} ece:
 1. Log into the Elastic Cloud Enterprise admin console.
 2. Select **Create deployment**.
 3. Give your deployment a name. You can leave all other settings at their default values.
diff --git a/manage-data/lifecycle/data-tiers.md b/manage-data/lifecycle/data-tiers.md
index ed59bf1414..94f4c2918b 100644
--- a/manage-data/lifecycle/data-tiers.md
+++ b/manage-data/lifecycle/data-tiers.md
@@ -160,9 +160,9 @@ To make sure that all data can be migrated from the data tier you want to disabl
 
 1. Determine which nodes will be removed from the cluster.
 
-    :::::{tab-set}
+    :::::{applies-switch}
 
-    ::::{tab-item} {{ech}}
+    ::::{applies-item} ess:
 
     1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
     2. From the **Hosted deployments** page, select your deployment.
@@ -179,7 +179,7 @@ To make sure that all data can be migrated from the data tier you want to disabl
 
     ::::
 
-    ::::{tab-item} Elastic Cloud Enterprise
+    ::::{applies-item} ece:
     1. [Log into the Cloud UI](/deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md).
     2. From the **Deployments** page, select your deployment.
 
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 e834b1c215..8740cbd593 100644
--- a/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
+++ b/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md
@@ -27,9 +27,9 @@ For existing {{ecloud}} hot-warm deployments that are currently using index cura
 
 To configure ILM Migration in the console:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{ech}}
+:::{applies-item} ess:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. From the **Hosted deployments** page, select your deployment.
 
@@ -40,7 +40,7 @@ To configure ILM Migration in the console:
 5. Set the ILM policy name for each data view (formerly *index pattern*).
 :::
 
-:::{tab-item} Elastic Cloud Enterprise
+:::{applies-item} ece:
 1. [Log into the Cloud UI](../../../deploy-manage/deploy/cloud-enterprise/log-into-cloud-ui.md).
 2. From the **Deployments** page, select your deployment.
 
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 7e75d98dca..342440570a 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
@@ -22,9 +22,9 @@ The content tier is not typically used for time series data. However, it’s req
 
 The steps for setting up data tiers vary based on your deployment type:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 2. Add or select your deployment from the {{ecloud}} home page or the **Hosted deployments** page.
 3. From your deployment menu, select **Edit deployment**.
@@ -35,7 +35,7 @@ The steps for setting up data tiers vary based on your deployment type:
 [Autoscaling](../deploy-manage/autoscaling.md) automatically adjusts your deployment’s capacity to meet your storage needs. To enable autoscaling, select **Autoscale this deployment** on the **Edit deployment** page. Autoscaling is only available for {{ech}}.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 To assign a node to a data tier, add the respective [node role](elasticsearch://reference/elasticsearch/configuration-reference/node-settings.md#node-roles) to the node’s [`elasticsearch.yml`](/deploy-manage/stack-settings.md) file. Changing an existing node’s roles requires a [rolling restart](../deploy-manage/maintenance/start-stop-services/full-cluster-restart-rolling-restart-procedures.md#restart-cluster-rolling).
 
 ```yaml
@@ -76,9 +76,9 @@ The cold and frozen tiers can use [{{search-snaps}}](../deploy-manage/tools/snap
 
 To use {{search-snaps}}, you must register a supported snapshot repository. The steps for registering this repository vary based on your deployment type and storage provider:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 When you create a cluster, {{ech}} automatically registers a default [`found-snapshots`](../deploy-manage/tools/snapshot-and-restore.md) repository. This repository supports {{search-snaps}}.
 
 The `found-snapshots` repository is specific to your cluster. To use another cluster’s default repository, refer to the Cloud [Snapshot and restore](../deploy-manage/tools/snapshot-and-restore.md) documentation.
@@ -90,7 +90,7 @@ You can also use any of the following custom repository types with {{search-snap
 * [Amazon Web Services (AWS)](/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md)
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 Use any of the following repository types with searchable snapshots:
 
 * [AWS S3](../deploy-manage/tools/snapshot-and-restore/s3-repository.md)
diff --git a/reference/fleet/elastic-agent-container.md b/reference/fleet/elastic-agent-container.md
index 40ee7664fe..ac3b554b21 100644
--- a/reference/fleet/elastic-agent-container.md
+++ b/reference/fleet/elastic-agent-container.md
@@ -25,13 +25,13 @@ Considerations:
 * [Docker installed](https://docs.docker.com/get-docker/).
 * {{es}} for storing and searching your data, and {{kib}} for visualizing and managing it.
 
-   ::::{tab-set}
+   ::::{applies-switch}
 
-   :::{tab-item} {{ech}}
+   :::{applies-item} ess:
    To get started quickly, spin up an [{{ech}}](https://www.elastic.co/cloud/elasticsearch-service) deployment. {{ech}} is available on AWS, GCP, and Azure. [Try it out for free](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
    :::
 
-   :::{tab-item} Self-managed
+   :::{applies-item} self:
    To install and run {{es}} and {{kib}}, see [Installing the {{stack}}](/deploy-manage/deploy/self-managed/installing-elasticsearch.md).
    :::
 
@@ -127,9 +127,9 @@ docker run --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}}
 ## Step 4: Run the Elastic Agent image [_step_4_run_the_elastic_agent_image]
 
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} Elastic Cloud
+:::{applies-item} { "serverless":, "ess": }
 
 ```terminal subs=true
 docker run \
@@ -146,7 +146,7 @@ docker run \
 Refer to [Environment variables](/reference/fleet/agent-environment-variables.md) for all available options.
 :::
 
-:::{tab-item} Self-managed
+:::{applies-item} self:
 
 If you’re running a self-managed cluster and want to run your own {{fleet-server}}, run the following command, which will spin up both {{agent}} and {{fleet-server}} in a container:
 
@@ -206,14 +206,14 @@ You can also add `type=tmpfs` to the mount parameter (`--mount type=tmpfs,destin
 
 1. Launch {{kib}}:
 
-   ::::{tab-set}
+   ::::{applies-switch}
 
-   :::{tab-item} {{ech}}
+   :::{applies-item} ess:
    1. [Log in](https://cloud.elastic.co/) to your {{ecloud}} account.
    2. Navigate to the {{kib}} endpoint in your deployment.
    :::
 
-   :::{tab-item} Self-managed
+   :::{applies-item} self:
    Point your browser to [http://localhost:5601](http://localhost:5601), replacing `localhost` with the name of the {{kib}} host.
    :::
 
diff --git a/reference/fleet/running-on-eks-managed-by-fleet.md b/reference/fleet/running-on-eks-managed-by-fleet.md
index 39ce8c5200..8fa70bddee 100644
--- a/reference/fleet/running-on-eks-managed-by-fleet.md
+++ b/reference/fleet/running-on-eks-managed-by-fleet.md
@@ -17,14 +17,14 @@ Follow these steps to configure the Elastic Agent Add-On on Amazon EKS.
 * An existing Amazon EKS cluster. To deploy one, see [Create an Amazon EKS cluster](https://docs.aws.amazon.com/eks/latest/userguide/create-cluster.html).
 * {{es}} for storing and searching your data, and {{kib}} for visualizing and managing it.
 
-  ::::{tab-set}
+  ::::{applies-switch}
 
-  :::{tab-item} {{ech}}
+  :::{applies-item} ess:
 
   To get started quickly, spin up an [{{ech}}](https://www.elastic.co/cloud/elasticsearch-service) deployment. {{ech}} is available on AWS, GCP, and Azure. [Try it out for free](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
   :::
 
-  :::{tab-item} Self-managed
+  :::{applies-item} self:
 
   To install and run {{es}} and {{kib}}, see [Installing the {{stack}}](/deploy-manage/deploy/self-managed/installing-elasticsearch.md).
   :::
@@ -70,15 +70,15 @@ When the Elastic Agent is Active, it appears in Fleet and its configuration is d
 
 1. Launch {{kib}}:
 
-    ::::{tab-set}
+    ::::{applies-switch}
 
-    :::{tab-item} {{ech}}
+    :::{applies-item} ess:
 
     1. [Log in](https://cloud.elastic.co/) to your {{ecloud}} account.
     2. Navigate to the {{kib}} endpoint in your deployment.
     :::
 
-    :::{tab-item} Self-managed
+    :::{applies-item} self:
 
     Point your browser to [http://localhost:5601](http://localhost:5601), replacing `localhost` with the name of the {{kib}} host.
 
diff --git a/reference/fleet/running-on-kubernetes-managed-by-fleet.md b/reference/fleet/running-on-kubernetes-managed-by-fleet.md
index 72b1177e0e..887ccc488b 100644
--- a/reference/fleet/running-on-kubernetes-managed-by-fleet.md
+++ b/reference/fleet/running-on-kubernetes-managed-by-fleet.md
@@ -13,14 +13,14 @@ products:
 * [kubectl installed](https://kubernetes.io/docs/tasks/tools/).
 * {{es}} for storing and searching your data, and {{kib}} for visualizing and managing it.
 
-  ::::{tab-set}
+  ::::{applies-switch}
 
-  :::{tab-item} {{ech}}
+  :::{applies-item} ess:
 
   To get started quickly, spin up an [{{ech}}](https://www.elastic.co/cloud/elasticsearch-service) deployment. {{ech}} is available on AWS, GCP, and Azure. [Try it out for free](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
   :::
 
-  :::{tab-item} Self-managed
+  :::{applies-item} self:
 
   To install and run {{es}} and {{kib}}, see [Installing the {{stack}}](/deploy-manage/deploy/self-managed/installing-elasticsearch.md).
   :::
@@ -194,15 +194,15 @@ If you’d like to run {{agent}} on Kubernetes on a read-only file system, you c
 
 1. Launch {{kib}}:
 
-    ::::{tab-set}
+    ::::{applies-switch}
 
-    :::{tab-item} {{ech}}
+    :::{applies-item} ess:
 
     1. [Log in](https://cloud.elastic.co/) to your {{ecloud}} account.
     2. Navigate to the {{kib}} endpoint in your deployment.
     :::
 
-    :::{tab-item} Self-managed
+    :::{applies-item} self:
 
     Point your browser to [http://localhost:5601](http://localhost:5601), replacing `localhost` with the name of the {{kib}} host.
 
diff --git a/reference/fleet/running-on-kubernetes-standalone.md b/reference/fleet/running-on-kubernetes-standalone.md
index cecfa3deab..3c3c3cde6b 100644
--- a/reference/fleet/running-on-kubernetes-standalone.md
+++ b/reference/fleet/running-on-kubernetes-standalone.md
@@ -13,13 +13,13 @@ products:
 * [kubectl installed](https://kubernetes.io/docs/tasks/tools/).
 * {{es}} for storing and searching your data, and {{kib}} for visualizing and managing it.
 
-  ::::{tab-set}
+  ::::{applies-switch}
 
-  :::{tab-item} {{ech}}
+  :::{applies-item} ess:
   To get started quickly, spin up an [{{ech}}](https://www.elastic.co/cloud/elasticsearch-service) deployment. {{ech}} is available on AWS, GCP, and Azure. [Try it out for free](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
   :::
 
-  :::{tab-item} Self-managed
+  :::{applies-item} self:
   To install and run {{es}} and {{kib}}, see [Installing the {{stack}}](/deploy-manage/deploy/self-managed/installing-elasticsearch.md).
   :::
 
@@ -158,15 +158,16 @@ If you’d like to run {{agent}} on Kubernetes on a read-only file system, you c
 
 1. Launch {{kib}}:
 
-    ::::{tab-set}
+    ::::{applies-switch}
 
-    :::{tab-item} {{ech}}
+    :::{applies-item} ess:
 
     1. [Log in](https://cloud.elastic.co/) to your {{ecloud}} account.
     2. Navigate to the {{kib}} endpoint in your deployment.
     :::
 
-    :::{tab-item} Self-managed
+    :::{applies-item} self:
+    
     Point your browser to [http://localhost:5601](http://localhost:5601), replacing `localhost` with the name of the {{kib}} host.
     :::
 
diff --git a/solutions/observability/apm/find-transaction-latency-failure-correlations.md b/solutions/observability/apm/find-transaction-latency-failure-correlations.md
index 59e9147ad7..8adc5b0221 100644
--- a/solutions/observability/apm/find-transaction-latency-failure-correlations.md
+++ b/solutions/observability/apm/find-transaction-latency-failure-correlations.md
@@ -17,18 +17,9 @@ Correlations surface attributes of your data that are potentially correlated wit
 
 To find correlations:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
-
-Select a service on the **Services** page in the Applications UI then select a transaction group from the **Transactions** tab.
-
-:::
-
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. In your {{obs-serverless}} project, go to **Applications** → **Service Inventory**.
 2. Select a service.
@@ -37,6 +28,12 @@ Select a service on the **Services** page in the Applications UI then select a t
 
 :::
 
+:::{applies-item} stack:
+
+Select a service on the **Services** page in the Applications UI then select a transaction group from the **Transactions** tab.
+
+:::
+
 ::::
 
 ::::{note}
diff --git a/solutions/observability/apm/ingest/jaeger.md b/solutions/observability/apm/ingest/jaeger.md
index 1bb3587f92..81ffb8007c 100644
--- a/solutions/observability/apm/ingest/jaeger.md
+++ b/solutions/observability/apm/ingest/jaeger.md
@@ -43,9 +43,9 @@ There are [caveats](#apm-caveats-jaeger) to this integration.
 
 The APM integration serves Jaeger gRPC over the same host and port as the Elastic {{apm-agent}} protocol.
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ecloud}}
+::::::{applies-item} ess:
 1. Log into [{{ecloud}}](https://cloud.elastic.co?page=docs&placement=docs-body) and select your deployment.
 2. In {{kib}}, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
 3. Select **Elastic APM**. If the integration is already installed, under the polices tab, select **Actions** > **Edit integration**. If the integration has not been installed, select **Add Elastic APM**. Copy the URL. If you’re using Agent authorization, copy the Secret token as well.
@@ -64,7 +64,7 @@ For the equivalent environment variables, change all letters to upper-case and r
 ::::
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 1. Configure the APM Integration as a collector for your Jaeger agents. In {{kib}}, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md). Select **Elastic APM**. If the integration is already installed, under the polices tab, select **Actions** > **Edit integration**. If the integration has not been installed, select **Add Elastic APM**. Copy the Host. If you’re using Agent authorization, copy the Secret token as well.
 
     As of this writing, the Jaeger agent binary offers the `--reporter.grpc.host-port` CLI flag. Use this to define the host and port that the APM Integration is listening on:
diff --git a/solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md b/solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
index c71ef3b13c..09f0de6734 100644
--- a/solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
+++ b/solutions/observability/apm/opentelemetry/upstream-opentelemetry-collectors-language-sdks.md
@@ -28,11 +28,9 @@ The Elastic Distribution of OpenTelemetry Collector (EDOT Collector) include add
 
 Connect your OpenTelemetry Collector instances to Elastic {{observability}} or {{obs-serverless}} using the OTLP exporter:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 ```yaml
 receivers: <1>
@@ -87,8 +85,7 @@ service:
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 ```yaml
 receivers:   <1>
@@ -157,11 +154,9 @@ To export traces and metrics to Elastic, instrument your services and applicatio
 
 Define environment variables to configure the OpenTelemetry agent or SDK and enable communication with Elastic APM. For example, if you are instrumenting a Java app, define the following environment variables:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 ```bash
 export OTEL_RESOURCE_ATTRIBUTES=service.name=checkoutService,service.version=1.1,deployment.environment=production
@@ -201,8 +196,7 @@ java -javaagent:/path/to/opentelemetry-javaagent-all.jar \
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 ```bash
 export OTEL_RESOURCE_ATTRIBUTES=service.name=checkoutService,service.version=1.1,deployment.environment=production
diff --git a/solutions/observability/get-started/logs-essentials.md b/solutions/observability/get-started/logs-essentials.md
index fb803868cf..4562e58c9d 100644
--- a/solutions/observability/get-started/logs-essentials.md
+++ b/solutions/observability/get-started/logs-essentials.md
@@ -89,6 +89,7 @@ Elastic {{observability}} can collect logs from cloud services through Elastic i
 3. Select the integration you want to add.
 4. Select **Add**.
 :::
+::::
 
 :::::
 
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 9c791591e1..e1accd260b 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
@@ -71,11 +71,9 @@ Data collection with AWS Firehose is supported on {{ech}} deployments in AWS, Az
 
 ## Prerequisites [_prerequisites_5]
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} Elastic Stack
-:sync: stack
+::::{applies-item} stack:
 
 * An [{{ech}}](https://cloud.elastic.co/registration?page=docs&placement=docs-body) deployment. The deployment includes an {{es}} cluster for storing and searching your data, and {{kib}} for visualizing and managing your data.
 * A user with the `superuser` [built-in role](elasticsearch://reference/elasticsearch/roles.md) or the privileges required to onboard data.
@@ -95,8 +93,7 @@ The default CloudFormation stack is created in the AWS region selected for the u
 
 ::::
 
-::::{tab-item} Serverless
-:sync: serverless
+::::{applies-item} serverless:
 
 * An {{obs-serverless}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * A user with the **Admin** role or higher—required to onboard system logs and metrics. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
@@ -148,11 +145,9 @@ The following table shows the type of data ingested by the supported AWS service
 
 ## Collect your data [_collect_your_data_5]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. Under **What do you want to monitor?** select **Cloud**, **AWS**, and then select **AWS Firehose**.
@@ -168,8 +163,7 @@ The following table shows the type of data ingested by the supported AWS service
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. In your {{obs-serverless}} project, go to **Add Data**.
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 323e3d9ce8..5e305b075a 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
@@ -29,11 +29,9 @@ We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](
 
 ## Prerequisites [_prerequisites]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 * An {{es}} cluster for storing and searching your data, and {{kib}} for visualizing and managing your data. This quickstart is available for all Elastic deployment models. To get started quickly, try out [{{ecloud}}](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 * A user with the `superuser` [built-in role](elasticsearch://reference/elasticsearch/roles.md) or the privileges required to onboard data.
@@ -49,8 +47,7 @@ We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 * An {{obs-serverless}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * An Elastic deployment. If you don’t have one yet, go to [cloud.elastic.co](https://cloud.elastic.co/). Within **Hosted deployments**, select **Create hosted deployment**.
@@ -71,11 +68,9 @@ We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](
 
 ## Collect your data [_collect_your_data]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. Under **What do you want to monitor?** select **Host**, and then select **Elastic Agent: Logs & Metrics**.
@@ -100,8 +95,7 @@ We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. In your {{obs-serverless}} project, go to **Add Data**.
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 622679e67d..f5ce21ac18 100644
--- a/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
+++ b/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md
@@ -17,11 +17,9 @@ In this quickstart guide, you’ll learn how to monitor your hosts using the Ela
 
 ## Prerequisites [_prerequisites]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 * An {{es}} cluster for storing and searching your data, and {{kib}} for visualizing and managing your data. This quickstart is available for all Elastic deployment models. The quickest way to get started with this quickstart is using a trial project on [Elastic serverless](https://docs.elastic.co/serverless/quickstart-monitor-hosts-with-otel.html).
 * This quickstart is only available for Linux and MacOS systems.
@@ -33,8 +31,7 @@ In this quickstart guide, you’ll learn how to monitor your hosts using the Ela
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 * An {{observability}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * This quickstart is only available for Linux and MacOS systems.
@@ -58,11 +55,9 @@ Refer to [Elastic OpenTelemetry Collector limitations](opentelemetry://reference
 
 Follow these steps to collect logs and metrics using the EDOT Collector:
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} Elastic Stack
-:sync: stack
+::::{applies-item} stack:
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. Under **What do you want to monitor?** select **Host**, and then select **OpenTelemetry: Logs & Metrics**.
@@ -89,8 +84,7 @@ Logs are collected from setup onward, so you won’t see logs that occurred befo
 
 ::::
 
-::::{tab-item} Serverless
-:sync: serverless
+::::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. To open the quickstart, go to **Add Data**.
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 70af24e79b..f584867b05 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
@@ -25,11 +25,9 @@ In {{stack}} versions 9.0 and 9.1, the quickstart uses [Kubectl](https://kuberne
 
 ## Prerequisites [_prerequisites_2]
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} {{serverless-short}}
-:sync: serverless
+::::{applies-item} serverless:
 
 * An {{obs-serverless}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * A user with the **Admin** role or higher (required to onboard system logs and metrics). To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
@@ -37,8 +35,7 @@ In {{stack}} versions 9.0 and 9.1, the quickstart uses [Kubectl](https://kuberne
 * [Helm](https://helm.sh/docs/)
 ::::
 
-::::{tab-item} {{stack}} 9.2 and later
-:sync: stack-9.2
+::::{applies-item} stack: ga 9.2+
 
 * A running {{stack}} deployment, either self-managed or orchestrated by platforms like {{ech}}, {{ece}}, or {{eck}}, with internet access. To get started quickly, try out [{{ecloud}}](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 * A user with the `superuser` [built-in role](elasticsearch://reference/elasticsearch/roles.md) or the privileges required to onboard data.
@@ -53,8 +50,7 @@ In {{stack}} versions 9.0 and 9.1, the quickstart uses [Kubectl](https://kuberne
 * [Helm](https://helm.sh/docs/)
 ::::
 
-::::{tab-item} {{stack}} 9.0-9.1
-:sync: stack-9.0-9.1
+::::{applies-item} stack: ga 9.0-9.1
 
 * A running {{stack}} deployment, either self-managed or orchestrated by platforms like {{ech}}, {{ece}}, or {{eck}}, with internet access. To get started quickly, try out [{{ecloud}}](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 * A user with the `superuser` [built-in role](elasticsearch://reference/elasticsearch/roles.md) or the privileges required to onboard data.
@@ -82,11 +78,9 @@ The installation command provided by the UI during the quickstart cannot be used
 
 ## Collect your data [_collect_your_data_2]
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} {{serverless-short}}
-:sync: serverless
+::::{applies-item} serverless:
 
 1. Go to your [{{obs-serverless}}](/solutions/observability/get-started.md) project, then go to **Add data**.
 2. In the **What do you want to monitor?** section, select **Kubernetes**, and then select **Elastic Agent: Logs & Metrics**.
@@ -124,8 +118,7 @@ The installation command provided by the UI during the quickstart cannot be used
 
 ::::
 
-::::{tab-item} {{stack}} 9.2 and later
-:sync: stack-9.2
+::::{applies-item} stack: ga 9.2+
 
 1. In {{kib}}, go to the **Observability** overview page, and click **Add Data**.
 2. In the **What do you want to monitor?** section, select **Kubernetes**, and then select **Elastic Agent: Logs & Metrics**.
@@ -163,8 +156,7 @@ The installation command provided by the UI during the quickstart cannot be used
 
 ::::
 
-::::{tab-item} {{stack}} 9.0-9.1
-:sync: stack-9.0-9.1
+::::{applies-item} stack: ga 9.0-9.1
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. In the **What do you want to monitor?** section, select **Kubernetes**, and then select **Elastic Agent: Logs & Metrics**.
@@ -198,11 +190,9 @@ Refer to [Observability overview](/solutions/observability.md) for a description
 
 ## Uninstall {{agent}} from the Kubernetes cluster [monitor-k8s-with-agent-delete-agent]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} {{serverless-short}}
-:sync: serverless
+:::{applies-item} serverless:
 
 To uninstall {{agent}} and the Kubernetes resources installed with Helm, run:
 
@@ -218,8 +208,7 @@ helm uninstall elastic-agent -n kube-system
 ```
 :::
 
-:::{tab-item} {{stack}} 9.2 and later
-:sync: stack-9.2
+:::{applies-item} stack: ga 9.2+
 
 To uninstall {{agent}} and the Kubernetes resources installed with Helm, run:
 
@@ -235,8 +224,7 @@ helm uninstall elastic-agent -n kube-system
 ```
 :::
 
-:::{tab-item} {{stack}} 9.0-9.1
-:sync: stack-9.0-9.1
+:::{applies-item} stack: ga 9.0-9.1
 
 To uninstall {{agent}} and the Kubernetes resources installed with `kubectl`:
 
diff --git a/solutions/observability/get-started/quickstart-monitor-your-application-performance.md b/solutions/observability/get-started/quickstart-monitor-your-application-performance.md
index 821137eafc..b6bd21dbce 100644
--- a/solutions/observability/get-started/quickstart-monitor-your-application-performance.md
+++ b/solutions/observability/get-started/quickstart-monitor-your-application-performance.md
@@ -14,11 +14,9 @@ In this quickstart guide, you’ll learn how to instrument your application usin
 
 ## Prerequisites [_prerequisites]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 * An {{es}} cluster for storing and searching your data, and {{kib}} for visualizing and managing your data. This quickstart is available for all Elastic deployment models. The quickest way to get started with this quickstart is using a trial project on [Elastic serverless](/solutions/observability/get-started.md).
 * A user with the **Admin** role or higher—required to onboard system logs and metrics. To learn more, refer to [User roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md).
@@ -26,8 +24,7 @@ In this quickstart guide, you’ll learn how to instrument your application usin
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 * An {{observability}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * A user with the **Admin** role or higher—required to onboard system logs and metrics. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
@@ -46,11 +43,9 @@ Refer to the [EDOT Quickstarts](/solutions/observability/get-started/opentelemet
 
 Follow these steps to collect application telemetry data using the EDOT SDKs:
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} Elastic Stack
-:sync: stack
+::::{applies-item} stack:
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. Under **What do you want to monitor?** select **Application**, and then select **OpenTelemetry**.
@@ -71,8 +66,7 @@ If your application runs on Kubernetes, the OpenTelemetry operator automatically
 
 ::::
 
-::::{tab-item} Serverless
-:sync: serverless
+::::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. Under **What do you want to monitor?** select **Application**, and then select **OpenTelemetry**.
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 188692f9e6..1f489b4d56 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
@@ -26,11 +26,9 @@ For a more detailed description of the components and advanced configuration, re
 
 ## Prerequisites [_prerequisites_2]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 * An {{es}} cluster for storing and searching your data, and {{kib}} for visualizing and managing your data. This quickstart is available for all Elastic deployment models. To get started quickly, try out [{{ecloud}}](https://cloud.elastic.co/registration?page=docs&placement=docs-body).
 * A running Kubernetes cluster (v1.23 or newer).
@@ -40,8 +38,7 @@ For a more detailed description of the components and advanced configuration, re
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 * An {{obs-serverless}} project. To learn more, refer to [Create an Observability project](/solutions/observability/get-started.md).
 * A running Kubernetes cluster (v1.23 or newer).
@@ -55,11 +52,9 @@ For a more detailed description of the components and advanced configuration, re
 
 ## Collect your data [_collect_your_data_2]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. In {{kib}}, go to the **Observability** UI and click **Add Data**.
 2. Under **What do you want to monitor?** select **Kubernetes**, and then select **OpenTelemetry: Full Observability**.
@@ -87,8 +82,7 @@ For a more detailed description of the components and advanced configuration, re
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. In your {{obs-serverless}} project, go to **Add Data**.
diff --git a/solutions/observability/infra-and-hosts/detect-metric-anomalies.md b/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
index 10ccf2625e..39e7b7db70 100644
--- a/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
+++ b/solutions/observability/infra-and-hosts/detect-metric-anomalies.md
@@ -29,11 +29,9 @@ Create a {{ml}} job to detect anomalous memory usage and network traffic automat
 
 After creating {{ml}} jobs, you cannot change the settings. You can recreate these jobs later. However, you will remove any previously detected anomalies.
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. To open **Infrastructure inventory**, find **Infrastructure** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
 2. Click the **Anomaly detection** link at the top of the page.
@@ -58,8 +56,7 @@ After creating {{ml}} jobs, you cannot change the settings. You can recreate the
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. In your {{obs-serverless}} project, go to **Infrastructure** → **Infrastructure inventory** and click the **Anomaly detection** link at the top of the page.
 2. Under **Hosts** or **Kubernetes Pods**, click **Enable** to create a {{ml}} job.
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 57e4e6f663..b2e2733aee 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
@@ -20,11 +20,9 @@ To get started quickly without {{fleet}}, follow the steps described in the [qui
 
 ## Prerequisites [logs-metrics-prereqs]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 To follow the steps in this guide, you need an {{stack}} deployment that includes:
 
@@ -37,8 +35,7 @@ To get started quickly, create an {{ech}} deployment and host it on AWS, GCP, or
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 The **Admin** role or higher is required to onboard system metrics data. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
 
@@ -49,11 +46,9 @@ The **Admin** role or higher is required to onboard system metrics data. To lear
 
 ## Onboard system metrics data [add-system-integration]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 {{agent}} is a single, unified way to add monitoring for logs, metrics, and other types of data to a host. It can also protect hosts from security threats, query data from operating systems, forward data from remote services or hardware, and more. A single agent makes it easier and faster to deploy monitoring across your infrastructure. Each agent has a single policy you can update to add integrations for new data sources, security protections, and more.
 
@@ -85,8 +80,7 @@ In this step, add the System integration to monitor host logs and metrics.
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. [Create a new {{obs-serverless}} project](/solutions/observability/get-started.md), or open an existing one.
 2. In your {{obs-serverless}} project, go to **Project Settings** → **Integrations**.
diff --git a/solutions/observability/logs/get-started-with-system-logs.md b/solutions/observability/logs/get-started-with-system-logs.md
index 7b0254f0e9..43bc52ea63 100644
--- a/solutions/observability/logs/get-started-with-system-logs.md
+++ b/solutions/observability/logs/get-started-with-system-logs.md
@@ -14,11 +14,9 @@ In this guide you can learn how to onboard system log data from a machine or ser
 
 ## Prerequisites [logs-prereqs]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 To follow the steps in this guide, you need an {{stack}} deployment that includes:
 
@@ -30,8 +28,7 @@ To get started quickly, create an {{ech}} deployment and host it on AWS, GCP, or
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 The **Admin** role or higher is required to onboard log data. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/manage-users.md#general-assign-user-roles).
 
diff --git a/solutions/observability/logs/stream-any-log-file-using-edot-collector.md b/solutions/observability/logs/stream-any-log-file-using-edot-collector.md
index ed6bf874de..669da78077 100644
--- a/solutions/observability/logs/stream-any-log-file-using-edot-collector.md
+++ b/solutions/observability/logs/stream-any-log-file-using-edot-collector.md
@@ -19,11 +19,9 @@ For more OpenTelemetry quickstarts, refer to [EDOT quickstarts](/solutions/obser
 
 ## Prerequisites [logs-stream-edot-prereq]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 To follow the steps in this guide, you need an {{stack}} deployment that includes:
 
@@ -37,8 +35,7 @@ To get started quickly, create an {{ech}} deployment and host it on AWS, GCP, or
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 The **Admin** role or higher is required to onboard log data. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
 
@@ -147,11 +144,9 @@ $content | Set-Content .\otel.yml
 
 To collect logs from specific log files, you need to modify the `otel.yml` configuration file. The configuration includes receivers, processors, and exporters that handle log data.
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 Here's an example configuration for collecting log files with Elastic Stack:
 
@@ -231,8 +226,7 @@ service:
 :::
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 Here's an example configuration for collecting log files with Elastic Cloud Serverless:
 
diff --git a/solutions/observability/logs/stream-any-log-file.md b/solutions/observability/logs/stream-any-log-file.md
index f38ef09093..f90133e47c 100644
--- a/solutions/observability/logs/stream-any-log-file.md
+++ b/solutions/observability/logs/stream-any-log-file.md
@@ -20,11 +20,9 @@ Continue with this guide for instructions on manual configuration.
 
 ## Prerequisites [logs-stream-prereq]
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 To follow the steps in this guide, you need an {{stack}} deployment that includes:
 
@@ -38,8 +36,7 @@ To get started quickly, create an {{ech}} deployment and host it on AWS, GCP, or
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 The **Admin** role or higher is required to onboard log data. To learn more, refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md#general-assign-user-roles).
 
diff --git a/solutions/observability/streams/streams.md b/solutions/observability/streams/streams.md
index c7bdfc99ce..6d16f045cd 100644
--- a/solutions/observability/streams/streams.md
+++ b/solutions/observability/streams/streams.md
@@ -46,9 +46,9 @@ You can still edit non-managed ingest pipelines, templates, and other components
 
 Streams requires the following permissions:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 Streams requires these {{serverless-full}} roles:
 
 - Admin: Ability to manage all Streams
@@ -56,7 +56,7 @@ Streams requires these {{serverless-full}} roles:
 
 :::
 
-:::{tab-item} Stack
+:::{applies-item} stack:
 To manage all streams, you need the following permissions:
 
 - **Cluster permissions**: `manage_index_templates`, `manage_ingest_pipelines`, `manage_pipeline`, `read_pipeline`
diff --git a/solutions/observability/synthetics/cli.md b/solutions/observability/synthetics/cli.md
index 0d0886eb52..4abc358010 100644
--- a/solutions/observability/synthetics/cli.md
+++ b/solutions/observability/synthetics/cli.md
@@ -307,11 +307,9 @@ If an administrator has disabled Elastic managed locations for the role you are
 
 Generate a Time-based One-Time Password (TOTP) for multifactor authentication (MFA) in Synthetics.
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 ```sh
 npx @elastic/synthetics totp <secret>
@@ -320,8 +318,7 @@ npx @elastic/synthetics totp <secret> --issuer <string> --label <string>
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 ```sh
 npx @elastic/synthetics totp <secret> --issuer <issuer> --label <label>
diff --git a/solutions/observability/synthetics/configure-projects.md b/solutions/observability/synthetics/configure-projects.md
index f159568022..3bafc8417c 100644
--- a/solutions/observability/synthetics/configure-projects.md
+++ b/solutions/observability/synthetics/configure-projects.md
@@ -16,11 +16,10 @@ Synthetic tests support the configuration of dynamic parameters that can be used
 
 Create a `synthetics.config.js` or `synthetics.config.ts` file in the root of the Synthetics project and specify the options. For example:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
+
+:::{applies-item} stack:
 
-:::{tab-item} Elastic Stack
-:sync: stack
 ```ts
 import type { SyntheticsConfig } from '@elastic/synthetics';
 
@@ -59,8 +58,7 @@ export default env => {
 ```
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 ```ts
 import type { SyntheticsConfig } from '@elastic/synthetics';
diff --git a/solutions/observability/synthetics/create-monitors-with-projects.md b/solutions/observability/synthetics/create-monitors-with-projects.md
index 6f77019cf5..1302777130 100644
--- a/solutions/observability/synthetics/create-monitors-with-projects.md
+++ b/solutions/observability/synthetics/create-monitors-with-projects.md
@@ -64,11 +64,9 @@ npx @elastic/synthetics init synthetic-project-test
 
 Then, follow the prompts on screen to set up the correct default variables for your Synthetics project. When complete, set the `SYNTHETICS_API_KEY` environment variable in your terminal, which is used to connect to your Observability project:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. To generate an API key:
 
@@ -109,8 +107,7 @@ Then, take a look at key files and directories inside your Synthetics project:
 * `.github` contains sample workflow files to use with GitHub Actions.
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. To generate an API key:
 
@@ -196,11 +193,9 @@ For more details on writing journeys and configuring browser monitors, refer to
 
 ## Test and connect to your Observability project or Elastic Stack deployment[synthetics-get-started-project-test-and-connect-to-your-observability-project]
 
-:::::{tab-set}
-:group: stack-serverless
+:::::{applies-switch}
 
-::::{tab-item} Elastic Stack
-:sync: stack
+::::{applies-item} stack:
 
 While inside the project directory you can do two things with the `npx @elastic/synthetics` command:
 
@@ -227,8 +222,7 @@ To list available {{private-location}}s, run the [`elastic-synthetics locations`
 
 ::::
 
-::::{tab-item} Serverless
-:sync: serverless
+::::{applies-item} serverless:
 
 While inside the Synthetics project directory you can do two things with the `npx @elastic/synthetics` command:
 
diff --git a/solutions/observability/synthetics/grant-access-to-secured-resources.md b/solutions/observability/synthetics/grant-access-to-secured-resources.md
index 78626ec609..be4383f93d 100644
--- a/solutions/observability/synthetics/grant-access-to-secured-resources.md
+++ b/solutions/observability/synthetics/grant-access-to-secured-resources.md
@@ -14,11 +14,9 @@ products:
 
 You can use role-based access control to grant users access to secured resources. The roles that you set up depend on your organization’s security requirements and the minimum privileges required to use specific features.
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 Typically you need the create the following separate roles:
 
@@ -36,8 +34,7 @@ In general, these are types of privileges you’ll work with:
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 * **Viewer**:
 
diff --git a/solutions/observability/synthetics/manage-data-retention.md b/solutions/observability/synthetics/manage-data-retention.md
index 55a87b511e..062e51dab0 100644
--- a/solutions/observability/synthetics/manage-data-retention.md
+++ b/solutions/observability/synthetics/manage-data-retention.md
@@ -38,11 +38,9 @@ If Synthetics browser data streams are storing data longer than necessary, you c
 
 To find Synthetics data streams:
 
-::::{tab-set}
-:group: stack-serverless
+::::{applies-switch}
 
-:::{tab-item} Elastic Stack
-:sync: stack
+:::{applies-item} stack:
 
 1. In {{kib}}, navigate to [Index Management](/manage-data/data-store/index-basics.md#index-management).
 2. Filter the list of data streams for those containing the term `synthetics`.
@@ -51,8 +49,7 @@ To find Synthetics data streams:
 
 :::
 
-:::{tab-item} Serverless
-:sync: serverless
+:::{applies-item} serverless:
 
 1. Navigate to **Project settings** → **Management** → **Index Management** → **Data Streams**.
 2. Filter the list of data streams for those containing the term `synthetics`.
diff --git a/troubleshoot/elasticsearch/add-tier.md b/troubleshoot/elasticsearch/add-tier.md
index 2b2fc7ae1b..c95868a34e 100644
--- a/troubleshoot/elasticsearch/add-tier.md
+++ b/troubleshoot/elasticsearch/add-tier.md
@@ -23,9 +23,9 @@ The allocation of indices in an {{es}} deployment can be allocated on [data tier
 
 In order to allow indices to be allocated, follow these steps to add the [data tier](../../manage-data/lifecycle/data-tiers.md) the indices expect to be allocated on to your deployment:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to get the shards assigned we need enable a new tier in the deployment.
 
 **Use {{kib}}**
@@ -70,7 +70,7 @@ In order to get the shards assigned we need enable a new tier in the deployment.
 8. Navigate to the bottom of the page and click the **Save** button.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the shards assigned you can add more nodes to your {{es}} cluster and assign the index’s target tier [node role](../../manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md#assign-data-tier) to the new nodes.
 
 To determine which tier an index requires for assignment, use the [get index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) API to retrieve the configured value for the `index.routing.allocation.include._tier_preference` setting:
diff --git a/troubleshoot/elasticsearch/allow-all-cluster-allocation.md b/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
index dc9cf5e381..1d203ed7cc 100644
--- a/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
+++ b/troubleshoot/elasticsearch/allow-all-cluster-allocation.md
@@ -21,9 +21,9 @@ Forgetting to re-allow all data allocations can lead to unassigned shards.
 
 In order to (re)allow all data to be allocated follow these steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to get the shards assigned we’ll need to change the value of the [configuration](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-allocation-enable) that restricts the assignemnt of the shards to allow all shards to be allocated.
 
 We’ll achieve this by inspecting the system-wide `cluster.routing.allocation.enable` [cluster setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-get-settings) and changing the configured value to `all`.
@@ -77,7 +77,7 @@ We’ll achieve this by inspecting the system-wide `cluster.routing.allocation.e
     1. The new value for the `allocation.enable` system-wide configuration is changed to allow all the shards to be allocated.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the shards assigned we’ll need to change the value of the [configuration](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-allocation-enable) that restricts the assignemnt of the shards to allow all shards to be allocated.
 
 We’ll achieve this by inspecting the system-wide `cluster.routing.allocation.enable` [cluster setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-get-settings) and changing the configured value to `all`.
diff --git a/troubleshoot/elasticsearch/allow-all-index-allocation.md b/troubleshoot/elasticsearch/allow-all-index-allocation.md
index caa2c2cac2..a2d89fc6d7 100644
--- a/troubleshoot/elasticsearch/allow-all-index-allocation.md
+++ b/troubleshoot/elasticsearch/allow-all-index-allocation.md
@@ -24,9 +24,9 @@ Forgetting to re-allow all data allocation can lead to unassigned shards.
 
 In order to (re)allow all data to be allocated follow these steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to get the shards assigned we’ll need to change the value of the [configuration](elasticsearch://reference/elasticsearch/index-settings/index-modules.md#index-routing-allocation-enable-setting) that restricts the assignemnt of the shards to `all`.
 
 **Use {{kib}}**
@@ -79,7 +79,7 @@ In order to get the shards assigned we’ll need to change the value of the [con
     1. The new value for the `allocation.enable` configuration for the `my-index-000001` index is changed to allow all the shards to be allocated.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the shards assigned we’ll need to change the value of the [configuration](elasticsearch://reference/elasticsearch/index-settings/index-modules.md#index-routing-allocation-enable-setting) that restricts the assignemnt of the shards to `all`.
 
 1. Inspect the `index.routing.allocation.enable` [index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) for the index with unassigned shards:
diff --git a/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md b/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
index b2916436ff..ac5079869b 100644
--- a/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
+++ b/troubleshoot/elasticsearch/decrease-disk-usage-data-node.md
@@ -22,9 +22,9 @@ Reducing the replicas of an index can potentially reduce search throughput and d
 ::::
 
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 **Use {{kib}}**
 
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
@@ -51,7 +51,7 @@ Reducing the replicas of an index can potentially reduce search throughput and d
 6. Continue this process until the cluster is healthy again.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to estimate how many replicas need to be removed, first you need to estimate the amount of disk space that needs to be released.
 
 1. First, retrieve the relevant disk thresholds that will indicate how much space should be released. The relevant thresholds are the [high watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-watermark-high) for all the tiers apart from the frozen one and the [frozen flood stage watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-flood-stage-frozen) for the frozen tier. The following example demonstrates disk shortage in the hot tier, so we will only retrieve the high watermark:
diff --git a/troubleshoot/elasticsearch/diagnose-unassigned-shards.md b/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
index c99bb1f0f2..1a823835b1 100644
--- a/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
+++ b/troubleshoot/elasticsearch/diagnose-unassigned-shards.md
@@ -24,9 +24,9 @@ There are multiple reasons why shards might get unassigned, ranging from misconf
 
 In order to diagnose the unassigned shards in your deployment use the following steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to diagnose the unassigned shards, follow the next steps:
 
 **Use {{kib}}**
@@ -142,7 +142,7 @@ In order to diagnose the unassigned shards, follow the next steps:
 For more guidance on fixing the most common causes for unassinged shards follow [this guide](red-yellow-cluster-status.md#fix-red-yellow-cluster-status), see [these examples](https://www.elastic.co/docs/troubleshoot/elasticsearch/cluster-allocation-api-examples), or contact [Elastic Support](https://support.elastic.co).
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to diagnose the unassigned shards follow the next steps:
 
 1. View the unassigned shards using the [cat shards API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-shards).
diff --git a/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md b/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
index b4cf270f78..857c5b6105 100644
--- a/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
+++ b/troubleshoot/elasticsearch/diagnosing-corrupted-repositories.md
@@ -17,9 +17,9 @@ products:
 
 Multiple {{es}} deployments are writing to the same snapshot repository. {{es}} doesn’t support this configuration and only one cluster is allowed to write to the same repository. See [Repository contents](../../deploy-manage/tools/snapshot-and-restore.md#snapshot-repository-contents) for potential side-effects of corruption of the repository contents, which may not be resolved by the following guide. To remedy the situation mark the repository as read-only or remove it from all the other deployments, and re-add (recreate) the repository in the current deployment:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 Fixing the corrupted repository will entail making changes in multiple deployments that write to the same snapshot repository. Only one deployment must be writing to a repository. The deployment that will keep writing to the repository will be called the "primary" deployment (the current cluster), and the other one(s) where we’ll mark the repository read-only as the "secondary" deployments.
 
 First mark the repository as read-only on the secondary deployments:
@@ -56,7 +56,7 @@ Note that we’re now configuring the primary (current) deployment.
 2. Click on the pencil icon at the right side of the repository. On the Edit page that opened scroll down and click "Save", without making any changes to the existing settings.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 Fixing the corrupted repository will entail making changes in multiple clusters that write to the same snapshot repository. Only one cluster must be writing to a repository. Let’s call the cluster we want to keep writing to the repository the "primary" cluster (the current cluster), and the other one(s) where we’ll mark the repository as read-only the "secondary" clusters.
 
 Let’s first work on the secondary clusters:
diff --git a/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md b/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
index 59cae1613b..b4e4efcdd3 100644
--- a/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
+++ b/troubleshoot/elasticsearch/fix-master-node-out-of-disk.md
@@ -19,9 +19,9 @@ products:
 
 {{es}} is using master nodes to coordinate the cluster. If the master or any master eligible nodes are running out of space, you need to ensure that they have enough disk space to function. If the [health API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-health-report) reports that your master node is out of space you need to increase the disk capacity of your master nodes.
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Hosted deployments** panel, click the gear under the `Manage deployment` column that corresponds to the name of your deployment.
 3. Go to `Actions > Edit deployment` and then go to the `Master instances` section:
@@ -34,7 +34,7 @@ products:
 4. Choose a larger than the pre-selected capacity configuration from the drop-down menu and click `save`. Wait for the plan to be applied and the problem should be resolved.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to increase the disk capacity of a master node, you will need to replace **all** the master nodes with master nodes of higher disk capacity.
 
 1. First, retrieve the disk threshold that will indicate how much disk space is needed. The relevant threshold is the [high watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-watermark-high) and can be retrieved via the following command:
diff --git a/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md b/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
index 6e872c0355..261f2e9a51 100644
--- a/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
+++ b/troubleshoot/elasticsearch/fix-other-node-out-of-disk.md
@@ -19,9 +19,9 @@ products:
 
 {{es}} can use dedicated nodes to execute other functions apart from storing data or coordinating the cluster, for example machine learning. If one or more of these nodes are running out of space, you need to ensure that they have enough disk space to function. If the [health API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-health-report) reports that a node that is not a master and does not contain data is out of space you need to increase the disk capacity of this node.
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Hosted deployments** panel, click the gear under the `Manage deployment` column that corresponds to the name of your deployment.
 3. Go to `Actions > Edit deployment` and then go to the `Coordinating instances` or the `Machine Learning instances` section depending on the roles listed in the diagnosis:
@@ -34,7 +34,7 @@ products:
 4. Choose a larger than the pre-selected capacity configuration from the drop-down menu and click `save`. Wait for the plan to be applied and the problem should be resolved.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to increase the disk capacity of any other node, you will need to replace the instance that has run out of space with one of higher disk capacity.
 
 1. First, retrieve the disk threshold that will indicate how much disk space is needed. The relevant threshold is the [high watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-watermark-high) and can be retrieved via the following command:
diff --git a/troubleshoot/elasticsearch/high-cpu-usage.md b/troubleshoot/elasticsearch/high-cpu-usage.md
index e239dc1bde..8ce5cd0c7a 100644
--- a/troubleshoot/elasticsearch/high-cpu-usage.md
+++ b/troubleshoot/elasticsearch/high-cpu-usage.md
@@ -38,9 +38,9 @@ The response’s `cpu` column contains the current CPU usage as a percentage. Th
 
 To track CPU usage over time, we recommend enabling monitoring:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 * (Recommended) Enable [logs and metrics](../../deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md). When logs and metrics are enabled, monitoring information is visible on {{kib}}'s [Stack Monitoring](../../deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md) page.
 
     You can also enable the [CPU usage threshold alert](../../deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md) to be notified about potential issues through email.
@@ -54,7 +54,7 @@ To track CPU usage over time, we recommend enabling monitoring:
 {{ech}} grants [CPU credits](/deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md) per deployment to provide smaller clusters with performance boosts when needed. High CPU usage can deplete these credits, which might lead to [performance degradation](../monitoring/performance.md) and [increased cluster response times](../monitoring/cluster-response-time.md).
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 * Enable [{{es}} monitoring](../../deploy-manage/monitor/stack-monitoring.md). When logs and metrics are enabled, monitoring information is visible on {{kib}}'s [Stack Monitoring](../../deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md) page.
 
     You can also enable the [CPU usage threshold alert](../../deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md) to be notified about potential issues through email.
diff --git a/troubleshoot/elasticsearch/high-jvm-memory-pressure.md b/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
index 3ae4043deb..dde5b434a1 100644
--- a/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
+++ b/troubleshoot/elasticsearch/high-jvm-memory-pressure.md
@@ -25,9 +25,9 @@ High JVM memory usage can degrade cluster performance and trigger [circuit break
 
 **Check JVM memory pressure**
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 From your deployment menu, click **Elasticsearch**. Under **Instances**, each instance displays a **JVM memory pressure** indicator. When the JVM memory pressure reaches 75%, the indicator turns red.
 
 You can also use the [nodes stats API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-stats) to calculate the current JVM memory pressure for each node.
@@ -41,7 +41,7 @@ Use the response to calculate memory pressure as follows:
 JVM Memory Pressure = `used_in_bytes` / `max_in_bytes`
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 To calculate the current JVM memory pressure for each node, use the [nodes stats API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-stats).
 
 ```console
diff --git a/troubleshoot/elasticsearch/increase-capacity-data-node.md b/troubleshoot/elasticsearch/increase-capacity-data-node.md
index 787f3b77f0..a2623314f9 100644
--- a/troubleshoot/elasticsearch/increase-capacity-data-node.md
+++ b/troubleshoot/elasticsearch/increase-capacity-data-node.md
@@ -15,9 +15,9 @@ products:
 
 # Increase the disk capacity of data nodes [increase-capacity-data-node]
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to increase the disk capacity of the data nodes in your cluster:
 
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
@@ -53,7 +53,7 @@ In order to increase the disk capacity of the data nodes in your cluster:
     If you are seeing the banner click `Update autoscaling settings` to go to the `Edit` page. Otherwise, you are already in the `Edit` page, click `Edit settings` to increase the autoscaling limits. After you perform the change click `save` at the bottom of the page.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to increase the data node capacity in your cluster, you will need to calculate the amount of extra disk space needed.
 
 1. First, retrieve the relevant disk thresholds that will indicate how much space should be available. The relevant thresholds are the [high watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-watermark-high) for all the tiers apart from the frozen one and the [frozen flood stage watermark](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#cluster-routing-flood-stage-frozen) for the frozen tier. The following example demonstrates disk shortage in the hot tier, so we will only retrieve the high watermark:
diff --git a/troubleshoot/elasticsearch/increase-cluster-shard-limit.md b/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
index 2bad9edb46..b453e53efa 100644
--- a/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
+++ b/troubleshoot/elasticsearch/increase-cluster-shard-limit.md
@@ -23,9 +23,9 @@ You might want to influence this data distribution by configuring the [`cluster.
 
 To fix this issue, complete the following steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to get the shards assigned we’ll need to increase the number of shards that can be collocated on a node in the cluster. We’ll achieve this by inspecting the system-wide `cluster.routing.allocation.total_shards_per_node` [cluster setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-get-settings) and increasing the configured value.
 
 **Use {{kib}}**
@@ -77,7 +77,7 @@ In order to get the shards assigned we’ll need to increase the number of shard
     1. The new value for the system-wide `total_shards_per_node` configuration is increased from the previous value of `300` to `400`. The `total_shards_per_node` configuration can also be set to `null`, which represents no upper bound with regards to how many shards can be collocated on one node in the system.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the shards assigned you can add more nodes to your {{es}} cluster and assign the index’s target tier [node role](../../manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md#assign-data-tier) to the new nodes.
 
 To inspect which tier is an index targeting for assignment, use the [get index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) API to retrieve the configured value for the `index.routing.allocation.include._tier_preference` setting:
diff --git a/troubleshoot/elasticsearch/increase-shard-limit.md b/troubleshoot/elasticsearch/increase-shard-limit.md
index 99f9c27b23..3be025e9ba 100644
--- a/troubleshoot/elasticsearch/increase-shard-limit.md
+++ b/troubleshoot/elasticsearch/increase-shard-limit.md
@@ -23,9 +23,9 @@ You might want to influence this data distribution by configuring the [index.rou
 
 To fix this issue, complete the following steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to get the shards assigned we’ll need to increase the number of shards that can be collocated on a node. We’ll achieve this by inspecting the configuration for the `index.routing.allocation.total_shards_per_node` [index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) and increasing the configured value for the indices that have shards unassigned.
 
 **Use {{kib}}**
@@ -78,7 +78,7 @@ In order to get the shards assigned we’ll need to increase the number of shard
     1. The new value for the `total_shards_per_node` configuration for the `my-index-000001` index is increased from the previous value of `1` to `2`. The `total_shards_per_node` configuration can also be set to `-1`, which represents no upper bound with regards to how many shards of the same index can reside on one node.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the shards assigned you can add more nodes to your {{es}} cluster and assing the index’s target tier [node role](../../manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md#assign-data-tier) to the new nodes.
 
 To inspect which tier is an index targeting for assignment, use the [get index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) API to retrieve the configured value for the `index.routing.allocation.include._tier_preference` setting:
diff --git a/troubleshoot/elasticsearch/increase-tier-capacity.md b/troubleshoot/elasticsearch/increase-tier-capacity.md
index a3492763e3..bc1eccd103 100644
--- a/troubleshoot/elasticsearch/increase-tier-capacity.md
+++ b/troubleshoot/elasticsearch/increase-tier-capacity.md
@@ -21,9 +21,9 @@ If a warning is encountered with not enough nodes to allocate all shard replicas
 
 To accomplish this, complete the following steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 One way to get the replica shards assigned is to add an availability zone. This will increase the number of data nodes in the {{es}} cluster so that the replica shards can be assigned. This can be done by editing your deployment. But first you need to discover which tier an index is targeting for assignment. Do this using {{kib}}.
 
 **Use {{kib}}**
@@ -135,7 +135,7 @@ If it is not possible to increase the size per zone or the number of availabilit
     1. The new value for the `index.number_of_replicas` index configuration is decreased from the previous value of `2` to `1`. It can be set as low as 0 but configuring it to 0 for indices other than [searchable snapshot indices](../../deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md) may lead to temporary availability loss during node restarts or permanent data loss in case of data corruption.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to get the replica shards assigned you can add more nodes to your {{es}} cluster and assign the index’s target tier [node role](../../manage-data/lifecycle/index-lifecycle-management/migrate-index-allocation-filters-to-node-roles.md#assign-data-tier) to the new nodes.
 
 To inspect which tier an index is targeting for assignment, use the [get index setting](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings) API to retrieve the configured value for the `index.routing.allocation.include._tier_preference` setting:
diff --git a/troubleshoot/elasticsearch/repeated-snapshot-failures.md b/troubleshoot/elasticsearch/repeated-snapshot-failures.md
index 7033bb23d7..57280e04c2 100644
--- a/troubleshoot/elasticsearch/repeated-snapshot-failures.md
+++ b/troubleshoot/elasticsearch/repeated-snapshot-failures.md
@@ -21,9 +21,9 @@ Elasticsearch keeps track of the number of repeated failures when executing auto
 
 In the event that an automated {{slm}} policy execution is experiencing repeated failures, follow these steps to get more information about the problem:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to check the status of failing {{slm}} policies we need to go to Kibana and retrieve the [Snapshot Lifecycle Policy information](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-get-lifecycle).
 
 **Use {{kib}}**
@@ -108,7 +108,7 @@ One common failure scenario is repository corruption. This occurs most often whe
 In the event that snapshots are failing for other reasons check the logs on the elected master node during the snapshot execution period for more information.
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 [Retrieve](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-get-lifecycle) the {{slm}} policy:
 
 ```console
diff --git a/troubleshoot/elasticsearch/restore-from-snapshot.md b/troubleshoot/elasticsearch/restore-from-snapshot.md
index 4f0e6f32f0..1c5669514b 100644
--- a/troubleshoot/elasticsearch/restore-from-snapshot.md
+++ b/troubleshoot/elasticsearch/restore-from-snapshot.md
@@ -21,9 +21,9 @@ Restoring the missing data requires you to have a backup of the affected indices
 ::::
 
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 In order to restore the indices and data streams that are missing data:
 
 **Use {{kib}}**
@@ -227,7 +227,7 @@ In order to restore the indices and data streams that are missing data:
 For more guidance on creating and restoring snapshots see [this guide](../../deploy-manage/tools/snapshot-and-restore.md).
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 In order to restore the indices that are missing shards:
 
 1. View the affected indices using the [cat indices API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-indices).
diff --git a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
index fd4b687902..fc9806b77f 100644
--- a/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
+++ b/troubleshoot/elasticsearch/troubleshoot-migrate-to-tiers.md
@@ -23,9 +23,9 @@ This could lead to unassigned shards or shards not transitioning to the desired
 
 In order to fix this follow the next steps:
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 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.
 
 **Use {{kib}}**
@@ -112,7 +112,7 @@ In order to get the shards assigned we need to call the [migrate to data tiers r
     ```
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 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.
diff --git a/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md b/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
index 89208fac80..10de8346d4 100644
--- a/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
+++ b/troubleshoot/elasticsearch/troubleshooting-shards-capacity-issues.md
@@ -29,9 +29,9 @@ This symptom indicates that action should be taken, otherwise, either the creati
 
 If you’re confident your changes won’t destabilize the cluster, you can temporarily increase the limit using the [cluster update settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings):
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 **Use {{kib}}**
 
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
@@ -139,7 +139,7 @@ If you’re confident your changes won’t destabilize the cluster, you can temp
     ```
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 Check the current status of the cluster according the shards capacity indicator:
 
 ```console
@@ -239,9 +239,9 @@ This symptom indicates that action should be taken, otherwise, either the creati
 
 If you’re confident your changes won’t destabilize the cluster, you can temporarily increase the limit using the [cluster update settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings):
 
-:::::::{tab-set}
+:::::::{applies-switch}
 
-::::::{tab-item} {{ech}}
+::::::{applies-item} ess:
 **Use {{kib}}**
 
 1. Log in to the [{{ecloud}} console](https://cloud.elastic.co?page=docs&placement=docs-body).
@@ -348,7 +348,7 @@ If you’re confident your changes won’t destabilize the cluster, you can temp
     ```
 ::::::
 
-::::::{tab-item} Self-managed
+::::::{applies-item} self:
 Check the current status of the cluster according the shards capacity indicator:
 
 ```console
diff --git a/troubleshoot/observability/apm/apm-server-response-codes.md b/troubleshoot/observability/apm/apm-server-response-codes.md
index b888df4faf..38b83c518f 100644
--- a/troubleshoot/observability/apm/apm-server-response-codes.md
+++ b/troubleshoot/observability/apm/apm-server-response-codes.md
@@ -14,13 +14,13 @@ products:
 
 ## HTTP 400: Data decoding error / Data validation error [apm-bad-request]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{stack}}
+:::{applies-item} stack:
 The most likely cause for this error is using incompatible versions of {{apm-agent}} and APM Server. See the [agent/server compatibility matrix](/solutions/observability/apm/apm-agent-compatibility.md) to verify compatibility.
 :::
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 The most likely cause for this error is using an incompatible version of an {{apm-agent}}. See [minimum supported APM agent versions](/solutions/observability/apm/apm-agents/index.md#observability-apm-agents-elastic-apm-agents-minimum-supported-versions) to verify compatibility.
 :::
 
@@ -29,13 +29,13 @@ The most likely cause for this error is using an incompatible version of an {{ap
 
 ## HTTP 400: Event too large [apm-event-too-large]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{stack}}
+:::{applies-item} stack:
 APM agents communicate with the APM server by sending events in an HTTP request. Each event is sent as its own line in the HTTP request body. If events are too large, you should consider increasing the [Max event size](/solutions/observability/apm/apm-server/general-configuration-options.md#apm-max_event_size) setting in the APM integration, and adjusting relevant settings in the agent.
 :::
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 APM agents communicate with the Managed intake service by sending events in an HTTP request. Each event is sent as its own line in the HTTP request body. If events are too large, you can reduce the size of the events that your APM agents send by: [enabling span compression](/solutions/observability/apm/spans.md) or [reducing collected stack trace information](/solutions/observability/apm/reduce-storage.md#observability-apm-reduce-stacktrace).
 :::
 
@@ -44,13 +44,13 @@ APM agents communicate with the Managed intake service by sending events in an H
 
 ## HTTP 401: Invalid token [apm-unauthorized]
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{stack}}
+:::{applies-item} stack:
 Either the [Secret token](/solutions/observability/apm/secret-token.md) in the request header doesn’t match the secret token configured in the APM integration, or the [API keys](/solutions/observability/apm/api-keys.md) is invalid.
 :::
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 The API key is invalid.
 :::
 
diff --git a/troubleshoot/observability/troubleshoot-logs.md b/troubleshoot/observability/troubleshoot-logs.md
index f55f7fd7c3..6557baaec4 100644
--- a/troubleshoot/observability/troubleshoot-logs.md
+++ b/troubleshoot/observability/troubleshoot-logs.md
@@ -27,9 +27,9 @@ This section provides possible solutions for errors you might encounter while on
 
 ### User does not have permissions to create API key [logs-troubleshooting-insufficient-priv]
 
-:::::{tab-set}
+:::::{applies-switch}
 
-::::{tab-item} {{serverless-short}}
+::::{applies-item} serverless:
 When adding a new data using the guided instructions in your project (**Add data** → **Collect and analyze logs** → **Stream log files**), if you don’t have the required privileges to create an API key, you’ll see the following error message:
 
 :::{note}
@@ -45,7 +45,7 @@ You need to either:
 * Get an API key from an administrator and manually add the API to the {{agent}} configuration. See [Configure the {{agent}}](/solutions/observability/logs/stream-any-log-file.md#logs-stream-agent-config) for more on manually updating the configuration and adding the API key.
 ::::
 
-::::{tab-item} {{stack}}
+::::{applies-item} stack:
 If you don’t have the required privileges to create an API key, you’ll see the following error message:
 
 ```plaintext
diff --git a/troubleshoot/observability/troubleshooting-synthetics.md b/troubleshoot/observability/troubleshooting-synthetics.md
index 838cfc3042..99425f0755 100644
--- a/troubleshoot/observability/troubleshooting-synthetics.md
+++ b/troubleshoot/observability/troubleshooting-synthetics.md
@@ -54,15 +54,15 @@ If you attempt to assign an agent policy to a {{private-location}} *before* conf
 
 When creating a {{private-location}}, you have to:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 1. [Set up {{agent}}](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-fleet-agent).
 2. [Connect {{fleet}} to your Observability project](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-connect) and enroll an {{agent}} in {{fleet}}.
 3. [Add a {{private-location}}](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-add) in the Synthetics UI.
 :::
 
-:::{tab-item} {{stack}}
+:::{applies-item} stack:
 1. [Set up {{fleet-server}} and {{agent}}](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-fleet-agent).
 2. [Connect {{fleet}} to the {{stack}}](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-connect) and enroll an {{agent}} in {{fleet}}.
 3. [Add a {{private-location}}](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-add) in the {{synthetics-app}}.
@@ -118,15 +118,15 @@ When using {{ecloud}}, if there are no options available in the *Locations* drop
 
 There are a few ways to fix this:
 
-::::{tab-set}
+::::{applies-switch}
 
-:::{tab-item} {{serverless-short}}
+:::{applies-item} serverless:
 * If you have [Editor](/solutions/observability/synthetics/grant-access-to-secured-resources.md) access, you can [create a new Private Location](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#monitor-via-private-agent). Then try creating the monitor again.
 * If you do *not* have the right privileges to create a Private Location, you can ask an [Admin](/solutions/observability/synthetics/grant-access-to-secured-resources.md) to create a Private Location or give you the necessary privileges so you can [create a new Private Location](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#monitor-via-private-agent). Then try creating the monitor again.
 
 :::
 
-:::{tab-item} {{stack}}
+:::{applies-item} stack:
 * If you have [write access](/solutions/observability/synthetics/writer-role.md) including the privileges for [creating new Private Locations](/solutions/observability/synthetics/writer-role.md#synthetics-role-write-private-locations), you can [create a new Private Location](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#monitor-via-private-agent). Then try creating the monitor again.
 * If you do *not* have the right privileges to create a Private Location, you can ask someone with the [necessary privileges](/solutions/observability/synthetics/writer-role.md#synthetics-role-write-private-locations) to create a Private Location or ask an administrator with a [setup role](/solutions/observability/synthetics/setup-role.md) to give you the necessary privileges and [create a new Private Location](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#monitor-via-private-agent). Then try creating the monitor again.
 * If you want to create a monitor to run on Elastic’s global managed infrastructure, ask an administrator with a [setup role](/solutions/observability/synthetics/setup-role.md) to update [`Synthetics and Uptime` sub-feature privileges](/solutions/observability/synthetics/writer-role.md#disable-managed-locations) for the role you’re currently assigned. Then try creating the monitor again.

From cbde482877d78aeb6c4f66624c7495695fb48515 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 15:35:08 +0100
Subject: [PATCH 2/7] typo

---
 deploy-manage/security/secure-settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy-manage/security/secure-settings.md b/deploy-manage/security/secure-settings.md
index fa0672d732..0ce0b21105 100644
--- a/deploy-manage/security/secure-settings.md
+++ b/deploy-manage/security/secure-settings.md
@@ -61,7 +61,7 @@ The instructions below cover how to manage {{es}} keystore settings for each dep
 
 :::::{applies-switch}
 
-::::{applies-item} { "ess":, "ece"}
+::::{applies-item} { "ess":, "ece":}
 
 % ### ECE and ECH
 You can manage {{es}} secure settings in the **Security > {{es}} keystore** section of your deployment page in the {{ecloud}} Console or ECE Cloud UI.

From c9689e7dcee3f25c1205b92f2db6dd2420832ac4 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 18:24:13 +0100
Subject: [PATCH 3/7] fixes

---
 .../users-roles/cluster-or-deployment-auth/kerberos.md          | 2 +-
 solutions/observability/get-started/logs-essentials.md          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 75b6904ab4..cd06622421 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
@@ -164,7 +164,7 @@ For detailed information of available realm settings, see [Kerberos realm settin
 4. Restart {{es}}.
 ::::
 
-::::{applies-item} { "ech":, "ece":}
+::::{applies-item} { "ess":, "ece":}
 
 1. Create a [custom bundle](elasticsearch://reference/elasticsearch-plugins/plugin-management.md) that contains your `krb5.conf` and `keytab` files, and add it to your cluster.
 
diff --git a/solutions/observability/get-started/logs-essentials.md b/solutions/observability/get-started/logs-essentials.md
index 4562e58c9d..9d0238213a 100644
--- a/solutions/observability/get-started/logs-essentials.md
+++ b/solutions/observability/get-started/logs-essentials.md
@@ -42,7 +42,7 @@ The **Admin** role or higher is required to create projects. Refer to [Assign us
 
 1. Select **Create serverless project**. It takes a few minutes to create your project.
 1. When the project is ready, click **Continue**.
-
+::::
 ::::::
 
 ::::::{step} Collect infrastructure logs

From d435b94aa60cb6e06496a15789435dcba45c36c2 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 18:37:10 +0100
Subject: [PATCH 4/7] simplify

---
 deploy-manage/autoscaling/trained-model-autoscaling.md    | 8 ++++----
 .../monitor/stack-monitoring/kibana-monitoring-data.md    | 4 ++--
 deploy-manage/security/secure-cluster-communications.md   | 4 ++--
 deploy-manage/security/secure-settings.md                 | 2 +-
 deploy-manage/stack-settings.md                           | 2 +-
 .../users-roles/cluster-or-deployment-auth/kerberos.md    | 2 +-
 reference/fleet/elastic-agent-container.md                | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deploy-manage/autoscaling/trained-model-autoscaling.md b/deploy-manage/autoscaling/trained-model-autoscaling.md
index 8a4a8eb6e2..80e685f6b6 100644
--- a/deploy-manage/autoscaling/trained-model-autoscaling.md
+++ b/deploy-manage/autoscaling/trained-model-autoscaling.md
@@ -116,7 +116,7 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 ::::{applies-switch}
 
-:::{applies-item} { "ess":, "ece": }
+:::{applies-item} { ess:, ece: }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -144,7 +144,7 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
 
 ::::{applies-switch}
 
-:::{applies-item} { "ess":, "ece": }
+:::{applies-item} { ess:, ece: }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -166,7 +166,7 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 ::::{applies-switch}
 
-:::{applies-item} { "ess":, "ece": }
+:::{applies-item} { ess:, ece: }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
@@ -194,7 +194,7 @@ In case of search-optimized deployments, we maximize the number of threads. The
 
 ::::{applies-switch}
 
-:::{applies-item} { "ess":, "ece": }
+:::{applies-item} { ess:, ece: }
 
 | Level | Allocations | Threads | vCPUs |
 | --- | --- | --- | --- |
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
index d5cb391170..c31edda0b2 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
@@ -63,7 +63,7 @@ deployment:
 ## View monitoring data in {{kib}} [view-monitoring-data-in-kibana]
 
 :::::{applies-switch}
-::::{applies-item} { "eck":, "self": }
+::::{applies-item} { eck:, self: }
 
 1. Open the {{kib}} monitoring instance in your web browser.
 
@@ -79,7 +79,7 @@ deployment:
 If you are using a separate monitoring cluster, you do not need to turn on data collection. The dashboards appear when there is data in the monitoring cluster.
 :::
 ::::
-::::{applies-item} { "ess":, "ece": }
+::::{applies-item} { ess:, ece: }
 :::{include} /deploy-manage/monitor/stack-monitoring/_snippets/cloud-monitoring-access.md
 :::
 ::::
diff --git a/deploy-manage/security/secure-cluster-communications.md b/deploy-manage/security/secure-cluster-communications.md
index 72cabfa671..a82e29d6fd 100644
--- a/deploy-manage/security/secure-cluster-communications.md
+++ b/deploy-manage/security/secure-cluster-communications.md
@@ -61,7 +61,7 @@ The way that transport layer security is managed depends on your deployment type
 
 :::::{applies-switch}
 
-::::{applies-item} { "serverless":, "ess": }
+::::{applies-item} { serverless:, ess: }
 
 {{es}} transport security is fully managed by Elastic, and no configuration is required.
 ::::
@@ -104,7 +104,7 @@ The way that HTTP layer security is managed depends on your deployment type:
 
 :::::{applies-switch}
 
-::::{applies-item} { "serverless":, "ess": }
+::::{applies-item} { serverless:, ess: }
 
 HTTP TLS for {{es}} and {{kib}} is fully managed by Elastic. No configuration is required.
 {{kib}} instances are automatically configured to connect securely to {{es}}, without requiring manual setup.
diff --git a/deploy-manage/security/secure-settings.md b/deploy-manage/security/secure-settings.md
index 0ce0b21105..3bcb4dae71 100644
--- a/deploy-manage/security/secure-settings.md
+++ b/deploy-manage/security/secure-settings.md
@@ -61,7 +61,7 @@ The instructions below cover how to manage {{es}} keystore settings for each dep
 
 :::::{applies-switch}
 
-::::{applies-item} { "ess":, "ece":}
+::::{applies-item} { ess:, ece: }
 
 % ### ECE and ECH
 You can manage {{es}} secure settings in the **Security > {{es}} keystore** section of your deployment page in the {{ecloud}} Console or ECE Cloud UI.
diff --git a/deploy-manage/stack-settings.md b/deploy-manage/stack-settings.md
index 7b2dd50d1c..dd427ed437 100644
--- a/deploy-manage/stack-settings.md
+++ b/deploy-manage/stack-settings.md
@@ -65,7 +65,7 @@ The way that you configure your {{stack}} settings is determined by your deploym
 
 :::::{applies-switch}
 
-::::{applies-item} { "ess":,"ece": }
+::::{applies-item} { ess:, ece: }
 
 For {{ech}} and {{ece}} deployments, you edit {{stack}} settings through the {{ecloud}} Console or ECE Cloud UI. These settings are internally mapped to the appropriate YAML configuration files, such as `elasticsearch.yml` and `kibana.yml`, and they affect all users of that cluster.
 
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 cd06622421..62053219d0 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md
@@ -164,7 +164,7 @@ For detailed information of available realm settings, see [Kerberos realm settin
 4. Restart {{es}}.
 ::::
 
-::::{applies-item} { "ess":, "ece":}
+::::{applies-item} { ess:, ece: }
 
 1. Create a [custom bundle](elasticsearch://reference/elasticsearch-plugins/plugin-management.md) that contains your `krb5.conf` and `keytab` files, and add it to your cluster.
 
diff --git a/reference/fleet/elastic-agent-container.md b/reference/fleet/elastic-agent-container.md
index ac3b554b21..8406cfa6fd 100644
--- a/reference/fleet/elastic-agent-container.md
+++ b/reference/fleet/elastic-agent-container.md
@@ -129,7 +129,7 @@ docker run --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}}
 
 ::::{applies-switch}
 
-:::{applies-item} { "serverless":, "ess": }
+:::{applies-item} { serverless:, ess: }
 
 ```terminal subs=true
 docker run \

From 95af9b4f0de390f3ed91de003e2ab7d540436553 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 18:44:32 +0100
Subject: [PATCH 5/7] fix

---
 .../users-roles/cluster-or-deployment-auth/file-based.md      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f0c8b60b6e..98581d8cce 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
@@ -103,11 +103,11 @@ You can edit files and secrets that contain `users` and `users_roles` manually,
 
 ::::{applies-switch}
 
-:::{tab-item} self:
+:::{applies-item} self:
 In a self-managed cluster, you can edit the contents of `ES_PATH_CONF/users` and `ES_PATH_CONF/users_roles` directly.
 :::
 
-:::{tab-item} eck:
+:::{applies-item} eck:
 You can pass `users` and `user_roles` files to {{eck}} using a file realm secret:
 
 ```yaml subs=true

From 3837b66bd13b96ec9bd418e27d2ec2938006a22c Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 18:52:55 +0100
Subject: [PATCH 6/7] the right fixes

---
 deploy-manage/security/secure-cluster-communications.md | 2 +-
 deploy-manage/security/secure-settings.md               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy-manage/security/secure-cluster-communications.md b/deploy-manage/security/secure-cluster-communications.md
index a82e29d6fd..b87fae2b3d 100644
--- a/deploy-manage/security/secure-cluster-communications.md
+++ b/deploy-manage/security/secure-cluster-communications.md
@@ -150,7 +150,7 @@ Managing certificates is critical for secure communications. Certificates have l
 
 ::::{applies-switch}
 
-:::{applies-item} { "serverless":, "ess": }
+:::{applies-item} { serverless:, ess: }
 
 Certificate lifecycle is fully managed by Elastic, including renewal and rotation.
 :::
diff --git a/deploy-manage/security/secure-settings.md b/deploy-manage/security/secure-settings.md
index 3bcb4dae71..fcfdc1cfd1 100644
--- a/deploy-manage/security/secure-settings.md
+++ b/deploy-manage/security/secure-settings.md
@@ -118,7 +118,7 @@ In ECK, the operator simplifies secure settings configuration by relying on Kube
 Refer to [Configure secure settings on ECK](./k8s-secure-settings.md) for details and examples.
 ::::
 
-::::{applies-item} self
+::::{applies-item} self:
 
 % ### Self-managed
 In self-managed deployments, you're responsible for configuring and maintaining the {{es}} keystore on each node individually.

From 80a0851b6c99eddde62e3efae775fb0906803205 Mon Sep 17 00:00:00 2001
From: Florent Le Borgne <florent.leborgne@elastic.co>
Date: Fri, 19 Dec 2025 18:56:10 +0100
Subject: [PATCH 7/7] another missed one

---
 deploy-manage/deploy/elastic-cloud/tools-apis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy-manage/deploy/elastic-cloud/tools-apis.md b/deploy-manage/deploy/elastic-cloud/tools-apis.md
index 52c56ccad4..cc296c6704 100644
--- a/deploy-manage/deploy/elastic-cloud/tools-apis.md
+++ b/deploy-manage/deploy/elastic-cloud/tools-apis.md
@@ -58,7 +58,7 @@ The following APIs are available for {{es-serverless}} users:
 - [{{kib}} {{serverless-short}} APIs](https://www.elastic.co/docs/api/doc/serverless): Use these APIs to manage resources such as connectors, data views, and saved objects for your {{serverless-full}} project.
 ::::
 
-::::{applies-item} ech:
+::::{applies-item} ess:
 
 The following APIs are available for {{ech}} users: