diff --git a/salt/idstools/soc_idstools.yaml b/salt/idstools/soc_idstools.yaml
index 634f68803..7cf11dba4 100644
--- a/salt/idstools/soc_idstools.yaml
+++ b/salt/idstools/soc_idstools.yaml
@@ -8,7 +8,7 @@ idstools:
       global: True
       helpLink: rules.html
     ruleset:
-      description: Defines the ruleset you want to run. Options are ETOPEN or ETPRO.
+      description: Defines the ruleset you want to run. Options are ETOPEN or ETPRO.  -- WARNING -- Changing the ruleset will remove all existing Suricata rules of the previous ruleset and their associated overrides.'
       global: True
       regex:  ETPRO\b|ETOPEN\b
       helpLink: rules.html
diff --git a/salt/soc/config.sls b/salt/soc/config.sls
index 549bf94cf..e4dad8df2 100644
--- a/salt/soc/config.sls
+++ b/salt/soc/config.sls
@@ -9,9 +9,16 @@
 include:
   - manager.sync_es_users
 
+socdirtest:
+  file.directory:
+    - name: /opt/so/rules/elastalert/rules
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 socdir:
   file.directory:
-    - name: /opt/so/conf/soc
+    - name: /opt/so/conf/soc/fingerprints
     - user: 939
     - group: 939
     - makedirs: True
diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index cc6b417e6..c060698b4 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1006,7 +1006,7 @@ soc:
           communityRulesImportFrequencySeconds: 180
           elastAlertRulesFolder: /opt/sensoroni/elastalert
           rulesFingerprintFile: /opt/sensoroni/fingerprints/sigma.fingerprint
-          sigmaRulePackages: all
+          sigmaRulePackages: core
         elastic:
           hostUrl:
           remoteHostUrls: []
@@ -1050,10 +1050,10 @@ soc:
             - rbac/users_roles
         strelkaengine:
           compileYaraPythonScriptPath: /opt/so/conf/strelka/compile_yara.py
-          reposFolder: /nsm/rules/strelka/repos
+          reposFolder: /opt/sensoroni/yara/repos
           rulesRepos:
           - https://github.com/Security-Onion-Solutions/securityonion-yara
-          yaraRulesFolder: /opt/sensoroni/yara
+          yaraRulesFolder: /opt/sensoroni/yara/rules
         suricataengine:
           communityRulesFile: /nsm/rules/suricata/emerging-all.rules
           rulesFingerprintFile: /opt/sensoroni/fingerprints/emerging-all.fingerprint
@@ -1770,21 +1770,23 @@ soc:
               - so_detection.title
               - so_detection.isEnabled
               - so_detection.language
-              - "@timestamp"
+              - so_detection.severity
           queries:
             - name: "All Detections"
               query: "_id:*"
-            - name: "Local Rules"
+            - name: "Custom Detections"
               query: "so_detection.isCommunity:false"
-            - name: "Enabled"
+            - name: "All Detections - Enabled"
               query: "so_detection.isEnabled:true"
-            - name: "Disabled"
+            - name: "All Detections - Disabled"
               query: "so_detection.isEnabled:false"
-            - name: "Suricata"
+            - name: "Detection Type - Suricata (NIDS)"
               query: "so_detection.language:suricata"
-            - name: "Sigma"
+            - name: "Detection Type - Sigma - All"
               query: "so_detection.language:sigma"
-            - name: "Yara"
+            - name: "Detection Type - Sigma - Windows"
+              query: 'so_detection.language:sigma AND so_detection.content: "*product: windows*"'
+            - name: "Detection Type - Yara (Strelka)"
               query: "so_detection.language:yara"
         detection:
           presets:
diff --git a/salt/soc/enabled.sls b/salt/soc/enabled.sls
index 535423179..7c04da825 100644
--- a/salt/soc/enabled.sls
+++ b/salt/soc/enabled.sls
@@ -23,7 +23,7 @@ so-soc:
         - ipv4_address: {{ DOCKER.containers['so-soc'].ip }}
     - binds:
       - /nsm/rules:/nsm/rules:rw #Need to tighten this up?
-      - /opt/so/rules/yara:/opt/sensoroni/yara:rw
+      - /opt/so/conf/strelka:/opt/sensoroni/yara:rw
       - /opt/so/rules/elastalert/rules:/opt/sensoroni/elastalert:rw
       - /opt/so/conf/soc/fingerprints:/opt/sensoroni/fingerprints:rw
       - /nsm/soc/jobs:/opt/sensoroni/jobs:rw
diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index f413b5c73..fe0458820 100644
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -72,7 +72,7 @@ soc:
       modules:
         elastalertengine:
           sigmaRulePackages:
-            description: 'One of the following: core | core+ | core++ | all'
+            description: 'Defines the Sigma Community Ruleset you want to run: core | core+ | core++ | all.  -- WARNING -- Changing the ruleset will remove all existing Sigma rules of the previous ruleset and their associated overrides.'
             global: True
             advanced: False
         elastic: