diff --git a/.github/workflows/dogfood-gitops.yml b/.github/workflows/dogfood-gitops.yml
index 68fc00cee1..8b2e3217c0 100644
--- a/.github/workflows/dogfood-gitops.yml
+++ b/.github/workflows/dogfood-gitops.yml
@@ -78,5 +78,6 @@ jobs:
           DOGFOOD_SERVERS_CANARY_ENROLL_SECRET: ${{ secrets.DOGFOOD_SERVERS_CANARY_ENROLL_SECRET }}
           DOGFOOD_EXPLORE_DATA_ENROLL_SECRET: ${{ secrets.DOGFOOD_EXPLORE_DATA_ENROLL_SECRET }}
           DOGFOOD_CALENDAR_API_KEY: ${{ secrets.DOGFOOD_CALENDAR_API_KEY }}
-          DOGFOOD_VIRTUAL_MACHINES_ENROLL_SECRET: ${{ secrets.DOGFOOD_VIRTUAL_MACHINES_ENROLL_SECRET }}
-          DOGFOOD_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_IPHONES_ENROLL_SECRET }}
+          DOGFOOD_COMPLIANCE_EXCLUSIONS_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPLIANCE_EXCLUSIONS_ENROLL_SECRET }}
+          DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET }}
+          DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET }}
\ No newline at end of file
diff --git a/it-and-security/teams/company-owned-ipads.yml b/it-and-security/teams/company-owned-ipads.yml
new file mode 100644
index 0000000000..ef8c46a47b
--- /dev/null
+++ b/it-and-security/teams/company-owned-ipads.yml
@@ -0,0 +1,18 @@
+name: 🔳🏢 Company-owned iPads
+team_settings:
+  features:
+  host_expiry_settings:
+    host_expiry_enabled: false
+    host_expiry_window: 0
+  secrets:
+    - secret: $DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET
+  integrations:
+    google_calendar:
+      enable_calendar_events: false
+agent_options:
+controls:
+  macos_settings:
+    custom_settings:
+  scripts:
+policies:
+queries:
\ No newline at end of file
diff --git a/it-and-security/teams/iphones.yml b/it-and-security/teams/company-owned-iphones.yml
similarity index 52%
rename from it-and-security/teams/iphones.yml
rename to it-and-security/teams/company-owned-iphones.yml
index 193d65a814..badc8fa942 100644
--- a/it-and-security/teams/iphones.yml
+++ b/it-and-security/teams/company-owned-iphones.yml
@@ -1,38 +1,22 @@
-name: 📱 iPhones
+name: 📱🏢 Company-owned iPhones
 team_settings:
   features:
-    enable_host_users: true
-    enable_software_inventory: true
   host_expiry_settings:
     host_expiry_enabled: false
     host_expiry_window: 0
   secrets:
-    - secret: $DOGFOOD_IPHONES_ENROLL_SECRET
+    - secret: $DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET
   integrations:
     google_calendar:
       enable_calendar_events: false
 agent_options:
-  path: ../lib/agent-options.yml
 controls:
-  enable_disk_encryption: true
   macos_settings:
     custom_settings:
       - path: ../lib/configuration-profiles/ios-restrictions.mobileconfig
       - path: ../lib/configuration-profiles/ios-passcode-settings-ddm.json
       - path: ../lib/configuration-profiles/ios-lock-screen-message.mobileconfig
       - path: ../lib/configuration-profiles/ios-content-filtering.mobileconfig
-  macos_setup:
-    bootstrap_package: ""
-    enable_end_user_authentication: true
-    macos_setup_assistant: null
-  macos_updates:
-    deadline: ""
-    minimum_version: ""
-  windows_settings:
-    custom_settings: null
-  windows_updates:
-    deadline_days: 7
-    grace_period_days: 2
-  scripts: []
-policies: []
-queries: []
+  scripts:
+policies:
+queries:
diff --git a/it-and-security/teams/virtual-machines.yml b/it-and-security/teams/complaince-exclusions.yml
similarity index 74%
rename from it-and-security/teams/virtual-machines.yml
rename to it-and-security/teams/complaince-exclusions.yml
index cef82d618e..bf5a3896f7 100644
--- a/it-and-security/teams/virtual-machines.yml
+++ b/it-and-security/teams/complaince-exclusions.yml
@@ -1,4 +1,4 @@
-name: "Virtual machines"
+name: Compliance exclusions
 team_settings:
   features:
     enable_host_users: true
@@ -7,7 +7,7 @@ team_settings:
     host_expiry_enabled: false
     host_expiry_window: 0
   secrets:
-    - secret: $DOGFOOD_VIRTUAL_MACHINES_ENROLL_SECRET
+    - secret: $DOGFOOD_COMPLIANCE_EXCLUSIONS_ENROLL_SECRET
 agent_options:
   path: ../lib/agent-options.yml
 controls: