From a6e6a9a0debeef6d650e564005ef3d2d26c658a5 Mon Sep 17 00:00:00 2001
From: shainaraskas <shaina.raskas@elastic.co>
Date: Mon, 15 Sep 2025 11:59:08 -0400
Subject: [PATCH 1/2] h1 changes, xref cleanup for the h1s

---
 deploy-manage/api-keys.md                             |  3 ++-
 deploy-manage/deploy/cloud-enterprise.md              |  2 +-
 .../deploy/cloud-enterprise/deploy-an-orchestrator.md |  3 ++-
 .../ece-regional-deployment-aliases.md                |  3 ++-
 .../switch-from-apm-to-integrations-server-payload.md |  3 ++-
 .../deploy/cloud-on-k8s/configure-deployments.md      |  2 +-
 .../deploy/cloud-on-k8s/deploy-an-orchestrator.md     |  3 ++-
 deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md |  2 +-
 .../deploy/cloud-on-k8s/quickstart-logstash.md        |  2 +-
 .../deploy/cloud-on-k8s/quickstart-standalone.md      |  2 +-
 .../deploy/cloud-on-k8s/troubleshooting-beats.md      |  3 ++-
 .../deploy/cloud-on-k8s/update-strategy-logstash.md   |  3 ++-
 deploy-manage/deploy/cloud-on-k8s/update-strategy.md  |  3 ++-
 .../use-an-elasticsearch-cluster-managed-by-eck.md    |  4 ++--
 deploy-manage/deploy/cloud-on-k8s/virtual-memory.md   |  2 +-
 .../deploy/elastic-cloud/custom-endpoint-aliases.md   | 11 ++---------
 .../switch-from-apm-to-integrations-server-payload.md |  3 ++-
 deploy-manage/kibana-reporting-configuration.md       |  2 +-
 .../monitoring-data/monitor-troubleshooting.md        |  2 +-
 .../stack-monitoring/kibana-monitoring-data.md        |  4 ++--
 .../snapshot-and-restore/ec-aws-custom-repository.md  |  3 ++-
 .../snapshot-and-restore/ec-azure-snapshotting.md     |  5 +++--
 .../tools/snapshot-and-restore/ec-gcs-snapshotting.md |  3 ++-
 .../snapshot-and-restore/ece-aws-custom-repository.md |  2 +-
 .../google-cloud-storage-gcs-repository.md            |  5 +++--
 .../repository-isolation-on-aws-gcp.md                |  1 +
 .../repository-isolation-on-azure.md                  |  1 +
 deploy-manage/upgrade.md                              |  3 ++-
 .../cluster-or-deployment-auth/built-in-roles.md      |  2 +-
 .../managed-credentials-eck.md                        |  2 +-
 .../data-store/data-streams/set-up-data-stream.md     |  2 +-
 ...se-use-elasticsearch-to-manage-time-series-data.md |  6 +++---
 reference/fleet/data-streams.md                       |  3 ++-
 .../elastic-observability/breaking-changes.md         |  2 +-
 release-notes/elastic-observability/deprecations.md   |  2 +-
 release-notes/elastic-security/breaking-changes.md    |  2 +-
 release-notes/intro/index.md                          |  2 +-
 solutions/observability/apm/data-streams.md           |  3 ++-
 .../observability/apm/index-lifecycle-management.md   |  3 ++-
 solutions/security/cloud/get-started-with-kspm.md     |  2 +-
 .../elasticsearch/security/security-trb-roles.md      |  2 +-
 41 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/deploy-manage/api-keys.md b/deploy-manage/api-keys.md
index 8ec5242ff2..ed5f89245f 100644
--- a/deploy-manage/api-keys.md
+++ b/deploy-manage/api-keys.md
@@ -6,9 +6,10 @@ applies_to:
     ece: ga
     self: ga
   serverless: ga
+navigation_title: API keys
 ---
 
-# API keys
+# Elastic API keys
 
 API keys are security mechanisms used to authenticate and authorize access to your deployments and {{es}} resources. 
 
diff --git a/deploy-manage/deploy/cloud-enterprise.md b/deploy-manage/deploy/cloud-enterprise.md
index 2053632481..59c2211dc0 100644
--- a/deploy-manage/deploy/cloud-enterprise.md
+++ b/deploy-manage/deploy/cloud-enterprise.md
@@ -44,7 +44,7 @@ In ECE, a deployment is a managed {{stack}} environment that provides users with
 
 The section covers the following tasks:
 
-* [Deploy ECE orchestrator](./cloud-enterprise/deploy-an-orchestrator.md)
+* [Deploy an ECE orchestrator](./cloud-enterprise/deploy-an-orchestrator.md)
     - [Prepare the environment](./cloud-enterprise/prepare-environment.md)
     - [Install ECE](./cloud-enterprise/install.md)
     - [Air gapped installations](./cloud-enterprise/air-gapped-install.md)
diff --git a/deploy-manage/deploy/cloud-enterprise/deploy-an-orchestrator.md b/deploy-manage/deploy/cloud-enterprise/deploy-an-orchestrator.md
index 0829c2c44d..3acb35e903 100644
--- a/deploy-manage/deploy/cloud-enterprise/deploy-an-orchestrator.md
+++ b/deploy-manage/deploy/cloud-enterprise/deploy-an-orchestrator.md
@@ -2,8 +2,9 @@
 applies_to:
   deployment:
     ece: all
+navigation_title: Deploy an orchestrator
 ---
-# Deploy an orchestrator
+# Deploy an {{ece}} orchestrator
 
 {{ece}} (ECE) provides a centralized platform that allows organizations to run {{es}}, {{kib}}, and other {{stack}} components across multiple machines, whether in a private or public cloud, virtual machines, or your own premises.
 
diff --git a/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md b/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
index 850899c125..af2d2c3745 100644
--- a/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
+++ b/deploy-manage/deploy/cloud-enterprise/ece-regional-deployment-aliases.md
@@ -6,9 +6,10 @@ applies_to:
     ece: all
 products:
   - id: cloud-enterprise
+navigation_title: Custom endpoint aliases
 ---
 
-# Custom endpoint aliases [ece-regional-deployment-aliases]
+# Configure custom endpoint aliases on {{ece}} [ece-regional-deployment-aliases]
 
 Custom aliases for your deployment endpoints on {{ece}} allow you to have predictable, human-readable URLs that can be shared easily.
 
diff --git a/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md b/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
index 555d056c6c..81a2e02e7f 100644
--- a/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
+++ b/deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md
@@ -6,9 +6,10 @@ applies_to:
     ece: all
 products:
   - id: cloud-enterprise
+navigation_title: Switch from APM to Integrations Server
 ---
 
-# Switch from APM to Integrations Server payload [ece-integrations-server-apm-switch]
+# Switch from APM to Integrations Server payload on {{ece}} [ece-integrations-server-apm-switch]
 
 This example shows how to use the {{ece}} RESTful API to switch from using the legacy [APM & Fleet Server](https://www.elastic.co/guide/en/cloud-enterprise/3.8/ece-manage-apm-and-fleet.html) to [Integrations Server](manage-integrations-server.md).
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md b/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
index 24daff9278..691d8af049 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configure-deployments.md
@@ -38,5 +38,5 @@ ECK also facilitates configuration and operation activities with advanced featur
 * [**{{stack}} configuration policies**](elastic-stack-configuration-policies.md): Organize your {{es}} and {{kib}} configuration settings through `StackConfigPolicy` resources that can be referenced within your deployments. This helps to keep your manifests simplified.
 
 ::::{important}
-Explore the [Security](/deploy-manage/security.md) and [Users and roles](/deploy-manage/users-roles.md) sections to to learn more about how to secure and control access your deployments.
+Explore the [](/deploy-manage/security.md) and [Users and roles](/deploy-manage/users-roles.md) sections to to learn more about how to secure and control access your deployments.
 ::::
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md b/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
index b4655483bf..cc075937c5 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md
@@ -6,9 +6,10 @@ applies_to:
     eck: all
 products:
   - id: cloud-kubernetes
+navigation_title: Deploy an orchestrator
 ---
 
-# Deploy an orchestrator [k8s-quickstart]
+# Deploy an {{eck}} orchestrator [k8s-quickstart]
 
 With {{eck}} (ECK), you can extend the basic Kubernetes orchestration capabilities to easily deploy, secure, upgrade your {{es}} cluster, along with other Elastic applications.
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
index a4961966fc..9ac41a5dd7 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
@@ -10,7 +10,7 @@ products:
 
 # Quickstart [k8s-beat-quickstart]
 
-1. Apply the following specification to deploy Filebeat and collect the logs of all containers running in the Kubernetes cluster. ECK automatically configures the secured connection to an {{es}} cluster named `quickstart`, created in the [{{es}} quickstart](deploy-an-orchestrator.md).
+1. Apply the following specification to deploy Filebeat and collect the logs of all containers running in the Kubernetes cluster. ECK automatically configures the secured connection to an {{es}} cluster named `quickstart`, created in [](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md).
 
     ```yaml
     cat <<EOF | kubectl apply -f -
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
index 90dd27a813..ef9e20c617 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
@@ -10,7 +10,7 @@ products:
 
 # Quickstart [k8s-logstash-quickstart]
 
-Add the following specification to create a minimal {{ls}} deployment that will listen to a Beats agent or Elastic Agent configured to send to Logstash on port 5044, create the service and write the output to an {{es}} cluster named `quickstart`, created in the [{{es}} quickstart](deploy-an-orchestrator.md).
+Add the following specification to create a minimal {{ls}} deployment that will listen to a Beats agent or Elastic Agent configured to send to Logstash on port 5044, create the service and write the output to an {{es}} cluster named `quickstart`, created in [](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md).
 
 ```yaml subs=true
 cat <<'EOF' | kubectl apply -f -
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
index 479364eff4..d88086bc19 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
@@ -10,7 +10,7 @@ products:
 
 # Quickstart [k8s-elastic-agent-quickstart]
 
-1. Apply the following specification to deploy Elastic Agent with the System metrics integration to harvest CPU metrics from the Agent Pods. ECK automatically configures the secured connection to an {{es}} cluster named `quickstart`, created in the [{{es}} quickstart](deploy-an-orchestrator.md).
+1. Apply the following specification to deploy Elastic Agent with the System metrics integration to harvest CPU metrics from the Agent Pods. ECK automatically configures the secured connection to an {{es}} cluster named `quickstart`, created in [](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md).
 
     ```yaml subs=true
     cat <<EOF | kubectl apply -f -
diff --git a/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md b/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
index c422f50034..84a426679e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/troubleshooting-beats.md
@@ -6,9 +6,10 @@ applies_to:
     eck: all
 products:
   - id: cloud-kubernetes
+navigation_title: Troubleshooting
 ---
 
-# Troubleshooting [k8s-beat-troubleshooting]
+# Troubleshooting Beats on {{eck}} [k8s-beat-troubleshooting]
 
 ## Beat Pods are crashing when kibanaRef is specified [k8s-beat-beat-pods-are-crashing-when-kibanaref-is-specified]
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md b/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
index 673211db1b..773b3b6530 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-strategy-logstash.md
@@ -6,9 +6,10 @@ applies_to:
     eck: all
 products:
   - id: cloud-kubernetes
+navigation_title: Update strategy
 ---
 
-# Update Strategy [k8s-logstash-update-strategy]
+# Pod update strategy for Logstash on ECK [k8s-logstash-update-strategy]
 
 The operator takes a Pod down to restart and applies a new configuration value. All Pods are restarted in reverse ordinal order.
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-strategy.md b/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
index f84e82b8ac..864760db1f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-strategy.md
@@ -6,9 +6,10 @@ applies_to:
     eck: all
 products:
   - id: cloud-kubernetes
+navigation_title: Update strategy
 ---
 
-# Update strategy [k8s-update-strategy]
+# Pod update strategy for Elastic Cloud on Kubernetes [k8s-update-strategy]
 
 You can use the `updateStrategy` specification to limit the number of simultaneous changes, like for example in the following cases:
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
index 2a3e332f89..951cf776e8 100644
--- a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
@@ -12,7 +12,7 @@ products:
 
 Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured integration between the stack components. The output configuration of the APM Server is setup automatically to establish a trust relationship with {{es}}. Specifying the {{kib}} reference allows ECK to automatically configure the [{{kib}} endpoint](/solutions/observability/apm/configure-kibana-endpoint.md).
 
-1. To deploy an APM Server and connect it to the {{es}} cluster and {{kib}} instance you created in the [quickstart](deploy-an-orchestrator.md), apply the following specification:
+1. To deploy an APM Server and connect it to the {{es}} cluster and {{kib}} instance you created in [](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md), apply the following specification:
 
     ```yaml subs=true
     cat <<EOF | kubectl apply -f -
@@ -31,7 +31,7 @@ Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured int
     EOF
     ```
 
-1. A reference to a {{kib}} instance is only required for APM Server versions 8.0.0 and later.
+2. A reference to a {{kib}} instance is only required for APM Server versions 8.0.0 and later.
 
 
 ::::{note}
diff --git a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
index 98292602d4..a1efef7d54 100644
--- a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
+++ b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
@@ -10,7 +10,7 @@ products:
 
 # Virtual memory [k8s-virtual-memory]
 
-By default, {{es}} uses memory mapping (`mmap`) to efficiently access indices. Usually, default values for virtual address space on Linux distributions are too low for {{es}} to work properly, which may result in out-of-memory exceptions. This is why [the quickstart example](deploy-an-orchestrator.md) disables `mmap` through the `node.store.allow_mmap: false` setting. For production workloads, it is strongly recommended to increase the kernel setting `vm.max_map_count` to `262144` and leave `node.store.allow_mmap` unset.
+By default, {{es}} uses memory mapping (`mmap`) to efficiently access indices. Usually, default values for virtual address space on Linux distributions are too low for {{es}} to work properly, which may result in out-of-memory exceptions. This is why [the quickstart example](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md) disables `mmap` through the `node.store.allow_mmap: false` setting. For production workloads, it is strongly recommended to increase the kernel setting `vm.max_map_count` to `262144` and leave `node.store.allow_mmap` unset.
 
 The kernel setting `vm.max_map_count=262144` can be set on the host directly, by a dedicated init container which must be privileged, or a dedicated Daemonset.
 
diff --git a/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md b/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
index feae9f78a4..b55e95c772 100644
--- a/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
+++ b/deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md
@@ -7,17 +7,10 @@ applies_to:
     ess: ga
 products:
   - id: cloud-hosted
+navigation_title: Custom endpoint aliases
 ---
 
-# Custom endpoint aliases
-
-% What needs to be done: Lift-and-shift
-
-% Use migrated content from existing pages that map to this page:
-
-% - [ ] ./raw-migrated-files/cloud/cloud/ec-regional-deployment-aliases.md
-% - [ ] ./raw-migrated-files/cloud/cloud-heroku/ech-regional-deployment-aliases.md
-
+# Configure custom endpoint aliases on {{ech}}
 
 Custom aliases for your deployment endpoints on {{ech}} allow you to have predictable, human-readable URLs that can be shared easily. An alias is unique to only one deployment within a region.
 
diff --git a/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md b/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
index 2ce5bb7dbd..6583afa538 100644
--- a/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
+++ b/deploy-manage/deploy/elastic-cloud/switch-from-apm-to-integrations-server-payload.md
@@ -6,9 +6,10 @@ applies_to:
     ess: ga
 products:
   - id: cloud-hosted
+navigation_title: Switch from APM to Integrations Server
 ---
 
-# Switch from APM to Integrations Server payload [ec-integrations-server-apm-switch]
+# Switch from APM to Integrations Server payload on {{ech}} [ec-integrations-server-apm-switch]
 
 This example shows how to use the {{ecloud}} RESTful API to switch from using [APM & Fleet Server](#ec-manage-apm-and-fleet) to [Integrations Server](manage-integrations-server.md).
 
diff --git a/deploy-manage/kibana-reporting-configuration.md b/deploy-manage/kibana-reporting-configuration.md
index 1cff860024..29ded532fd 100644
--- a/deploy-manage/kibana-reporting-configuration.md
+++ b/deploy-manage/kibana-reporting-configuration.md
@@ -229,7 +229,7 @@ These steps apply only to **self-managed deployments**. Orchestrated deployments
 
 To automatically generate reports with {{watcher}}, you must configure {{watcher}} to trust the {{kib}} server certificate.
 
-1. Enable {{stack-security-features}} on your {{es}} cluster. For more information, see [Getting started with security](/deploy-manage/security.md).
+1. Enable {{stack-security-features}} on your {{es}} cluster. For more information, see [](/deploy-manage/security.md).
 2. Configure TLS/SSL encryption for the {{kib}} server. For more information, see [*Encrypt TLS communications in {{kib}}*](/deploy-manage/security/set-up-basic-security-plus-https.md#encrypt-kibana-http).
 3. Specify the {{kib}} server CA certificate chain in [`elasticsearch.yml`](/deploy-manage/stack-settings.md):
 
diff --git a/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md b/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
index af7cb65795..a73ebcf951 100644
--- a/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
+++ b/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md
@@ -12,7 +12,7 @@ products:
 % this page probably needs to be moved
 
 
-# Troubleshooting [monitor-troubleshooting]
+# Troubleshooting visualizing monitoring data in {{kib}} [monitor-troubleshooting]
 
 
 Use the information in this section to troubleshoot common problems and find answers for frequently asked questions related to the {{kib}} {{monitor-features}}.
diff --git a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
index d84e37f772..93e0b33b87 100644
--- a/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
+++ b/deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md
@@ -93,8 +93,8 @@ On the **Stack Monitoring** page, you’ll see cluster alerts that require your
 :screenshot:
 :::
 
-If you encounter problems, see [Troubleshooting monitoring](../monitoring-data/monitor-troubleshooting.md).
+If you encounter problems, refer to [](/deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md).
 
 :::{tip}
 If you're using {{ech}} or {{ece}}, then you can also get a direct link to the relevant **Stack Monitoring** page from the deployment's **Logs and metrics** page. [Learn more](/deploy-manage/monitor/stack-monitoring/ece-ech-stack-monitoring.md#access-kibana-monitoring).
-::::
\ No newline at end of file
+:::
\ No newline at end of file
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md b/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
index 84b8bb3e21..9517470e1c 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md
@@ -8,9 +8,10 @@ applies_to:
     ess:
 products:
   - id: cloud-hosted
+navigation_title: AWS S3
 ---
 
-# Configure a snapshot repository using AWS S3 [ec-aws-custom-repository]
+# Configure an AWS S3 snapshot repository in {{ech}} [ec-aws-custom-repository]
 
 Configure a custom snapshot repository using an S3 storage bucket in your AWS account.
 
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md b/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
index 7f6af1d7a3..1ab3c1fdbf 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md
@@ -7,11 +7,12 @@ applies_to:
     ess:
 products:
   - id: cloud-hosted
+navigation_title: Azure Blob Storage
 ---
 
-# Configure a snapshot repository using Azure Blob storage [ec-azure-snapshotting]
+# Configure an Azure Blob Storage snapshot repository in {{ech}} [ec-azure-snapshotting]
 
-Configure a custom snapshot repository using your Azure Blob storage account.
+Configure a custom snapshot repository using your Azure Blob Storage account.
 
 
 ## Prepare a container [ec-prepare-azure-container]
diff --git a/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md b/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
index 8bd4ef8195..2f721322fa 100644
--- a/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
+++ b/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md
@@ -7,9 +7,10 @@ applies_to:
     ess:
 products:
   - id: cloud-hosted
+navigation_title: Google Cloud Storage
 ---
 
-# Configure a snapshot repository using GCS [ec-gcs-snapshotting]
+# Configure a GCS snapshot repository in {{ech}}
 
 Configure a custom snapshot repository using your Google Cloud Storage account.
 
diff --git a/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md b/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
index 7aa4b961c2..f4da3aa4a6 100644
--- a/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md
@@ -5,7 +5,7 @@ applies_to:
     ece:
 ---
 
-# Configure a snapshot repository using AWS S3 [ece-aws-custom-repository]
+# Configure an AWS S3 snapshot repository in {{ece}} [ece-aws-custom-repository]
 
 To store {{es}} snapshots in AWS S3, you need to configure a snapshot repository in {{ece}} (ECE). This guide explains how to add an Amazon S3 repository using the Cloud UI and provides details on required settings and advanced configurations.
 
diff --git a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
index a7f82fe396..d9f0f7f678 100644
--- a/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
+++ b/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md
@@ -6,11 +6,12 @@ applies_to:
     ece:
 products:
   - id: cloud-enterprise
+navigation_title: Google Cloud Storage
 ---
 
-# Google Cloud Storage (GCS) repository [ece-configure-gcp-snapshotting]
+# Configure a Google Cloud Storage snapshot repository in {{ece}}
 
-Snapshots to GCS are supported using an [advanced repository configuration](cloud-enterprise.md) and service account credentials that can administer your GCS bucket.
+Snapshots to Google Cloud Storage (GCS) are supported using an [advanced repository configuration](cloud-enterprise.md) and service account credentials that can administer your GCS bucket.
 
 ## Set up your service account credentials [ece_set_up_your_service_account_credentials]
 
diff --git a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
index 5f7618cf5f..8b77ae9165 100644
--- a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
+++ b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-aws-gcp.md
@@ -6,6 +6,7 @@ applies_to:
     ess:
 products:
   - id: cloud-hosted
+navigation_title: AWS and GCP
 ---
 
 # Repository isolation on AWS and GCP [ec-snapshot-repository-aws-gcp-migration]
diff --git a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
index 952cc18a65..b01fd0daa0 100644
--- a/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
+++ b/deploy-manage/tools/snapshot-and-restore/repository-isolation-on-azure.md
@@ -6,6 +6,7 @@ applies_to:
     ess:
 products:
   - id: cloud-hosted
+navigation_title: Azure
 ---
 
 # Repository isolation on Azure [ec-snapshot-repository-azure-migration]
diff --git a/deploy-manage/upgrade.md b/deploy-manage/upgrade.md
index a227a8e6fb..fb10cf2b34 100644
--- a/deploy-manage/upgrade.md
+++ b/deploy-manage/upgrade.md
@@ -12,9 +12,10 @@ products:
   - id: cloud-hosted
   - id: cloud-kubernetes
   - id: elasticsearch
+navigation_title: Upgrade
 ---
 
-# Upgrade
+# Upgrade your deployment, cluster, or orchestrator
 
 Upgrading to the latest version provides access to the newest Elastic features, security patches, performance improvements, and bug fixes. These updates reduce costs, speed up threat response, and improve investigative and analytical data tools.
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
index a3fc219a4a..f2c380f104 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md
@@ -74,7 +74,7 @@ $$$built-in-roles-kibana-dashboard$$$ `kibana_dashboard_only_user`
 :   (This role is deprecated, use [{{kib}} feature privileges](../../../deploy-manage/users-roles/cluster-or-deployment-auth/kibana-privileges.md#kibana-feature-privileges) instead). Grants read-only access to the {{kib}} Dashboard in every [space in {{kib}}](/deploy-manage/manage-spaces.md). This role does not have access to editing tools in {{kib}}.
 
 $$$built-in-roles-kibana-system$$$ `kibana_system`
-:   Grants access necessary for the {{kib}} system user to read from and write to the {{kib}} indices, manage index templates and tokens, and check the availability of the {{es}} cluster. It also permits activating, searching, and retrieving user profiles, as well as updating user profile data for the `kibana-*` namespace. This role grants read access to the `.monitoring-*` indices and read and write access to the `.reporting-*` indices. For more information, see [Configuring Security in {{kib}}](/deploy-manage/security.md).
+:   Grants access necessary for the {{kib}} system user to read from and write to the {{kib}} indices, manage index templates and tokens, and check the availability of the {{es}} cluster. It also permits activating, searching, and retrieving user profiles, as well as updating user profile data for the `kibana-*` namespace. This role grants read access to the `.monitoring-*` indices and read and write access to the `.reporting-*` indices.
 
     ::::{note}
     This role should not be assigned to users as the granted permissions may change between releases.
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md b/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
index c83dab7d3f..a43aa6b69d 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/managed-credentials-eck.md
@@ -52,7 +52,7 @@ spec:
 
 ## Rotate auto-generated credentials [k8s-rotate-credentials]
 
-You can force the auto-generated credentials to be regenerated with new values by deleting the appropriate Secret. For example, to change the password for the `elastic` user from the [quickstart example](../../../deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md), use the following command:
+You can force the auto-generated credentials to be regenerated with new values by deleting the appropriate Secret. For example, to change the password for the `elastic` user from the [quickstart example](/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md), use the following command:
 
 ```sh
 kubectl delete secret quickstart-es-elastic-user
diff --git a/manage-data/data-store/data-streams/set-up-data-stream.md b/manage-data/data-store/data-streams/set-up-data-stream.md
index f195a50acc..2f99f10938 100644
--- a/manage-data/data-store/data-streams/set-up-data-stream.md
+++ b/manage-data/data-store/data-streams/set-up-data-stream.md
@@ -23,7 +23,7 @@ You can also [convert an index alias to a data stream](#convert-index-alias-to-d
 ::::{important}
 If you use {{fleet}}, {{agent}}, or {{ls}}, skip this tutorial. They all set up data streams for you.
 
-For {{fleet}} and {{agent}}, check out this [data streams documentation](/reference/fleet/data-streams.md). For {{ls}}, check out the [data streams settings](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-data_stream) for the `elasticsearch output` plugin.
+For {{fleet}} and {{agent}}, refer to [](/reference/fleet/data-streams.md). For {{ls}}, refer to the [data streams settings](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-data_stream) for the `elasticsearch output` plugin.
 
 ::::
 
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 3832097e08..c412860f4a 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
@@ -85,9 +85,9 @@ The `found-snapshots` repository is specific to your cluster. To use another clu
 
 You can also use any of the following custom repository types with {{search-snaps}}:
 
-* [Google Cloud Storage (GCS)](../deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md)
-* [Azure Blob Storage](../deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md)
-* [Amazon Web Services (AWS)](../deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md)
+* [Google Cloud Storage (GCS)](/deploy-manage/tools/snapshot-and-restore/ec-gcs-snapshotting.md)
+* [Azure Blob Storage](/deploy-manage/tools/snapshot-and-restore/ec-azure-snapshotting.md)
+* [Amazon Web Services (AWS)](/deploy-manage/tools/snapshot-and-restore/ec-aws-custom-repository.md)
 ::::::
 
 ::::::{tab-item} Self-managed
diff --git a/reference/fleet/data-streams.md b/reference/fleet/data-streams.md
index e515e3080f..058ea6354d 100644
--- a/reference/fleet/data-streams.md
+++ b/reference/fleet/data-streams.md
@@ -4,9 +4,10 @@ mapped_pages:
 products:
   - id: fleet
   - id: elastic-agent
+navigation_title: Data streams
 ---
 
-# Data streams [data-streams]
+# Agent-created data streams [data-streams]
 
 {{agent}} uses data streams to store time series data across multiple indices while giving you a single named resource for requests. Data streams are well-suited for logs, metrics, traces, and other continuously generated data. They offer a host of benefits over other indexing strategies:
 
diff --git a/release-notes/elastic-observability/breaking-changes.md b/release-notes/elastic-observability/breaking-changes.md
index 0164f0c369..493ff7e6fe 100644
--- a/release-notes/elastic-observability/breaking-changes.md
+++ b/release-notes/elastic-observability/breaking-changes.md
@@ -3,7 +3,7 @@ navigation_title: Breaking changes
 ---
 
 # Elastic {{observability}} breaking changes [elastic-observability-breaking-changes]
-Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the Elastic {{observability}} breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [Upgrade](/deploy-manage/upgrade.md).
+Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the Elastic {{observability}} breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [](/deploy-manage/upgrade.md).
 
 % ## Next version [elastic-observability-nextversion-breaking-changes]
 % **Release date:** Month day, year
diff --git a/release-notes/elastic-observability/deprecations.md b/release-notes/elastic-observability/deprecations.md
index 6b1ce1d24f..d1a827e8b4 100644
--- a/release-notes/elastic-observability/deprecations.md
+++ b/release-notes/elastic-observability/deprecations.md
@@ -5,7 +5,7 @@ navigation_title: Deprecations
 # Elastic {{observability}} deprecations [elastic-observability-deprecations]
 Over time, certain Elastic functionality becomes outdated and is replaced or removed. To help with the transition, Elastic deprecates functionality for a period before removal, giving you time to update your applications. 
 
-Review the deprecated functionality for Elastic {{observability}}. While deprecations have no immediate impact, we strongly encourage you update your implementation after you upgrade. To learn how to upgrade, check out [Upgrade](/deploy-manage/upgrade.md).
+Review the deprecated functionality for Elastic {{observability}}. While deprecations have no immediate impact, we strongly encourage you update your implementation after you upgrade. To learn how to upgrade, check out [](/deploy-manage/upgrade.md).
 
 % ## Next version
 
diff --git a/release-notes/elastic-security/breaking-changes.md b/release-notes/elastic-security/breaking-changes.md
index 7b30f6c755..b9759d35f6 100644
--- a/release-notes/elastic-security/breaking-changes.md
+++ b/release-notes/elastic-security/breaking-changes.md
@@ -2,7 +2,7 @@
 navigation_title: Breaking changes
 ---
 # {{elastic-sec}} breaking changes [elastic-security-breaking-changes]
-Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the {{elastic-sec}} breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [Upgrade](/deploy-manage/upgrade.md).
+Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the {{elastic-sec}} breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [](/deploy-manage/upgrade.md).
 
 % ## Next version [elastic-security-X.X.X-breaking-changes]
 
diff --git a/release-notes/intro/index.md b/release-notes/intro/index.md
index 81277c1e83..d5dcf6ebc0 100644
--- a/release-notes/intro/index.md
+++ b/release-notes/intro/index.md
@@ -26,7 +26,7 @@ Looking for earlier versions? Go to [Release docs](https://www.elastic.co/guide/
 
 ## Recommended: Upgrade to the latest version
 
-We recommend upgrading to the latest supported version to take advantage of the newest features, performance improvements, and security updates. Learn how to [Upgrade](/deploy-manage/upgrade.md).
+We recommend upgrading to the latest supported version to take advantage of the newest features, performance improvements, and security updates. Learn how to [](/deploy-manage/upgrade.md).
 
 ## Additional release resources
 
diff --git a/solutions/observability/apm/data-streams.md b/solutions/observability/apm/data-streams.md
index 5a6770a3be..42dc48a547 100644
--- a/solutions/observability/apm/data-streams.md
+++ b/solutions/observability/apm/data-streams.md
@@ -6,9 +6,10 @@ applies_to:
 products:
   - id: observability
   - id: apm
+navigation_title: Data streams
 ---
 
-# Data streams [apm-data-streams]
+# APM data streams [apm-data-streams]
 
 ::::{note}
 {{agent}} uses data streams to store append-only time series data across multiple indices. Data streams are well-suited for logs, metrics, traces, and other continuously generated data, and offer a host of benefits over other indexing strategies:
diff --git a/solutions/observability/apm/index-lifecycle-management.md b/solutions/observability/apm/index-lifecycle-management.md
index 330ead1ddd..a4c11843be 100644
--- a/solutions/observability/apm/index-lifecycle-management.md
+++ b/solutions/observability/apm/index-lifecycle-management.md
@@ -6,9 +6,10 @@ applies_to:
 products:
   - id: observability
   - id: apm
+navigation_title: Index lifecycle management
 ---
 
-# Index lifecycle management [apm-ilm-how-to]
+# Index lifecycle management for APM indices [apm-ilm-how-to]
 
 Lifecycle policies allow you to automate the lifecycle of your APM indices as they grow and age. A default policy is applied to each APM data stream, but can be customized depending on your business needs.
 
diff --git a/solutions/security/cloud/get-started-with-kspm.md b/solutions/security/cloud/get-started-with-kspm.md
index fdd750b8ee..3a2025c007 100644
--- a/solutions/security/cloud/get-started-with-kspm.md
+++ b/solutions/security/cloud/get-started-with-kspm.md
@@ -280,7 +280,7 @@ After a few minutes, a message confirming the {{agent}} enrollment appears, foll
 
 ### Set up KSPM on ECK deployments [kspm-eck]
 
-To run KSPM on an [ECK](/deploy-manage/deploy/cloud-on-k8s/deploy-an-orchestrator.md) deployment, you must edit the [Elastic Agent CRD](/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md) and [Elastic Agent Cluster-Role](/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md#k8s-elastic-agent-role-based-access-control) `.yaml` files.
+To run KSPM on an [ECK](/deploy-manage/deploy/cloud-on-k8s.md) deployment, you must edit the [Elastic Agent CRD](/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md) and [Elastic Agent Cluster-Role](/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md#k8s-elastic-agent-role-based-access-control) `.yaml` files.
 
 ::::{dropdown} Patch Elastic Agent
 Add `volumes` and `volumeMounts` to `podTemplate`:
diff --git a/troubleshoot/elasticsearch/security/security-trb-roles.md b/troubleshoot/elasticsearch/security/security-trb-roles.md
index ea8c455ff5..c246eafd16 100644
--- a/troubleshoot/elasticsearch/security/security-trb-roles.md
+++ b/troubleshoot/elasticsearch/security/security-trb-roles.md
@@ -41,7 +41,7 @@ products:
     |     |     |
     | --- | --- |
     | *group identification* | Groups are located by either an LDAP search or by the "memberOf" attribute onthe user. Also, If subtree search is turned off, it will search only onelevel deep. For all the options, see [LDAP realm settings](elasticsearch://reference/elasticsearch/configuration-reference/security-settings.md#ref-ldap-settings).There are many options here and sticking to the defaults will not work for allscenarios. |
-    | *group to role mapping* | Either the `role_mapping.yml` file or the location for this file could bemisconfigured. For more information, see [Security files](../../../deploy-manage/security.md). |
+    | *group to role mapping* | Either the `role_mapping.yml` file or the location for this file could be misconfigured. For more information, see [Using role mapping files](/deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md#mapping-roles-file). |
     | *role definition* | The role definition might be missing or invalid. |
 
     To help track down these possibilities, enable additional logging to troubleshoot further. You can enable debug logging by configuring the following persistent setting:

From 96b4775f1f7ad329f50a3a6040e82ca390b521ea Mon Sep 17 00:00:00 2001
From: shainaraskas <shaina.raskas@elastic.co>
Date: Mon, 15 Sep 2025 12:12:04 -0400
Subject: [PATCH 2/2] tiny bug

---
 .../use-an-elasticsearch-cluster-managed-by-eck.md            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
index 951cf776e8..900ee2b55e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
@@ -27,11 +27,11 @@ Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured int
       elasticsearchRef:
         name: quickstart
       kibanaRef:
-        name: quickstart
+        name: quickstart <1>
     EOF
     ```
 
-2. A reference to a {{kib}} instance is only required for APM Server versions 8.0.0 and later.
+    1. A reference to a {{kib}} instance is only required for APM Server versions 8.0.0 and later.
 
 
 ::::{note}