diff --git a/filebeat/docs/configuring-howto.asciidoc b/filebeat/docs/configuring-howto.asciidoc
index f0c71771335..b521d60eb3f 100644
--- a/filebeat/docs/configuring-howto.asciidoc
+++ b/filebeat/docs/configuring-howto.asciidoc
@@ -17,8 +17,6 @@ The {beatname_uc} configuration file uses http://yaml.org/[YAML] for its syntax.
 See the {beats-ref}/config-file-format.html[Config File Format] section of the
 _Beats Platform Reference_ for more about the structure of the config file.
 
-include::../../libbeat/docs/shared-cm-tip.asciidoc[]
-
 The following topics describe how to configure Filebeat:
 
 * <<configuration-filebeat-modules>>
diff --git a/filebeat/docs/getting-started.asciidoc b/filebeat/docs/getting-started.asciidoc
index e009a753984..7092f0c3037 100644
--- a/filebeat/docs/getting-started.asciidoc
+++ b/filebeat/docs/getting-started.asciidoc
@@ -195,8 +195,6 @@ include::{libbeat-dir}/docs/step-test-config.asciidoc[]
 
 include::{libbeat-dir}/docs/step-look-at-config.asciidoc[]
 
-include::../../libbeat/docs/shared-cm-tip.asciidoc[]
-
 [[filebeat-template]]
 === Step 3: Load the index template in Elasticsearch
 
diff --git a/libbeat/docs/shared-central-management.asciidoc b/libbeat/docs/shared-central-management.asciidoc
index de597ea2345..1fb9fc0ed0e 100644
--- a/libbeat/docs/shared-central-management.asciidoc
+++ b/libbeat/docs/shared-central-management.asciidoc
@@ -5,7 +5,7 @@
 [partintro]
 --
 
-beta[]
+include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued]
 
 [WARNING]
 =======================================
@@ -38,7 +38,7 @@ include::shared-license-statement.asciidoc[]
 [role="xpack"]
 == How central management works
 
-beta[]
+include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued]
 
 {beats} central management uses a mechanism called configuration tags to group
 related configurations. You define configuration tags in the {cm-ui} UI in {kib}
@@ -105,7 +105,7 @@ the Beat to troubleshoot the problem.
 [role="xpack"]
 == Enroll {beats} in central management
 
-beta[]
+include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued]
 
 You need to enroll {beats} to register them in
 <<configuration-central-management,central management>> and establish
diff --git a/libbeat/docs/shared-cm-tip.asciidoc b/libbeat/docs/shared-cm-tip.asciidoc
deleted file mode 100644
index 4e3a67f3b3e..00000000000
--- a/libbeat/docs/shared-cm-tip.asciidoc
+++ /dev/null
@@ -1,3 +0,0 @@
-TIP: Starting with {beatname_uc} 6.5, you can define and manage {beatname_uc}
-configurations in a central location in {kib}. For more information, see
-<<configuration-central-management,{beats} central management>>.
diff --git a/metricbeat/docs/configuring-howto.asciidoc b/metricbeat/docs/configuring-howto.asciidoc
index 398c35eb173..7a7155a6313 100644
--- a/metricbeat/docs/configuring-howto.asciidoc
+++ b/metricbeat/docs/configuring-howto.asciidoc
@@ -17,8 +17,6 @@ The {beatname_uc} configuration file uses http://yaml.org/[YAML] for its syntax.
 See the {beats-ref}/config-file-format.html[Config File Format] section of the
 _Beats Platform Reference_ for more about the structure of the config file.
 
-include::../../libbeat/docs/shared-cm-tip.asciidoc[]
-
 The following topics describe how to configure {beatname_uc}:
 
 * <<configuration-metricbeat>>
diff --git a/metricbeat/docs/gettingstarted.asciidoc b/metricbeat/docs/gettingstarted.asciidoc
index 0d67feac89a..60631dece5a 100644
--- a/metricbeat/docs/gettingstarted.asciidoc
+++ b/metricbeat/docs/gettingstarted.asciidoc
@@ -224,8 +224,6 @@ include::{libbeat-dir}/docs/step-test-config.asciidoc[]
 
 include::{libbeat-dir}/docs/step-look-at-config.asciidoc[]
 
-include::../../libbeat/docs/shared-cm-tip.asciidoc[]
-
 [id="{beatname_lc}-template"]
 === Step 3: Load the index template in Elasticsearch