diff --git a/windows/http/Autounattend.xml.ISO.template b/windows/http/Autounattend.xml.ISO.template
index 769d395..25946eb 100644
--- a/windows/http/Autounattend.xml.ISO.template
+++ b/windows/http/Autounattend.xml.ISO.template
@@ -17,9 +17,14 @@
                             <Type>MSR</Type>
                         </CreatePartition>
                         <CreatePartition wcm:action="add">
-                            <Extend>true</Extend>
                             <Order>3</Order>
                             <Type>Primary</Type>
+                            <Size>768</Size>
+                        </CreatePartition>
+                        <CreatePartition wcm:action="add">
+                            <Order>4</Order>
+                            <Extend>true</Extend>
+                            <Type>Primary</Type>
                         </CreatePartition>
                     </CreatePartitions>
                     <ModifyPartitions>
@@ -30,9 +35,16 @@
                             <PartitionID>1</PartitionID>
                         </ModifyPartition>
                         <ModifyPartition wcm:action="add">
+                            <Label>WinRE</Label>
                             <Format>NTFS</Format>
                             <Order>2</Order>
+                            <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
                             <PartitionID>3</PartitionID>
+                        </ModifyPartition>
+                        <ModifyPartition wcm:action="add">
+                            <Format>NTFS</Format>
+                            <Order>3</Order>
+                            <PartitionID>4</PartitionID>
                             <Label>System</Label>
                         </ModifyPartition>
                     </ModifyPartitions>
@@ -43,7 +55,7 @@
             <ImageInstall>
                 <OSImage>
                     <InstallTo>
-                        <PartitionID>3</PartitionID>
+                        <PartitionID>4</PartitionID>
                         <DiskID>0</DiskID>
                     </InstallTo>
                     <InstallToAvailablePartition>false</InstallToAvailablePartition>
diff --git a/windows/windows.pkr.hcl b/windows/windows.pkr.hcl
index ec8656f..0adeccd 100644
--- a/windows/windows.pkr.hcl
+++ b/windows/windows.pkr.hcl
@@ -105,7 +105,7 @@ build {
       "source scripts/setup-nbd",
       "TMP_DIR=$(mktemp -d /tmp/packer-maas-XXXX)",
       "echo 'Adding curtin-hooks to image...'",
-      "mount -t ntfs $${nbd}p3 $TMP_DIR",
+      "mount -t ntfs $${nbd}p4 $TMP_DIR",
       "mkdir -p $TMP_DIR/curtin",
       "cp ./curtin/* $TMP_DIR/curtin/",
       "sync -f $TMP_DIR/curtin",