diff --git a/filebeat/docs/migration.asciidoc b/filebeat/docs/migration.asciidoc
index 2ab42ad69ffa..d59d2221bade 100644
--- a/filebeat/docs/migration.asciidoc
+++ b/filebeat/docs/migration.asciidoc
@@ -73,9 +73,6 @@ conversion to create a Filebeat config file for each Logstash Forwarder config f
 Before migrating your config files, we recommend that you first read the <<filebeat-configuration-details>>
 section to understand the Filebeat options.
 
-NOTE: Logstash Forwarder has the option of autocompleting environment variables in
-the configuration file. This option currently doesn't exist in Filebeat.
-
 [float]
 === Migrating the "files" Section
 
diff --git a/libbeat/docs/shared-env-vars.asciidoc b/libbeat/docs/shared-env-vars.asciidoc
index 16fa00f9a848..7798e8bbd6ff 100644
--- a/libbeat/docs/shared-env-vars.asciidoc
+++ b/libbeat/docs/shared-env-vars.asciidoc
@@ -12,10 +12,12 @@
 [[using-environ-vars]]
 === Using Environment Variables in the Configuration
 
+experimental[]
+
 You can use environment variable references in the +{beatname_lc}.yml+ file to set values
 that need to be configurable during deployment. To do this, use:
 
-`$VAR` or `${VAR}`
+`${VAR}`
 
 Where `VAR` is the name of the environment variable.
 
@@ -39,7 +41,6 @@ and what each configuration looks like after replacement:
 [options="header"]
 |==================================
 |Config source	       |Environment setting   |Config after replacement
-|`name: $NAME`         |`export NAME=elastic` |`name: elastic`
 |`name: ${NAME}`       |`export NAME=elastic` |`name: elastic`
 |`name: ${NAME:beats}` |no setting            |`name: beats`
 |`name: ${NAME:beats}` |`export NAME=elastic` |`name: elastic`