diff --git a/it-and-security/default.yml b/it-and-security/default.yml
index c94732459b..9d1b126ebf 100644
--- a/it-and-security/default.yml
+++ b/it-and-security/default.yml
@@ -86,3 +86,4 @@ org_settings:
 policies:
 queries:
   - path: ./lib/collect-fleetd-update-channels.queries.yml
+software:
diff --git a/it-and-security/teams/company-owned-ipads.yml b/it-and-security/teams/company-owned-ipads.yml
index ef8c46a47b..3d5cdbaf3b 100644
--- a/it-and-security/teams/company-owned-ipads.yml
+++ b/it-and-security/teams/company-owned-ipads.yml
@@ -15,4 +15,5 @@ controls:
     custom_settings:
   scripts:
 policies:
-queries:
\ No newline at end of file
+queries:
+software:
diff --git a/it-and-security/teams/company-owned-iphones.yml b/it-and-security/teams/company-owned-iphones.yml
index badc8fa942..7a1071fcff 100644
--- a/it-and-security/teams/company-owned-iphones.yml
+++ b/it-and-security/teams/company-owned-iphones.yml
@@ -20,3 +20,4 @@ controls:
   scripts:
 policies:
 queries:
+software:
diff --git a/it-and-security/teams/compliance-exclusions.yml b/it-and-security/teams/compliance-exclusions.yml
index bf5a3896f7..b6d81cafa8 100644
--- a/it-and-security/teams/compliance-exclusions.yml
+++ b/it-and-security/teams/compliance-exclusions.yml
@@ -13,3 +13,4 @@ agent_options:
 controls:
 policies:
 queries:
+software:
diff --git a/it-and-security/teams/explore-data.yml b/it-and-security/teams/explore-data.yml
index abea724c2a..eecc64965d 100644
--- a/it-and-security/teams/explore-data.yml
+++ b/it-and-security/teams/explore-data.yml
@@ -41,3 +41,4 @@ controls:
 policies:
 queries:
   - path: ../lib/explore-data.queries.yml
+software:
diff --git a/it-and-security/teams/servers-canary.yml b/it-and-security/teams/servers-canary.yml
index 4911176def..e324a8ab4d 100644
--- a/it-and-security/teams/servers-canary.yml
+++ b/it-and-security/teams/servers-canary.yml
@@ -29,3 +29,4 @@ controls:
   scripts:
 policies:
 queries:
+software:
diff --git a/it-and-security/teams/servers.yml b/it-and-security/teams/servers.yml
index c43085a695..5d9e4586a6 100644
--- a/it-and-security/teams/servers.yml
+++ b/it-and-security/teams/servers.yml
@@ -29,3 +29,4 @@ controls:
   scripts:
 policies:
 queries:
+software:
diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml
index 27ab9430ee..b2dc428fd5 100644
--- a/it-and-security/teams/workstations-canary.yml
+++ b/it-and-security/teams/workstations-canary.yml
@@ -143,3 +143,4 @@ queries:
   - path: ../lib/collect-software-permissions-system.queries.yml
   - path: ../lib/collect-software-permissions-user.queries.yml
   - path: ../lib/collect-crowdstrike-info.queries.yml
+software:
diff --git a/it-and-security/teams/workstations.yml b/it-and-security/teams/workstations.yml
index 1e6981a0b3..955c489b49 100644
--- a/it-and-security/teams/workstations.yml
+++ b/it-and-security/teams/workstations.yml
@@ -76,7 +76,8 @@ queries:
     automations_enabled: false
     observer_can_run: true
 software:
-  - url: https://zoom.us/client/latest/Zoom.pkg?archType=arm64
-    pre_install_query: 
-      path: ../lib/macos-check-if-apple-silicon.queries.yml
-    self_service: true
+  packages:
+    - url: https://zoom.us/client/latest/Zoom.pkg?archType=arm64
+      pre_install_query:
+        path: ../lib/macos-check-if-apple-silicon.queries.yml
+      self_service: true