diff --git a/lib/images/windows/templates/generalize.nix b/lib/images/windows/templates/generalize.nix
index 3b4d3fe..ed37374 100644
--- a/lib/images/windows/templates/generalize.nix
+++ b/lib/images/windows/templates/generalize.nix
@@ -247,11 +247,20 @@ in
     <?xml version="1.0" encoding="utf-8"?>
     <unattend xmlns="urn:schemas-microsoft-com:unattend"
               xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-      <!-- Copy Administrator profile to default (preserves Audit Mode customizations) -->
+      <!-- CopyProfile bakes the Audit Mode customizations into the Default
+           profile, but it is dropped when profiles are being relocated: the
+           two interfere, and sysprep picking a profile to copy while the
+           profile root is moving underneath it is the likelier reason a
+           correctly formatted data volume came back holding nothing. Having a
+           profile that persists matters more than the customizations do.
+
+           FolderLocations appears in both passes on purpose. Which one
+           actually honours it is not something the documentation is crisp
+           about, and naming it twice costs nothing. -->
       <settings pass="specialize">
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64"
                    publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-          <CopyProfile>true</CopyProfile>
+${lib.optionalString (profilesDirectory == null) "          <CopyProfile>true</CopyProfile>"}
           <Themes>
             <WindowColor>Automatic</WindowColor>
           </Themes>
@@ -302,6 +311,7 @@ ${dataDiskXml}
             <Username>${username}</Username>
           </AutoLogon>
           <ComputerName>${hostname}</ComputerName>
+${folderLocationsXml}
           <TimeZone>${timezone}</TimeZone>
           <FirstLogonCommands>
             <SynchronousCommand wcm:action="add">