diff --git a/salt/grafana/dashboards/common_template.json.jinja b/salt/grafana/dashboards/common_template.json.jinja
index 9893a8852..6490d7946 100644
--- a/salt/grafana/dashboards/common_template.json.jinja
+++ b/salt/grafana/dashboards/common_template.json.jinja
@@ -54,6 +54,8 @@
   },
   "timezone": "browser",
   "title": "Detailed {{ NODETYPE }}",
+  {% if grains.role in 'so-standalone' %}
   "uid": "{{ UID }}",
+  {% endif %}
   "version": 1
 }
diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls
index 627a64961..f4dab1a56 100644
--- a/salt/grafana/init.sls
+++ b/salt/grafana/init.sls
@@ -87,7 +87,7 @@ grafana-config-files:
     - makedirs: True
 
 {% for nodeType in nodeTypes %}       
-common-standalone-dashboard:
+detailed-{{nodeType}}-dashboard:
   file.managed:
     - name: /opt/so/conf/grafana/grafana_dashboards/detailed/{{nodeType}}.json
     - user: 939