diff --git a/assets/win2016-eval.xml b/assets/win2016-eval.xml
index 5798d010..b0756d78 100644
--- a/assets/win2016-eval.xml
+++ b/assets/win2016-eval.xml
@@ -217,8 +217,6 @@
         <SkipMachineOOBE>true</SkipMachineOOBE>
         <SkipUserOOBE>true</SkipUserOOBE>
       </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</RegisteredOwner>
       <FirstLogonCommands>
         <SynchronousCommand wcm:action="add">
           <Order>1</Order>
diff --git a/assets/win2019-eval.xml b/assets/win2019-eval.xml
index 3353ef85..f3025bd8 100644
--- a/assets/win2019-eval.xml
+++ b/assets/win2019-eval.xml
@@ -217,8 +217,6 @@
         <SkipMachineOOBE>true</SkipMachineOOBE>
         <SkipUserOOBE>true</SkipUserOOBE>
       </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</RegisteredOwner>
       <FirstLogonCommands>
         <SynchronousCommand wcm:action="add">
           <Order>1</Order>
diff --git a/assets/win2022-eval.xml b/assets/win2022-eval.xml
index dd51baaa..4ded85c8 100644
--- a/assets/win2022-eval.xml
+++ b/assets/win2022-eval.xml
@@ -217,8 +217,6 @@
         <SkipMachineOOBE>true</SkipMachineOOBE>
         <SkipUserOOBE>true</SkipUserOOBE>
       </OOBE>
-      <RegisteredOrganization>Organization</RegisteredOrganization>
-      <RegisteredOwner>Owner</RegisteredOwner>
       <FirstLogonCommands>
         <SynchronousCommand wcm:action="add">
           <Order>1</Order>
diff --git a/assets/win7x64-ultimate.xml b/assets/win7x64-ultimate.xml
index d4a555e1..322450ae 100644
--- a/assets/win7x64-ultimate.xml
+++ b/assets/win7x64-ultimate.xml
@@ -49,6 +49,7 @@
               <PartitionID>1</PartitionID>
               <Label>WINRE</Label>
               <Format>NTFS</Format>
+              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
             </ModifyPartition>
             <!-- System partition (ESP) -->
             <ModifyPartition wcm:action="add">
@@ -69,7 +70,6 @@
               <Label>Windows</Label>
               <Letter>C</Letter>
               <Format>NTFS</Format>
-              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
             </ModifyPartition>
           </ModifyPartitions>
         </Disk>
@@ -180,8 +180,6 @@
         <SkipUserOOBE>true</SkipUserOOBE>
         <SkipMachineOOBE>true</SkipMachineOOBE>
       </OOBE>
-      <RegisteredOrganization/>
-      <RegisteredOwner>Docker</RegisteredOwner>
       <FirstLogonCommands>
         <SynchronousCommand wcm:action="add">
           <Order>1</Order>
diff --git a/assets/win81x64.xml b/assets/win81x64.xml
index 9354c802..7e4fe1dd 100644
--- a/assets/win81x64.xml
+++ b/assets/win81x64.xml
@@ -49,6 +49,7 @@
               <PartitionID>1</PartitionID>
               <Label>WINRE</Label>
               <Format>NTFS</Format>
+              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
             </ModifyPartition>
             <!-- System partition (ESP) -->
             <ModifyPartition wcm:action="add">
@@ -69,7 +70,6 @@
               <Label>Windows</Label>
               <Letter>C</Letter>
               <Format>NTFS</Format>
-              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
             </ModifyPartition>
           </ModifyPartitions>
         </Disk>
@@ -180,8 +180,6 @@
         <SkipUserOOBE>true</SkipUserOOBE>
         <SkipMachineOOBE>true</SkipMachineOOBE>
       </OOBE>
-      <RegisteredOrganization/>
-      <RegisteredOwner>Docker</RegisteredOwner>
       <FirstLogonCommands>
         <SynchronousCommand wcm:action="add">
           <Order>1</Order>