diff --git a/default.yml b/default.yml
index e6f38c7a..7db0a067 100644
--- a/default.yml
+++ b/default.yml
@@ -17,3 +17,6 @@ org_settings:
     org_name: Fleet
   secrets:
     - secret: "$FLEET_GLOBAL_ENROLL_SECRET"
+  features:
+    enable_host_users: true
+    enable_software_inventory: true
diff --git a/teams/workstations-canary.yml b/teams/workstations-canary.yml
index 1187ab51..5ffc375d 100644
--- a/teams/workstations-canary.yml
+++ b/teams/workstations-canary.yml
@@ -24,4 +24,8 @@ controls:
 team_settings:
   secrets:
     - secret: "$FLEET_WORKSTATIONS_CANARY_ENROLL_SECRET"
+  features:
+    enable_host_users: true
+    enable_software_inventory: true
 software:
+
diff --git a/teams/workstations.yml b/teams/workstations.yml
index deacfdc3..d818561d 100644
--- a/teams/workstations.yml
+++ b/teams/workstations.yml
@@ -24,4 +24,7 @@ controls:
 team_settings:
   secrets:
     - secret: "$FLEET_WORKSTATIONS_ENROLL_SECRET"
+  features:
+    enable_host_users: true
+    enable_software_inventory: true
 software: