diff --git a/salt/grafana/dashboards/eval/eval.json b/salt/grafana/dashboards/eval/eval.json
index 3631070d6..1bcf84f02 100644
--- a/salt/grafana/dashboards/eval/eval.json
+++ b/salt/grafana/dashboards/eval/eval.json
@@ -4621,6 +4621,6 @@
   },
   "timezone": "browser",
   "title": "Evaluation Mode - {{ SERVERNAME }} Overview",
-  "uid": "so_overview",
+  "uid": "{{ UID }}",
   "version": 6
 }
\ No newline at end of file
diff --git a/salt/grafana/dashboards/manager/manager.json b/salt/grafana/dashboards/manager/manager.json
index cc004865c..ede457cdb 100644
--- a/salt/grafana/dashboards/manager/manager.json
+++ b/salt/grafana/dashboards/manager/manager.json
@@ -4168,5 +4168,5 @@
   "timezone": "browser",
   "title": "Manager Node - {{ SERVERNAME }} Overview",
   "uid": "{{ UID }}",
-  "version": 3
+  "version": 1
 }
\ No newline at end of file
diff --git a/salt/grafana/dashboards/managersearch/managersearch.json b/salt/grafana/dashboards/managersearch/managersearch.json
index f605c875a..657239b88 100644
--- a/salt/grafana/dashboards/managersearch/managersearch.json
+++ b/salt/grafana/dashboards/managersearch/managersearch.json
@@ -4912,7 +4912,7 @@
       ]
     },
     "timezone": "browser",
-    "title": "Search Node - {{ SERVERNAME }} Overview",
+    "title": "ManagerSearch Node - {{ SERVERNAME }} Overview",
     "uid": "{{ UID }}",
     "variables": {
       "list": []
diff --git a/salt/grafana/dashboards/sensor_nodes/sensor.json b/salt/grafana/dashboards/sensor_nodes/sensor.json
index 2851a0e41..83b4bd921 100644
--- a/salt/grafana/dashboards/sensor_nodes/sensor.json
+++ b/salt/grafana/dashboards/sensor_nodes/sensor.json
@@ -4426,6 +4426,6 @@
   },
   "timezone": "browser",
   "title": "Sensor Node - {{ SERVERNAME }} Overview",
-  "uid": "so_overview",
-  "version": 2
+  "uid": "{{ UID }}",
+  "version": 1
 }
\ No newline at end of file
diff --git a/salt/grafana/dashboards/standalone/standalone.json b/salt/grafana/dashboards/standalone/standalone.json
index 996e8555b..ac733db5c 100644
--- a/salt/grafana/dashboards/standalone/standalone.json
+++ b/salt/grafana/dashboards/standalone/standalone.json
@@ -6681,6 +6681,6 @@
   },
   "timezone": "browser",
   "title": "Standalone Mode - {{ SERVERNAME }} Overview",
-  "uid": "so_overview",
-  "version": 4
+  "uid": "{{ UID }}",
+  "version": 1
 }
\ No newline at end of file