diff --git a/image/autounattend_BIOS_template.xml b/image/autounattend_BIOS_template.xml
index e1d143c..6e7e391 100644
--- a/image/autounattend_BIOS_template.xml
+++ b/image/autounattend_BIOS_template.xml
@@ -16,11 +16,13 @@
                 <WillShowUI>OnError</WillShowUI>
                 <Disk wcm:action="add">
                     <CreatePartitions>
+                        <!-- System partition -->
                         <CreatePartition wcm:action="add">
                             <Order>1</Order>
                             <Size>100</Size>
                             <Type>Primary</Type>
                         </CreatePartition>
+                        <!-- Windows partition -->
                         <CreatePartition wcm:action="add">
                             <Order>2</Order>
                             <Type>Primary</Type>
@@ -28,6 +30,7 @@
                         </CreatePartition>
                     </CreatePartitions>
                     <ModifyPartitions>
+                        <!-- System partition -->
                         <ModifyPartition wcm:action="add">
                             <Order>1</Order>
                             <PartitionID>1</PartitionID>
@@ -35,6 +38,7 @@
                             <Label>System</Label>
                             <Active>true</Active>
                         </ModifyPartition>
+                        <!-- Windows partition -->
                         <ModifyPartition wcm:action="add">
                             <Order>2</Order>
                             <PartitionID>2</PartitionID>
diff --git a/image/autounattend_UEFI_template.xml b/image/autounattend_UEFI_template.xml
index d45bd92..524f433 100644
--- a/image/autounattend_UEFI_template.xml
+++ b/image/autounattend_UEFI_template.xml
@@ -15,29 +15,36 @@
             <DiskConfiguration>
                 <WillShowUI>OnError</WillShowUI>
                 <Disk wcm:action="add">
+                    <DiskID>0</DiskID>
+                    <WillWipeDisk>true</WillWipeDisk>
                     <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>2</Order>
-                            <Type>EFI</Type>
-                            <Size>100</Size>
-                        </CreatePartition>
+                        <!-- Recovery partition -->
                         <CreatePartition wcm:action="add">
                             <Order>1</Order>
                             <Size>500</Size>
                             <Type>Primary</Type>
                         </CreatePartition>
+                        <!-- EFI system partition (ESP) -->
+                        <CreatePartition wcm:action="add">
+                            <Order>2</Order>
+                            <Type>EFI</Type>
+                            <Size>100</Size>
+                        </CreatePartition>
+                        <!-- Microsoft reserved partition (MSR) -->
+                        <CreatePartition wcm:action="add">
+                            <Order>3</Order>
+                            <Size>128</Size>
+                            <Type>MSR</Type>
+                        </CreatePartition>
+                        <!-- Windows partition -->
                         <CreatePartition wcm:action="add">
                             <Extend>true</Extend>
                             <Order>4</Order>
                             <Type>Primary</Type>
                         </CreatePartition>
-                        <CreatePartition wcm:action="add">
-                            <Order>3</Order>
-                            <Size>16</Size>
-                            <Type>MSR</Type>
-                        </CreatePartition>
                     </CreatePartitions>
                     <ModifyPartitions>
+                        <!-- Recovery partition -->
                         <ModifyPartition wcm:action="add">
                             <Order>1</Order>
                             <PartitionID>1</PartitionID>
@@ -45,26 +52,23 @@
                             <Label>WinRE</Label>
                             <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
                         </ModifyPartition>
-                        <ModifyPartition wcm:action="add">
-                            <Order>3</Order>
-                            <PartitionID>3</PartitionID>
-                        </ModifyPartition>
+                        <!-- EFI system partition (ESP) -->
                         <ModifyPartition wcm:action="add">
                             <Order>2</Order>
                             <PartitionID>2</PartitionID>
                             <Label>System</Label>
                             <Format>FAT32</Format>
                         </ModifyPartition>
+                        <!-- MSR partition does not need to be modified -->
+                        <!-- Windows partition -->
                         <ModifyPartition wcm:action="add">
-                            <Order>4</Order>
+                            <Order>3</Order>
                             <PartitionID>4</PartitionID>
                             <Letter>C</Letter>
                             <Label>Windows</Label>
                             <Format>NTFS</Format>
                         </ModifyPartition>
                     </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
                 </Disk>
             </DiskConfiguration>
             <ImageInstall>
@@ -112,10 +116,11 @@
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <OOBE>
                 <HideEULAPage>true</HideEULAPage>
+                <HideLocalAccountScreen>true</HideLocalAccountScreen>
                 <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
+                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
                 <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
                 <ProtectYourPC>1</ProtectYourPC>
-                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
             </OOBE>
             <UserAccounts>
                 <LocalAccounts>