diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 68dd78f10..11c36a2bb 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -34,6 +34,8 @@ grafana:
             allValue: true
             multi: true
             hide: 0
+            text: All
+            value: "$__all"
           containers: {}
           manint: {}
           monint: {}
diff --git a/salt/grafana/templates/role.json b/salt/grafana/templates/role.json
index f398f679b..de51ff5d2 100644
--- a/salt/grafana/templates/role.json
+++ b/salt/grafana/templates/role.json
@@ -3,17 +3,17 @@
     "current": {
         "selected": true,
         "tags": [],
-        "text": [],
-        "value": []
+        "text": [{{ TEMPLATES.role.get('text', DASHBOARD)| json }}],
+        "value": [{{ TEMPLATES.role.get('value', DASHBOARD)| json }}]
     },
     "datasource": "InfluxDB",
     "definition": "show tag values with key=\"role\"",
     "description": null,
     "error": null,
-    "hide": 0,
-    "includeAll": true,
+    "hide": {{ TEMPLATES.role.get('hide', 0)| json }},
+    "includeAll": {{ TEMPLATES.role.get('includeAll', true)| json }},
     "label": "Role",
-    "multi": true,
+    "multi": {{ TEMPLATES.role.get('multi', true)| json }},
     "name": "role",
     "options": [],
     "query": "show tag values with key=\"role\"",