diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index 6e0c3b1decda..3736d21f44a5 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -76,7 +76,7 @@ If you change the default, you must also configure the `setup.template.name` and
 See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].
 If the Elasticsearch index template has already been successfully loaded to the index,
 you can customize the indices that the APM app uses to display data.
-Navigate to *APM* > *Settings* > *Indices*, and change all `apm_oss.*Pattern` values to
+Navigate to *APM* > *Settings* > *Indices*, and change all `xpack.apm.*Pattern` values to
 include the new index pattern. For example: `customIndexName-*`.
 
 [float]
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index fb96f6835533..fc20685885df 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -87,22 +87,22 @@ Changing these settings may disable features of the APM App.
 | `xpack.apm.agent.migrations.enabled` {ess-icon}
   | Set to `false` to disable cloud APM migrations. Defaults to `true`.
 
-| `xpack.apm.errorIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.error` {ess-icon}
+  | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `logs-apm*,apm-*`.
 
-| `xpack.apm.onboardingIndices` {ess-icon}
+| `xpack.apm.indices.onboarding` {ess-icon}
   | Matcher for all onboarding indices. Defaults to `apm-*`.
 
-| `xpack.apm.spanIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.span` {ess-icon}
+  | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.transactionIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.transaction` {ess-icon}
+  | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.metricsIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/metricset-indices.html[metrics indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.metric` {ess-icon}
+  | Matcher for all {apm-server-ref}/metricset-indices.html[metrics indices]. Defaults to `metrics-apm*,apm-*`.
 
-| `xpack.apm.sourcemapIndices` {ess-icon}
+| `xpack.apm.indices.sourcemap` {ess-icon}
   | Matcher for all {apm-server-ref}/sourcemap-indices.html[source map indices]. Defaults to `apm-*`.
 
 |===