diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index 3ff85b368..464877252 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -5,14 +5,16 @@
 if [ ! -z "$1" ]; then
   ndjson_template_file=$1
 else
-  ndjson_template_file='/opt/so/conf/kibana/saved_objects.ndjson.template'
+  ndjson_template_file='/opt/so/conf/kibana/saved_objects.ndjson'
 fi
 
 if [ -f "$ndjson_template_file" ]; then
   ndjson_file=$(echo $ndjson_template_file | sed -e "s/\.template$//")
   # Copy template file
   #cp /opt/so/conf/kibana/saved_objects.ndjson.template /opt/so/conf/kibana/saved_objects.ndjson
-  cp "$ndjson_template_file" "$ndjson_file"
+  if [ "$ndjson_template_file" != "$ndjson_file" ]; then
+    cp "$ndjson_template_file" "$ndjson_file"
+  fi
 
   # SOCtopus and Manager
   if grep -lq 'PLACEHOLDER' "$ndjson_file"; then
diff --git a/salt/kibana/files/config_saved_objects.ndjson b/salt/kibana/files/config_saved_objects.ndjson
index 4de0d6a35..859c9e709 100644
--- a/salt/kibana/files/config_saved_objects.ndjson
+++ b/salt/kibana/files/config_saved_objects.ndjson
@@ -1 +1,19 @@
-{"attributes": {"buildNum":39457,"defaultIndex":"2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute":"/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize":100,"theme:darkMode":true,"timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"},"securitySolution:defaultIndex": ["apm-*-transaction*","traces-apm*","auditbeat-*","endgame-*","filebeat-*","logs-*","packetbeat-*","winlogbeat-*","so-*"],"coreMigrationVersion":"7.15.0","id":"7.15.0","migrationVersion":{"config":"7.13.0"},"references":[],"sort":[1633625537804,2310],"type":"config","updated_at":"2021-10-07T16:52:17.804Z","version":"Wzg1NDE3LDVd"}
+{
+	"attributes": {
+		"buildNum": 39457,
+		"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29",
+		"defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645",
+		"discover:sampleSize": 100,
+		"theme:darkMode": true,
+		"timepicker:timeDefaults": "{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"
+	},
+	"coreMigrationVersion": "7.15.0",
+	"id": "7.15.0",
+	"migrationVersion": {
+		"config": "7.13.0"
+	},
+	"references": [],
+	"type": "config",
+	"updated_at": "2021-10-10T10:10:10.105Z",
+	"version": "WzI5NzUsMl0="
+}
diff --git a/salt/kibana/files/securitySolution_saved_objects.ndjson b/salt/kibana/files/securitySolution_saved_objects.ndjson
new file mode 100644
index 000000000..3f4fb35a2
--- /dev/null
+++ b/salt/kibana/files/securitySolution_saved_objects.ndjson
@@ -0,0 +1,17 @@
+{
+	"attributes": {
+		"buildNum": 39457,
+		"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29",
+		"defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645",
+		"securitySolution:defaultIndex": ["apm-*-transaction*", "traces-apm*", "auditbeat-*", "endgame-*", "filebeat-*", "logs-*", "packetbeat-*", "winlogbeat-*", "so-*"]
+	},
+	"coreMigrationVersion": "7.15.0",
+	"id": "7.15.0",
+	"migrationVersion": {
+		"config": "7.13.0"
+	},
+	"references": [],
+	"type": "config",
+	"updated_at": "2021-10-10T10:10:10.105Z",
+	"version": "WzI5NzUsMl0="
+}
diff --git a/salt/kibana/so_default_load.sls b/salt/kibana/so_config_load.sls
similarity index 92%
rename from salt/kibana/so_default_load.sls
rename to salt/kibana/so_config_load.sls
index cf4c98065..6416061ec 100644
--- a/salt/kibana/so_default_load.sls
+++ b/salt/kibana/so_config_load.sls
@@ -1,6 +1,7 @@
 include:
   - kibana
   - kibana.so_dashboard_load
+  - kibana.so_securitySolution_load
 
 config_saved_objects:
   file.managed:
diff --git a/salt/kibana/so_dashboard_load.sls b/salt/kibana/so_dashboard_load.sls
index e3d9fa3ae..0088a4203 100644
--- a/salt/kibana/so_dashboard_load.sls
+++ b/salt/kibana/so_dashboard_load.sls
@@ -3,14 +3,14 @@ include:
 
 dashboard_saved_objects_template:
   file.managed:
-    - name: /opt/so/conf/kibana/saved_objects.ndjson.template
+    - name: /opt/so/conf/kibana/saved_objects.ndjson
     - source: salt://kibana/files/saved_objects.ndjson
     - user: 932
     - group: 939
 
 so-kiba-dashboard-load:
   cmd.run:
-    - name: /usr/sbin/so-kibana-config-load /opt/so/conf/kibana/saved_objects.ndjson.template
+    - name: /usr/sbin/so-kibana-config-load /opt/so/conf/kibana/saved_objects.ndjson
     - cwd: /opt/so
     - require:
       - sls: kibana
diff --git a/salt/kibana/so_securitySolution_load.sls b/salt/kibana/so_securitySolution_load.sls
new file mode 100644
index 000000000..082e414d3
--- /dev/null
+++ b/salt/kibana/so_securitySolution_load.sls
@@ -0,0 +1,17 @@
+include:
+  - kibana
+
+securitySolution_saved_objects:
+  file.managed:
+    - name: /opt/so/conf/kibana/securitySolution_saved_objects.ndjson
+    - source: salt://kibana/files/securitySolution_saved_objects.ndjson
+    - user: 932
+    - group: 939
+
+so-kiba-securitySolution_saved_objects-load:
+  cmd.run:
+    - name: /usr/sbin/so-kibana-config-load /opt/so/conf/kibana/securitySolution_saved_objects.ndjson
+    - cwd: /opt/so
+    - require:
+      - sls: kibana
+      - file: securitySolution_saved_objects
diff --git a/setup/so-setup b/setup/so-setup
index beba3dcc7..d46a77d9e 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -811,7 +811,7 @@ echo "1" > /root/accept_changes
 		salt-call state.apply -l info soc >> $setup_log 2>&1
 
 		set_progress_str 70 "$(print_salt_state_apply 'kibana')"
-		salt-call state.apply -l info kibana.so_default_load >> $setup_log 2>&1
+		salt-call state.apply -l info kibana.so_config_load >> $setup_log 2>&1
 
 		set_progress_str 70 "Setting up default Space in Kibana"
 		so-kibana-space-defaults >> $setup_log 2>&1