diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 9f1b1a9f8..90808557f 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -28,7 +28,7 @@ grafana:
     standalone:
       templating:
         list:
-          - servername
+          - servername_standalone
           - containers
           - manint
           - monint
@@ -407,7 +407,7 @@ grafana:
     heavynode:
       templating:
         list:
-          - servername
+          - servername_heavynode
           - containers
           - manint
           - monint
diff --git a/salt/grafana/templates/servername_heavynode.json b/salt/grafana/templates/servername_heavynode.json
new file mode 100644
index 000000000..2d1486038
--- /dev/null
+++ b/salt/grafana/templates/servername_heavynode.json
@@ -0,0 +1,24 @@
+{
+    "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.json b/salt/grafana/templates/servername_standalone.json
similarity index 100%
rename from salt/grafana/templates/servername.json
rename to salt/grafana/templates/servername_standalone.json