diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 0e728a4dada24..0723040d08da3 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -28,10 +28,6 @@ allowing users to configure their advanced settings, also known
 as uiSettings within the code.
 
 
-|{kib-repo}blob/{branch}/src/plugins/apm_oss/README.asciidoc[apmOss]
-|undefined
-
-
 |{kib-repo}blob/{branch}/src/plugins/bfetch/README.md[bfetch]
 |bfetch allows to batch HTTP requests and streams responses back.
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 29308825ec8e4..9e7766ce16c9b 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -211,12 +211,12 @@ kibana_vars=(
     xpack.alerts.invalidateApiKeysTask.interval
     xpack.alerts.invalidateApiKeysTask.removalDelay
     xpack.apm.enabled
-    xpack.apm.errors
-    xpack.apm.metrics
-    xpack.apm.onboarding
-    xpack.apm.sourcemaps
-    xpack.apm.spans
-    xpack.apm.transactions
+    xpack.apm.indices.errors
+    xpack.apm.indices.metrics
+    xpack.apm.indices.onboarding
+    xpack.apm.indices.sourcemaps
+    xpack.apm.indices.spans
+    xpack.apm.indices.transactions
     xpack.apm.maxServiceEnvironments
     xpack.apm.searchAggregatedTransactions
     xpack.apm.serviceMapEnabled
diff --git a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
index dbdb2278b15a0..d44ddaf3d2038 100644
--- a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
+++ b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
@@ -38,10 +38,10 @@ export const readKibanaConfig = () => {
   };
 
   return {
-    'xpack.apm.indices.transactions': 'apm-*',
-    'xpack.apm.indices.metrics': 'apm-*',
-    'xpack.apm.indices.errors': 'apm-*',
-    'xpack.apm.indices.spans': 'apm-*',
+    'xpack.apm.indices.transactions': 'traces-apm*,apm-*',
+    'xpack.apm.indices.metrics': 'metrics-apm*,apm-*',
+    'xpack.apm.indices.errors': 'logs-apm*,apm-*',
+    'xpack.apm.indices.spans': 'traces-apm*,apm-*',
     'xpack.apm.indices.onboarding': 'apm-*',
     'xpack.apm.indices.sourcemaps': 'apm-*',
     'elasticsearch.hosts': 'http://localhost:9200',