Autopilot v1 + v2 in Production : Combining Self-Deploying Kiosks and Corporate Device Preparation in a Single Intune Tenant

This Blog is talking about Cloud First environment only, hybrid environment not included.

1 – Why combine Autopilot v1 and v2?

Most organizations don’t have a single device type. A retail chain has point-of-sale kiosks in stores and corporate laptops for headquarters staff. A hospital has shared workstations in nursing stations and personal devices for physicians. A manufacturing company has floor terminals and engineer workstations.

Windows Autopilot v1 (Classic) and Autopilot v2 (Device Preparation) are not competitors , they’re complementary tools designed for different device lifecycle models. The real question isn’t “which one should I use?” but “which one should I use for each device type?”

Autopilot v1 : Self-DeployingAutopilot v2 : Device Preparation
Kiosk devices (single/multi-app)
Shared PCs in retail stores
Conference room devices
Zero-touch, zero user interaction
Hardware hash pre-imported
No user affinity
Corporate user laptops/desktops
Drop-shipped new hires
IT-issued personal devices
User-driven with DPP targeting
No hardware hash required
Full user affinity + per-user policies

The branching decision is simple: does the device have a hardware hash pre-imported in Intune? If yes → Autopilot v1 Self-Deploying path. If no → user signs in and the Autopilot v2 Device Preparation path evaluates. This single decision drives the entire flow.

2 – Architecture overview : the complete flowchart

The following mindmap represents the complete deployment architecture combining both Autopilot v1 and v2 in a single Intune tenant. Color coding: BLUE = v1 path GREEN = v2 path RED = common elements

Flow breakdown

The flow begins at OOBE. Every device hits the same entry point : Device Boot → OOBE. Two global guards apply before any Autopilot logic: the Prerequisites (UEFI, Secure Boot, TPM 2.0, Intune license) and the Enrollment Restrictions (Block personally-owned devices).

From there, the first decision is: does the device hardware hash exist in Intune?

If YES , the device enters the Autopilot v1 Self-Deploying path. The Self-Deploying profile is applied, the ESP runs in device setup phase only (no account setup, no user affinity), and the device lands on the lock screen. Depending on the device group assignment, it either becomes a kiosk (Assigned Access profile) or a shared PC (Shared PC Mode with cleanup on sign-out).

If NO , the user signs in with their Entra ID credentials. Intune evaluates two things in sequence: is the user a member of the Device Preparation Policy target group, AND does the device serial exist in the Corporate Device Identifiers list? If both conditions are met, the DPP applies, the device is automatically Entra joined and Intune enrolled, and the ESP runs both phases (device setup + account setup). If either condition fails, enrollment is blocked , this is the BYOD protection mechanism.

3 – v1 vs v2 side-by-side comparison

FeatureAutopilot v1 Self-DeployingAutopilot v2 Device Preparation
Hardware hash requiredYes , must be pre-importedNo
User interaction at OOBENone , fully automatedUser signs in
User affinityNoYes
ESP phasesDevice setup onlyDevice setup + Account setup
Targeting mechanismDevice group (via GroupTag)User group (DPP target)
Corporate ownershipAutomatic (hash = corporate)Via Corporate Device Identifiers
OS requirementWindows 10/11Windows 11 23H2+
App limit in profileNo hard limit10 apps max in DPP
Ideal use caseKiosk, shared PC, digital signageCorporate user laptops
TPM 2.0RequiredRequired

4 – Real-world scenarios

National retail chain : 200 stores + headquarters

Autopilot v1 (1,400 devices): All store kiosks and shared PCs are purchased in bulk. The OEM provides hardware hashes. Devices ship directly to stores an employee plugs them in, connects WiFi, and Self-Deploying takes over. Kiosks get a single-app Assigned Access profile (POS application). Shared PCs get Shared PC Mode with automatic cleanup on sign-out.

Autopilot v2 (250 devices): Corporate laptops for HQ staff are drop-shipped to employees’ homes. Serial numbers are uploaded to Corporate Device Identifiers. The employee starts the laptop, signs in, and the DPP provisions everything, M365, security policies, OneDrive KFM, Edge SSO.

Hospital network : shared clinical workstations + physician devices

Autopilot v1: 50 nursing station workstations deploy as shared PCs (account cleanup on sign-out, guest access disabled). Apps: EHR client, clinical tools. Security baselines: Defender, BitLocker, strict ASR rules. No per-user policies, clinicians sign in at the lock screen and get a clean session each time.

Autopilot v2: 80 physician laptops are drop-shipped with Corporate Device Identifiers. Full configuration: M365, OneDrive KFM for documentation templates, Edge SSO to the EHR portal, Windows Hello for Business for fast authentication between patient rooms.

Manufacturing plant : floor terminals + engineering workstations

Autopilot v1: 30 rugged floor terminals with single-app kiosk profile running the MES client. Self-Deploying + Assigned Access. USB disabled, camera blocked, network restricted to the MES VLAN via WiFi config profile.

Autopilot v2: 60 engineering workstations drop-shipped. Full corporate suite: M365, AutoCAD/SolidWorks as Win32 apps, OneDrive KFM, Credential Guard enabled (sensitive IP access).

5 – Prerequisites

Common (both paths)

RequirementDetails
LicensingIntune Plan 1 (M365 E3/E5, EMS E3/E5)
Entra IDP1 minimum (P2 for risk-based CA)
FirmwareUEFI + Secure Boot enabled
TPMTPM 2.0
NetworkInternet access during OOBE
Autopilot v1 : additionalAutopilot v2 : additional
Hardware hash imported in Intune
GroupTag assigned for targeting
Self-Deploying profile created
Device group (static or dynamic)
Windows 10 or 11
Windows 11 23H2+ (mandatory)
Device Preparation Policy created
User security group as DPP target
Static device group for policy assignment
Corporate Device Identifiers uploaded
Enrollment Restriction: block personal

6 – BYOD blocking strategy

Blocking BYOD works differently depending on the path.

v1 path : inherently protected

If the device hash exists in Intune, it’s a known corporate device. There’s no BYOD risk, the hash was explicitly imported by IT.

v2 path : requires two layers working together

This is the critical scenario: a user in the DPP target group buys a personal PC, starts it, and signs in with their work account during OOBE. Without protection, the DPP would enroll that personal PC as corporate.

The protection relies on two mechanisms combined:

  • Layer 1 – Enrollment Restrictions : In Devices → Enrollment → Platform restrictions, set Block personally-owned Windows devices. This prevents any device not recognized as corporate from enrolling.
  • Layer 2 – Corporate Device Identifiers : In Devices → Enrollment → Corporate device identifiers, upload the serial numbers of all purchased devices (from OEM order confirmations or CSV). When a device attempts enrollment, Intune checks this list. If the serial is present → device is classified as corporate-owned → Enrollment Restriction lets it through. If not → blocked.

Serial numbers must be uploaded to Intune before the employee powers on the device. Coordinate with procurement: get serial lists from the OEM order confirmation and upload them the day the order ships.

7 – Policy architecture : what goes where

The golden rule : 

  • v1 devices get device-scoped security baselines only.
  • v2 devices get both device-scoped and user-scoped policies.

Security baselines COMMON

Applied to all managed devices regardless of path:

PolicyKey settings
BitLockerSilent encryption, TPM-only protector
Microsoft DefenderReal-time protection, cloud-delivered
Tamper ProtectionEnabled
ASR RulesBlock Office macro code, credential stealing
FirewallAll profiles enabled
LAPSAuto rotation, Entra ID storage
SmartScreenBlock with override for Edge
WiFi ConfigurationCorporate SSID, cert-based auth

Kiosk/shared-specific V1 ONLY

PolicyAssigned to
Kiosk profile (Assigned Access)Kiosk device group
Shared PC Mode (cleanup on sign-out)Shared device group
USB storage blockBoth groups
Camera disabledKiosk devices only

Corporate user policies V2 ONLY

PolicyScope
OneDrive KFM (silent redirect)Device
Block personal OneDrive/Google/Dropbox uploadDevice
Edge Sign-in enforced with Entra IDUser
Edge SmartScreen + ScrewareUser
Windows Hello for BusinessDevice
PIN Complexity PolicyUser
Browser Favorites + SSOUser

Apps

  • v2 required apps (DPP : 10 max): M365 Apps, Defender, Chrome, PDF Reader, Company Portal. These install during ESP.
  • v2 business apps (per user/group): Line-of-business apps assigned via Intune groups. These install post-ESP in the background and don’t count toward the 10-app DPP limit.
  • v1 apps: Only the LOB kiosk app and antivirus. Deployed via device group assignment during ESP device setup.

Post-enrollment enforcement COMMON

After enrollment completes on either path, two layers enforce access to cloud resources :

  • Compliance policies evaluate device posture : BitLocker enabled, Defender active, OS version current, TPM present. Non-compliant devices are marked and given a grace period.
  • Conditional Access enforces access : require compliant + Entra-joined device for all cloud apps. Non-compliant devices lose access to M365, SaaS apps, and corporate resources until remediated.
  • WUfB Update Rings are configured separately: aggressive patching with auto-restart for kiosks, deferred updates with user-scheduled restarts for corporate laptops.

8 – Best practices

  • Separate device groups by function, not by Autopilot version. Create distinct groups for kiosk and shared devices , their policies differ fundamentally. Use GroupTags like KIOSK-STORE and SHARED-BACKOFFICE to differentiate at import time.
  • Keep the DPP app list lean. The 10-app limit is strict. Include only first-login essentials (M365, Defender, browser). Deploy departmental apps via group assignment , they install post-ESP and don’t count toward the limit.
  • Upload Corporate Device Identifiers before shipping devices. If drop-shipping to remote employees, serials must be in Intune before first power-on. Coordinate with procurement and your OEM.
  • Pilot both paths with 5-10 devices each. Verify: kiosks land on the correct app, shared PCs clean up on sign-out, corporate laptops get all policies, and personal devices are correctly blocked.
  • Don’t overlap WHfB between device and user scope. Configure Windows Hello for Business at one scope only. For v2, device-scoped via Settings Catalog. For v1 kiosks , don’t enable it at all.
  • Use distinct ESP configurations. v1 devices need a shorter timeout with device-setup-only ESP. v2 devices need both phases with a longer timeout (60 min) to accommodate the account setup and per-user app installs.
  • DPP requires static groups. Unlike v1 where dynamic groups (based on GroupTag) are standard, Device Preparation Policy only works with static security groups. The DPP auto-adds devices to the group, don’t create a dynamic group for this.

9 – Conclusion

Running Autopilot v1 and v2 side by side in a single tenant is the recommended approach for organizations with diverse device fleets. The key is understanding that each path serves a distinct purpose: v1 Self-Deploying for zero-touch kiosks and shared devices, v2 Device Preparation for corporate user endpoints where identity drives the enrollment.

The architecture provides three critical capabilities: automated provisioning for both device types with minimal IT intervention, BYOD protection through Corporate Device Identifiers + Enrollment Restrictions, and policy segregation ensuring kiosk devices get kiosk policies and corporate devices get the full user experience.

Autopilot v1 and v2 are not competing technologies. They’re complementary , and your devices will thank you for using the right tool for the right job.


Thanks

Aymen EL JAZIRI (Microsoft MVP)
Aymen EL JAZIRI (Microsoft MVP)

Hi, I’m Aymen El Jaziri , a passionate System Administrator and Microsoft MVP, with years of hands-on experience in managing and securing modern IT infrastructures.
This blog is where I share technical guides, automation scripts, product reviews, and real-world solutions that help IT professionals simplify their day-to-day work and stay ahead in a fast-evolving cloud ecosystem.
Whether you’re here to troubleshoot an issue, improve your automation game, or learn new best practices , welcome in my blog !
Let’s build a stronger, smarter IT community together.
Feel free to connect with me on LinkedIn for more content, discussions, or collaboration opportunities.

Thanks

Aymen

Articles: 154