diff --git a/cloud-account/add-a-login-method.md b/cloud-account/add-a-login-method.md
index 769da6a233..b3cd2bd7a1 100644
--- a/cloud-account/add-a-login-method.md
+++ b/cloud-account/add-a-login-method.md
@@ -1,9 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-change-login-method.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Add a login method [ec-change-login-method]
diff --git a/cloud-account/change-your-password.md b/cloud-account/change-your-password.md
index b18310dd78..04b8b336a8 100644
--- a/cloud-account/change-your-password.md
+++ b/cloud-account/change-your-password.md
@@ -1,9 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-change-password.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Change your password [ec-change-password]
diff --git a/cloud-account/index.md b/cloud-account/index.md
index 5dca8fd1cc..3c8b8d0727 100644
--- a/cloud-account/index.md
+++ b/cloud-account/index.md
@@ -2,9 +2,10 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-account-user-settings.html
   - https://www.elastic.co/guide/en/serverless/current/general-user-profile.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Manage your Cloud account and preferences
diff --git a/cloud-account/join-or-leave-an-organization.md b/cloud-account/join-or-leave-an-organization.md
index a84fe571e1..b9be2290c1 100644
--- a/cloud-account/join-or-leave-an-organization.md
+++ b/cloud-account/join-or-leave-an-organization.md
@@ -2,9 +2,10 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-invite-users.html
   - https://www.elastic.co/guide/en/serverless/current/general-manage-organization.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Join or leave an organization
diff --git a/cloud-account/multifactor-authentication.md b/cloud-account/multifactor-authentication.md
index 12e22a8565..93deb88a13 100644
--- a/cloud-account/multifactor-authentication.md
+++ b/cloud-account/multifactor-authentication.md
@@ -1,9 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-account-security-mfa.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Multifactor authentication [ec-account-security-mfa]
diff --git a/cloud-account/update-your-email-address.md b/cloud-account/update-your-email-address.md
index 2259dd3273..64d430f020 100644
--- a/cloud-account/update-your-email-address.md
+++ b/cloud-account/update-your-email-address.md
@@ -1,9 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-update-email-address.html
-applies:
+applies_to:
   serverless: all
-  hosted: all
+  deployment:
+    ess: all
 ---
 
 # Update your email address [ec-update-email-address]
diff --git a/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md b/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
index 256bc8b383..068e33ed80 100644
--- a/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
+++ b/manage-data/migrate/migrate-from-a-self-managed-cluster-with-a-self-signed-certificate-using-remote-reindex.md
@@ -1,10 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-remote-reindex.html
-applies:
+applies_to:
   serverless: unavailable
-  hosted: all
-  ece: unavailable
+  deployment:
+    ess: all
 navigation_title: Reindex from a self-managed cluster
 ---
 
diff --git a/manage-data/migrate/migrate-internal-indices.md b/manage-data/migrate/migrate-internal-indices.md
index ae0dd660a5..ba470aae5a 100644
--- a/manage-data/migrate/migrate-internal-indices.md
+++ b/manage-data/migrate/migrate-internal-indices.md
@@ -2,7 +2,6 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-migrate-data-internal.html
   - https://www.elastic.co/guide/en/cloud-heroku/current/ech-migrate-data-internal.html
-applies:
 applies_to:
   stack: ga
   deployment:
diff --git a/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md b/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
index e60b53bdaa..49ac872940 100644
--- a/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
+++ b/solutions/observability/incident-management/create-an-uptime-duration-anomaly-rule.md
@@ -2,7 +2,7 @@
 navigation_title: "Uptime duration anomaly"
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/duration-anomaly-alert.html
-applies:
+applies_to:
   stack: deprecated 8.15.0
   serverless: unavailable
 ---
diff --git a/solutions/search.md b/solutions/search.md
index 9f9104a5d3..e81a91c901 100644
--- a/solutions/search.md
+++ b/solutions/search.md
@@ -1,5 +1,5 @@
 ---
-applies:
+applies_to:
   stack:
   serverless:
 mapped_pages: