diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index 2c1d37f73..0387cbef6 100644
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -114,79 +114,7 @@ soc:
       description: List of available external tools visible in the SOC UI. Each tool is defined in JSON object notation, and must include the "name" key and "link" key, where the link is the tool's URL.
       global: True
       advanced: True
-    hunt:
-      groupItemsPerPage:
-        description: Default number of aggregations to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      groupFetchLimit:
-        description: Default maximum number of aggregations to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      eventItemsPerPage:
-        description: Default number of items to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      eventFetchLimit:
-        description: Default maximum number of items to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      relativeTimeValue:
-        description: The duration of time to look backwards when searching for items. Used in combination with the relativeTimeUnit setting.
-        global: True
-      relativeTimeUnit:
-        description: The unit of time for the relativeTimeValue setting. Possible values are 10 (seconds), 20 (minutes), 30 (hours), 40 (days), 50 (weeks), and 60 (months).
-        global: True
-      mostRecentlyUsedLimit:
-        description: Number of items to show in the most recently used queries list. Larger values cause default queries to be located further down the list.
-        global: True
-      queries:
-        description: List of default queries to show in the query list. Each query is represented in JSON object notation, and must include the "name" key and "query" key.
-    alerts:
-      groupItemsPerPage:
-        description: Default number of aggregations to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      groupFetchLimit:
-        description: Default maximum number of aggregations to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      eventItemsPerPage:
-        description: Default number of items to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      eventFetchLimit:
-        description: Default maximum number of items to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      relativeTimeValue:
-        description: The duration of time to look backwards when searching for items. Used in combination with the relativeTimeUnit setting.
-        global: True
-      relativeTimeUnit:
-        description: The unit of time for the relativeTimeValue setting. Possible values are 10 (seconds), 20 (minutes), 30 (hours), 40 (days), 50 (weeks), and 60 (months).
-        global: True
-      mostRecentlyUsedLimit:
-        description: Number of items to show in the most recently used queries list. Larger values cause default queries to be located further down the list.
-        global: True
-      queries:
-        description: List of default queries to show in the query list. Each query is represented in JSON object notation, and must include the "name" key and "query" key.
-    cases:
-      groupItemsPerPage:
-        description: Default number of aggregations to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      groupFetchLimit:
-        description: Default maximum number of aggregations to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      eventItemsPerPage:
-        description: Default number of items to show per page. Larger values consume more vertical area in the SOC UI.
-        global: True
-      eventFetchLimit:
-        description: Default maximum number of items to retrieve per search. Larger values consume more bandwidth and server resources.
-        global: True
-      relativeTimeValue:
-        description: The duration of time to look backwards when searching for items. Used in combination with the relativeTimeUnit setting.
-        global: True
-      relativeTimeUnit:
-        description: The unit of time for the relativeTimeValue setting. Possible values are 10 (seconds), 20 (minutes), 30 (hours), 40 (days), 50 (weeks), and 60 (months).
-        global: True
-      mostRecentlyUsedLimit:
-        description: Number of items to show in the most recently used queries list. Larger values cause default queries to be located further down the list.
-        global: True
-      queries:
-        description: List of default queries to show in the query list. Each query is represented in JSON object notation, and must include the "name" key and "query" key.
-    dashboards:
+    hunt: &appSettings
       groupItemsPerPage:
         description: Default number of aggregations to show per page. Larger values consume more vertical area in the SOC UI.
         global: True
@@ -210,6 +138,9 @@ soc:
         global: True
       queries:
         description: List of default queries to show in the query list. Each query is represented in JSON object notation, and must include the "name" key and "query" key.
+    alerts: *appSettings
+    cases: *appSettings
+    dashboards: *appSettings
     case:
       analyzerNodeId:
         description: The node ID on which analyzers will be executed.