diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 0902a1542..68dd78f10 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -31,9 +31,9 @@ grafana:
         list:
           servername: {}
           role:
-            allValue: false
-            multi: false
-            hide: 2
+            allValue: true
+            multi: true
+            hide: 0
           containers: {}
           manint: {}
           monint: {}
@@ -657,13 +657,16 @@ grafana:
     manager:
       templating:
         list:
-          - servername_manager
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: false
+            multi: false
+            hide: 2
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
@@ -987,13 +990,16 @@ grafana:
     managersearch:
       templating:
         list:
-          - servername_managersearch
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: false
+            multi: false
+            hide: 2
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
@@ -1317,13 +1323,16 @@ grafana:
     sensor:
       templating:
         list:
-          - servername_sensor
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: true
+            multi: true
+            hide: 0
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
@@ -1669,13 +1678,16 @@ grafana:
     searchnode:
       templating:
         list:
-          - servername_searchnode
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: true
+            multi: true
+            hide: 0
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
@@ -1955,13 +1967,16 @@ grafana:
     heavynode:
       templating:
         list:
-          - servername_heavynode
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: true
+            multi: true
+            hide: 0
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
@@ -2346,13 +2361,16 @@ grafana:
     eval:
       templating:
         list:
-          - servername_eval
-          - role
-          - containers
-          - manint
-          - monint
-          - cpucount
-          - disk
+          servername: {}
+          role:
+            allValue: false
+            multi: false
+            hide: 2
+          containers: {}
+          manint: {}
+          monint: {}
+          cpucount: {}
+          disk: {}
       panels:
         row_overview:
           gridPos:
diff --git a/salt/grafana/templates/servername.json b/salt/grafana/templates/servername.json
index a3cd08cb9..267884edf 100644
--- a/salt/grafana/templates/servername.json
+++ b/salt/grafana/templates/servername.json
@@ -1,7 +1,7 @@
 {% if DASHBOARD == 'overview' %}
-  {% set query = "show tag values with key=\"host\" WHERE (\"role\" =~ /^$role$/)" %}
+  {% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" =~ /^$role$/)" %}
 {% else %}
-  {% set query = "show tag values with key=\"host\" WHERE (\"role\" = '\' ~ DASHBOARD ~ \'')" %}
+  {% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" = DASHBOARD ')" %}
 {% endif %}
 {
     "allValue": null,
@@ -12,7 +12,7 @@
       "value": []
     },
     "datasource": "InfluxDB",
-    "definition": "{{ query }}",
+    "definition": "{{ query   }}",
     "description": "",
     "error": null,
     "hide": 0,
diff --git a/salt/grafana/templates/servername_all.json b/salt/grafana/templates/servername_all.json
deleted file mode 100644
index 70c8c6210..000000000
--- a/salt/grafana/templates/servername_all.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "allValue": null,
-    "current": {
-      "selected": true,
-      "tags": [],
-      "text": [],
-      "value": []
-    },
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" WHERE (\"role\" =~ /^$role$/)",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": true,
-    "label": "Node",
-    "multi": true,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" WHERE (\"role\" =~ /^$role$/)",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 1,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_eval.json b/salt/grafana/templates/servername_eval.json
deleted file mode 100644
index cca6fef48..000000000
--- a/salt/grafana/templates/servername_eval.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "allValue": null,
-    "current": {
-      "selected": true,
-      "tags": [],
-      "text": [],
-      "value": []
-    },
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" WHERE (\"role\" = 'eval')",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": true,
-    "label": "Node",
-    "multi": true,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" WHERE (\"role\" = 'eval')",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 1,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_heavynode.json b/salt/grafana/templates/servername_heavynode.json
deleted file mode 100644
index 2d1486038..000000000
--- a/salt/grafana/templates/servername_heavynode.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'heavynode'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'heavynode'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_manager.json b/salt/grafana/templates/servername_manager.json
deleted file mode 100644
index 8f688093d..000000000
--- a/salt/grafana/templates/servername_manager.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'manager'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'manager'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_managersearch.json b/salt/grafana/templates/servername_managersearch.json
deleted file mode 100644
index 6024c69f5..000000000
--- a/salt/grafana/templates/servername_managersearch.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'managersearch'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'managersearch'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_searchnode.json b/salt/grafana/templates/servername_searchnode.json
deleted file mode 100644
index 4660e1b50..000000000
--- a/salt/grafana/templates/servername_searchnode.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'searchnode'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'searchnode'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_sensor.json b/salt/grafana/templates/servername_sensor.json
deleted file mode 100644
index e740ba96d..000000000
--- a/salt/grafana/templates/servername_sensor.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'sensor'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'sensor'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }
diff --git a/salt/grafana/templates/servername_standalone.json b/salt/grafana/templates/servername_standalone.json
deleted file mode 100644
index 58fc08818..000000000
--- a/salt/grafana/templates/servername_standalone.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "allValue": null,
-    "current": {},
-    "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'standalone'",
-    "description": "",
-    "error": null,
-    "hide": 0,
-    "includeAll": false,
-    "label": "Node",
-    "multi": false,
-    "name": "servername",
-    "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'standalone'",
-    "refresh": 1,
-    "regex": "",
-    "skipUrlSync": false,
-    "sort": 0,
-    "tagValuesQuery": "",
-    "tags": [],
-    "tagsQuery": "",
-    "type": "query",
-    "useTags": false
-  }