diff --git a/docs/sources/variables/variable-selection-options.md b/docs/sources/variables/variable-selection-options.md
index 8e850e716c7..24ce424d89c 100644
--- a/docs/sources/variables/variable-selection-options.md
+++ b/docs/sources/variables/variable-selection-options.md
@@ -1,9 +1,9 @@
 +++
-title = "Enter variable Selection Options"
+title = "Variable selection options"
 weight = 400
 +++
 
-# Enter variable selection options
+# Configure variable selection options
 
 **Selection Options** are a feature you can use to manage variable option selections. All selection options are optional, and they are off by default.
 
diff --git a/docs/sources/variables/variable-value-tags.md b/docs/sources/variables/variable-value-tags.md
index d6a3d8e2f55..8030cc3e31a 100644
--- a/docs/sources/variables/variable-value-tags.md
+++ b/docs/sources/variables/variable-value-tags.md
@@ -1,9 +1,11 @@
 +++
-title = "Enter Value tags"
+title = "Variable value group tags"
 weight = 500
 +++
 
-# Enter variable value groups/tags (experimental feature)
+# Configure variable value group tags 
+
+> **Note:** This is an experimental feature that will be deprecated in Grafana v8.
 
 Value groups/tags are a feature you can use to organize variable options. If you have many options in the dropdown for a multi-value variable, then you can use this feature to group the values into selectable tags.
 
diff --git a/public/app/features/variables/query/QueryVariableEditor.tsx b/public/app/features/variables/query/QueryVariableEditor.tsx
index bb2988509f9..6d1f2220b75 100644
--- a/public/app/features/variables/query/QueryVariableEditor.tsx
+++ b/public/app/features/variables/query/QueryVariableEditor.tsx
@@ -231,7 +231,9 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
           />
 
           <VerticalGroup spacing="none">
-            <h5>Value groups/tags (Experimental feature)</h5>
+            <h5>Value group tags</h5>
+            <em className="muted p-b-1">Experimental feature, will be deprecated in Grafana v8.</em>
+
             <VariableSwitchField
               value={this.props.variable.useTags}
               name="Enabled"