diff --git a/playbook/FlatUnattendW10-engineer.xml b/playbook/FlatUnattendW10-engineer.xml
index 9508df7..df3a639 100644
--- a/playbook/FlatUnattendW10-engineer.xml
+++ b/playbook/FlatUnattendW10-engineer.xml
@@ -52,17 +52,12 @@
                versionScope="nonSxS">
       <RunSynchronous>
         <!-- EAP-PEAP MSI -->
-        <RunSynchronousCommand wcm:action="add">
-          <Order>1</Order>
-          <Path>msiexec /i "C:\Deploy\Applications\extra\wireless\EAP-PEAP.msi" /quiet /norestart</Path>
-          <Description>Install EAP-PEAP</Description>
-        </RunSynchronousCommand>
 
         <!-- Wi-Fi profiles -->
         <RunSynchronousCommand wcm:action="add">
-          <Order>2</Order>
-          <Path>cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\BLUESSO.xml" user=all</Path>
-          <Description>Add BLUESSO WiFi profile</Description>
+            <Order>1</Order>
+            <Path>cmd /c sc config wlansvc start= auto &amp; net start wlansvc &amp; exit /b 0</Path>
+            <Description>Start WLAN AutoConfig so the WiFi profile can be added</Description>
         </RunSynchronousCommand>
         <RunSynchronousCommand wcm:action="add">
           <Order>3</Order>
@@ -319,7 +314,7 @@
           <HideEULAPage>true</HideEULAPage>
           <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
           <HideOnlineAccountScreens>false</HideOnlineAccountScreens>
-          <HideWirelessSetupInOOBE>false</HideWirelessSetupInOOBE>
+          <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
           <HideLocalAccountScreen>true</HideLocalAccountScreen>
           <NetworkLocation>Work</NetworkLocation>
           <ProtectYourPC>3</ProtectYourPC>
diff --git a/playbook/FlatUnattendW10.xml b/playbook/FlatUnattendW10.xml
index cce77af..77cf446 100644
--- a/playbook/FlatUnattendW10.xml
+++ b/playbook/FlatUnattendW10.xml
@@ -52,17 +52,12 @@
                versionScope="nonSxS">
       <RunSynchronous>
         <!-- EAP-PEAP MSI -->
-        <RunSynchronousCommand wcm:action="add">
-          <Order>1</Order>
-          <Path>msiexec /i "C:\Deploy\Applications\extra\wireless\EAP-PEAP.msi" /quiet /norestart</Path>
-          <Description>Install EAP-PEAP</Description>
-        </RunSynchronousCommand>
 
         <!-- Wi-Fi profiles -->
         <RunSynchronousCommand wcm:action="add">
-          <Order>2</Order>
-          <Path>cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\BLUESSO.xml" user=all</Path>
-          <Description>Add BLUESSO WiFi profile</Description>
+            <Order>1</Order>
+            <Path>cmd /c sc config wlansvc start= auto &amp; net start wlansvc &amp; exit /b 0</Path>
+            <Description>Start WLAN AutoConfig so the WiFi profile can be added</Description>
         </RunSynchronousCommand>
         <RunSynchronousCommand wcm:action="add">
           <Order>3</Order>
@@ -319,7 +314,7 @@
           <HideEULAPage>true</HideEULAPage>
           <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
           <HideOnlineAccountScreens>false</HideOnlineAccountScreens>
-          <HideWirelessSetupInOOBE>false</HideWirelessSetupInOOBE>
+          <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
           <HideLocalAccountScreen>true</HideLocalAccountScreen>
           <NetworkLocation>Work</NetworkLocation>
           <ProtectYourPC>3</ProtectYourPC>