From 2b1c183ddfa49b253227498ef2d8d72dbdab8a88 Mon Sep 17 00:00:00 2001 From: melpike <79950145+melpike@users.noreply.github.com> Date: Mon, 20 Jul 2026 13:04:46 -0600 Subject: [PATCH 1/6] Document default team configuration for Autopilot hosts Added instructions for setting a default team for Autopilot-enrolled hosts in Windows MDM. --- articles/windows-mdm-setup.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index c05d8ae360f..5f4e068d670 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -219,6 +219,29 @@ Testing automatic enrollment requires creating a test user in Microsoft Entra ID 2. After it's been wiped, open your workstation and follow the setup steps. On the screen in which you're asked to sign in, you should see the title "Welcome to [your organization]!" next to the logo you uploaded in step 4. +### Set a default team for Autopilot-enrolled hosts + +_Available in Fleet Premium_ + +By default, Windows hosts enrolled via Autopilot are added to "No team." You can configure a default team so that Autopilot-enrolled hosts are automatically assigned to a specific team — similar to how [Apple Business Manager default teams](https://fleetdm.com/guides/macos-mdm-setup#set-a-default-team-for-hosts-enrolled-via-abm) work. + +#### In the UI + +1. Head to **Settings > Integrations > MDM > Windows MDM**. + +2. Under **Automatic enrollment**, use the **Default team** dropdown to select the team that automatically enrolled (Windows Autopilot) hosts should be assigned to. + +3. Select **Save**. + +#### Via GitOps (YAML) + +Add the `windows_autopilot_default_team` key under `mdm` in your global (org) settings YAML file: + +```yaml + mdm: + windows_automatic_enrollment: + default_fleets: "💻 Workstations" +``` ## Automatic Windows MDM migration From 4c172f8bf4171b0e773b3a3b48a4091ba064299f Mon Sep 17 00:00:00 2001 From: melpike <79950145+melpike@users.noreply.github.com> Date: Fri, 24 Jul 2026 07:19:21 -0600 Subject: [PATCH 2/6] Update articles/windows-mdm-setup.md Co-authored-by: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com> --- articles/windows-mdm-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index 5f4e068d670..a7f8dd28524 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -235,7 +235,7 @@ By default, Windows hosts enrolled via Autopilot are added to "No team." You can #### Via GitOps (YAML) -Add the `windows_autopilot_default_team` key under `mdm` in your global (org) settings YAML file: +Add the `windows_automatic_enrollment` key under `mdm` in your global (org) settings YAML file: ```yaml mdm: From 92f5402a67f79c7ed84ec8a234e9013fa2e0d4ea Mon Sep 17 00:00:00 2001 From: melpike <79950145+melpike@users.noreply.github.com> Date: Fri, 24 Jul 2026 07:19:29 -0600 Subject: [PATCH 3/6] Update articles/windows-mdm-setup.md Co-authored-by: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com> --- articles/windows-mdm-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index a7f8dd28524..d4db25844f0 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -240,7 +240,7 @@ Add the `windows_automatic_enrollment` key under `mdm` in your global (org) sett ```yaml mdm: windows_automatic_enrollment: - default_fleets: "💻 Workstations" + default_fleet: "💻 Workstations" ``` ## Automatic Windows MDM migration From afca043ae424419fbd497571702fb66284cbeaef Mon Sep 17 00:00:00 2001 From: melpike <79950145+melpike@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:00:06 -0600 Subject: [PATCH 4/6] Revise MDM setup instructions for default fleet Updated terminology from 'team' to 'fleet' for clarity in MDM setup instructions. Adjusted steps for configuring default fleet for Autopilot-enrolled hosts. --- articles/windows-mdm-setup.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index d4db25844f0..d2c60d92cac 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -219,27 +219,27 @@ Testing automatic enrollment requires creating a test user in Microsoft Entra ID 2. After it's been wiped, open your workstation and follow the setup steps. On the screen in which you're asked to sign in, you should see the title "Welcome to [your organization]!" next to the logo you uploaded in step 4. -### Set a default team for Autopilot-enrolled hosts +### Set a default fleet for new hosts _Available in Fleet Premium_ -By default, Windows hosts enrolled via Autopilot are added to "No team." You can configure a default team so that Autopilot-enrolled hosts are automatically assigned to a specific team — similar to how [Apple Business Manager default teams](https://fleetdm.com/guides/macos-mdm-setup#set-a-default-team-for-hosts-enrolled-via-abm) work. +By default, Windows hosts enrolled via Autopilot are added to "Unassigned". You can configure a default fleet so that new hosts enrolled into MDM are automatically assigned to a specific fleet—similar to how [Apple Business default fleets](https://fleetdm.com/guides/macos-mdm-setup#set-a-default-team-for-hosts-enrolled-via-abm) work. #### In the UI -1. Head to **Settings > Integrations > MDM > Windows MDM**. +1. Head to **Settings > Integrations > MDM > Windows MDM** and select **Edit**. -2. Under **Automatic enrollment**, use the **Default team** dropdown to select the team that automatically enrolled (Windows Autopilot) hosts should be assigned to. +2. Under **User driven enrollment**, use the **Default team** dropdown to select the fleet that new hosts enrolled into MDM should be assigned to. 3. Select **Save**. #### Via GitOps (YAML) -Add the `windows_automatic_enrollment` key under `mdm` in your global (org) settings YAML file: +Add the `windows_enrollment` key under `mdm` in your global (org) settings YAML file: ```yaml mdm: - windows_automatic_enrollment: + windows_enrollment: default_fleet: "💻 Workstations" ``` From fa90ab984a58830d50c1ffdbffe5a29fb6ddb87f Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com> Date: Mon, 3 Aug 2026 21:27:25 +0000 Subject: [PATCH 5/6] Updated docs based on implementation and QA. --- articles/windows-mdm-setup.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index d2c60d92cac..8e4b7c220ee 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -223,13 +223,17 @@ Testing automatic enrollment requires creating a test user in Microsoft Entra ID _Available in Fleet Premium_ -By default, Windows hosts enrolled via Autopilot are added to "Unassigned". You can configure a default fleet so that new hosts enrolled into MDM are automatically assigned to a specific fleet—similar to how [Apple Business default fleets](https://fleetdm.com/guides/macos-mdm-setup#set-a-default-team-for-hosts-enrolled-via-abm) work. +By default, Windows hosts enrolled via Autopilot are added to "Unassigned". You can configure a default fleet so that new hosts enrolled into MDM are automatically assigned to a specific fleet, similar to how [Apple Business default fleets](https://fleetdm.com/guides/macos-mdm-setup#set-a-default-team-for-hosts-enrolled-via-abm) work. + +> **Note:** The default fleet applies only to hosts that enroll through end user-driven enrollment (Microsoft Entra). Hosts that install Fleet's agent before enrolling in MDM keep the fleet from their enroll secret instead. #### In the UI 1. Head to **Settings > Integrations > MDM > Windows MDM** and select **Edit**. -2. Under **User driven enrollment**, use the **Default team** dropdown to select the fleet that new hosts enrolled into MDM should be assigned to. +2. Under **User driven enrollment**, use the **Default fleet** dropdown to select the fleet that new hosts enrolled into MDM should be assigned to. + +> **Note:** The **Default fleet** dropdown is disabled until Fleet is connected to Microsoft Entra. Connect Entra first using the steps above. 3. Select **Save**. @@ -243,6 +247,19 @@ Add the `windows_enrollment` key under `mdm` in your global (org) settings YAML default_fleet: "💻 Workstations" ``` +To clear the default and send new hosts to "Unassigned", set `default_fleet` to an empty string (`""`). + +#### How hosts are assigned + +A host is assigned to the default fleet only when it enrolls in MDM before Fleet's agent is installed. That's the order Autopilot uses. Fleet applies the default at the moment it links the MDM enrollment to the host record, so: + +- Changing the default fleet affects only hosts that enroll after the change. Hosts already in Fleet stay where they are. +- Hosts that already exist in Fleet keep their current fleet when they re-enroll, including hosts you deliberately left in "Unassigned". +- Hosts you moved to another fleet manually aren't moved back to the default. +- Deleting the fleet you set as the default clears the setting, and new hosts go to "Unassigned" until you set a new one. + +> **Warning:** Some virtual machines report a placeholder hardware serial such as `System Serial Number` instead of a unique one. If two Windows hosts report the same serial, Fleet can link a host to the other host's MDM enrollment and assign it to the wrong fleet. This affects Windows MDM enrollment generally, not only default fleets. Configure unique serial numbers on your virtual machines. + ## Automatic Windows MDM migration Fleet can automatically migrate your Windows hosts from another MDM solution to Fleet without end user interaction. From 3de6a54c644b27cfd279ea674b4c0a87bca9860b Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com> Date: Tue, 4 Aug 2026 22:08:39 +0000 Subject: [PATCH 6/6] Doc fixes to match latest code changes. --- articles/windows-mdm-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/articles/windows-mdm-setup.md b/articles/windows-mdm-setup.md index 8e4b7c220ee..f6716060eaf 100644 --- a/articles/windows-mdm-setup.md +++ b/articles/windows-mdm-setup.md @@ -258,7 +258,7 @@ A host is assigned to the default fleet only when it enrolls in MDM before Fleet - Hosts you moved to another fleet manually aren't moved back to the default. - Deleting the fleet you set as the default clears the setting, and new hosts go to "Unassigned" until you set a new one. -> **Warning:** Some virtual machines report a placeholder hardware serial such as `System Serial Number` instead of a unique one. If two Windows hosts report the same serial, Fleet can link a host to the other host's MDM enrollment and assign it to the wrong fleet. This affects Windows MDM enrollment generally, not only default fleets. Configure unique serial numbers on your virtual machines. +> **Warning:** Some virtual machines report a placeholder hardware serial such as `System Serial Number` instead of a unique one. Fleet matches a new host to its MDM enrollment by serial number. If two or more unmatched enrollments share a serial, Fleet leaves the host in "Unassigned". This affects Windows MDM enrollment generally, not only default fleets. Configure unique serial numbers on your virtual machines. ## Automatic Windows MDM migration