diff --git a/salt/common/grafana/etc/dashboards/dashboard.yml b/salt/common/grafana/etc/dashboards/dashboard.yml
index b371eb393..8bb7615ea 100644
--- a/salt/common/grafana/etc/dashboards/dashboard.yml
+++ b/salt/common/grafana/etc/dashboards/dashboard.yml
@@ -3,41 +3,29 @@ apiVersion: 1
 providers:
 
 {%- if grains['role'] != 'so-eval' %}
-- name: 'Security Onion'
-  orgId: 1
-  folder: 'Master Nodes'
+- name: 'Master'
+  folder: 'Master'
   type: file
   disableDeletion: false
   editable: true
   options:
     path: /etc/grafana/grafana_dashboards/master
-- name: 'Security Onion'
-  orgId: 2
+- name: 'Forward Nodes'
   folder: 'Forward Nodes'
   type: file
   disableDeletion: false
   editable: true
   options:
     path: /etc/grafana/grafana_dashboards/forward_nodes
-- name: 'Security Onion'
-  orgId: 3
+- name: 'Storage Nodes'
   folder: 'Storage Nodes'
   type: file
   disableDeletion: false
   editable: true
   options:
     path: /etc/grafana/grafana_dashboards/storage_nodes
-- name: 'Security Onion'
-  orgId: 4
-  folder: 'Master'
-  type: file
-  disableDeletion: false
-  editable: true
-  options:
-    path: /etc/grafana/grafana_dashboards/forward_nodes
 {%- else %}
 - name: 'Security Onion'
-  orgId: 5
   folder: 'Eval Mode'
   type: file
   disableDeletion: false