diff --git a/it-and-security/default.yml b/it-and-security/default.yml
index e627ec4f7bd8..4b538c2d8d4f 100644
--- a/it-and-security/default.yml
+++ b/it-and-security/default.yml
@@ -79,3 +79,12 @@ org_settings:
 policies:
 queries:
   - path: ./lib/all/queries/collect-fleetd-update-channels.yml
+controls: 
+  enable_disk_encryption: true
+  macos_migration:
+    enable: true
+    mode: voluntary
+    webhook_url: $DOGFOOD_MACOS_MIGRATION_WEBHOOK_URL
+  windows_enabled_and_configured: true
+  windows_migration:
+    enable: true
diff --git a/it-and-security/teams/no-team.yml b/it-and-security/teams/no-team.yml
index ef6baf9e40fb..51ae2f8a0612 100644
--- a/it-and-security/teams/no-team.yml
+++ b/it-and-security/teams/no-team.yml
@@ -1,25 +1,4 @@
 name: No team
 policies:
-controls:
-  enable_disk_encryption: true
-  macos_migration:
-    enable: true
-    mode: voluntary
-    webhook_url: $DOGFOOD_MACOS_MIGRATION_WEBHOOK_URL
-  macos_settings:
-    custom_settings: null
-  macos_setup:
-    bootstrap_package: ""
-    enable_end_user_authentication: false
-    macos_setup_assistant: null
-  macos_updates:
-    deadline: "2023-06-13"
-    minimum_version: 13.4.1
-  windows_enabled_and_configured: true
-  windows_settings:
-    custom_settings: []
-  windows_updates:
-    deadline_days: 3
-    grace_period_days: 2
-  scripts: []
+queries:
 software: