diff --git a/image/autounattend_UEFI_template.xml b/image/autounattend_UEFI_template.xml
index 3540816..1db148e 100644
--- a/image/autounattend_UEFI_template.xml
+++ b/image/autounattend_UEFI_template.xml
@@ -13,9 +13,8 @@
         </component>
         <component name="Microsoft-Windows-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">
             <DiskConfiguration>
+                <WillShowUI>OnError</WillShowUI>
                 <Disk wcm:action="add">
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
                     <CreatePartitions>
                         <!-- Recovery partition -->
                         <CreatePartition wcm:action="add">
@@ -68,8 +67,9 @@
                             <Format>NTFS</Format>
                         </ModifyPartition>
                     </ModifyPartitions>
+                <DiskID>0</DiskID>
+                <WillWipeDisk>true</WillWipeDisk>
                 </Disk>
-                <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <ImageInstall>
                 <OSImage>