diff --git a/autoinstall/Windows/win_server/bios/Autounattend.xml b/autoinstall/Windows/win_server/bios/Autounattend.xml
index 55fa41023..82173f536 100755
--- a/autoinstall/Windows/win_server/bios/Autounattend.xml
+++ b/autoinstall/Windows/win_server/bios/Autounattend.xml
@@ -15,7 +15,7 @@
                     {% else %}
                     <Key>WMDGN-G9PQG-XVVXX-R3X43-63DFG</Key>
                     {% endif %}
-                    <WillShowUI>Never</WillShowUI>
+                    <WillShowUI>OnError</WillShowUI>
                 </ProductKey>
                 <AcceptEula>true</AcceptEula>
             </UserData>
@@ -30,15 +30,16 @@
                     <InstallTo>
                         <DiskID>0</DiskID>
                         <PartitionID>2</PartitionID>
-                    </InstallTo>
-                </OSImage>
+		    </InstallTo>
+		    <WillShowUI>OnError</WillShowUI>
+	        </OSImage>
             </ImageInstall>
             <DiskConfiguration>
                 <Disk wcm:action="add">
                     <CreatePartitions>
                         <CreatePartition wcm:action="add">
                             <Order>1</Order>
-                            <Size>549</Size>
+                            <Size>100</Size>
                             <Type>Primary</Type>
                         </CreatePartition>
                         <CreatePartition wcm:action="add">
@@ -56,10 +57,10 @@
                             <Active>true</Active>
                         </ModifyPartition>
                         <ModifyPartition wcm:action="add">
-                            <Order>2</Order>
-                            <PartitionID>2</PartitionID>
-                            <Label>Windows</Label>
-                            <Format>NTFS</Format>
+                          <Order>2</Order>
+                          <PartitionID>2</PartitionID>
+                          <Label>Windows</Label>
+                          <Format>NTFS</Format>
                         </ModifyPartition>
                     </ModifyPartitions>
                     <DiskID>0</DiskID>
@@ -77,6 +78,11 @@
             </DriverPaths>
         </component>
     </settings>
+    <settings pass="specialize">
+	<component name="Microsoft-Windows-ServerManager-SvrMgrNc" 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">
+	    <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon>
+        </component>
+    </settings>
     <settings pass="oobeSystem">
         <component name="Microsoft-Windows-International-Core" 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">
             <InputLocale>en-US</InputLocale>
@@ -139,5 +145,5 @@
             </FirstLogonCommands>
         </component>
     </settings>
-    <cpi:offlineImage cpi:source="catalog://desktop-pumkr1e/users/test/downloads/share/0621/install_windows server 2019 serverdatacenter.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
+    <cpi:offlineImage cpi:source="wim:C:/install.wim#Windows Server 2025 SERVERDATACENTER" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>
diff --git a/autoinstall/Windows/win_server/efi/Autounattend.xml b/autoinstall/Windows/win_server/efi/Autounattend.xml
index 24e047f1a..5eda1ae68 100755
--- a/autoinstall/Windows/win_server/efi/Autounattend.xml
+++ b/autoinstall/Windows/win_server/efi/Autounattend.xml
@@ -15,7 +15,7 @@
                     {% else %}
                     <Key>WMDGN-G9PQG-XVVXX-R3X43-63DFG</Key>
                     {% endif %}
-                    <WillShowUI>Never</WillShowUI>
+                    <WillShowUI>OnError</WillShowUI>
                 </ProductKey>
                 <AcceptEula>true</AcceptEula>
             </UserData>
@@ -30,7 +30,8 @@
                     <InstallTo>
                         <DiskID>0</DiskID>
                         <PartitionID>4</PartitionID>
-                    </InstallTo>
+		    </InstallTo>
+                    <WillShowUI>OnError</WillShowUI>
                 </OSImage>
             </ImageInstall>
             <DiskConfiguration>
@@ -38,24 +39,24 @@
                     <CreatePartitions>
                         <CreatePartition wcm:action="add">
                             <Order>1</Order>
-                            <Size>499</Size>
+                            <Size>596</Size>
                             <Type>Primary</Type>
                         </CreatePartition>
                         <CreatePartition wcm:action="add">
                             <Order>2</Order>
-                            <Size>99</Size>
+                            <Size>100</Size>
                             <Type>EFI</Type>
+		        </CreatePartition>
+                        <CreatePartition wcm:action="add">
+                            <Order>3</Order>
+                            <Size>128</Size>
+                            <Type>MSR</Type>
                         </CreatePartition>
                         <CreatePartition wcm:action="add">
                             <Order>4</Order>
                             <Type>Primary</Type>
                             <Extend>true</Extend>
                         </CreatePartition>
-                        <CreatePartition wcm:action="add">
-                            <Order>3</Order>
-                            <Size>128</Size>
-                            <Type>MSR</Type>
-                        </CreatePartition>
                     </CreatePartitions>
                     <ModifyPartitions>
                         <ModifyPartition wcm:action="add">
@@ -63,23 +64,23 @@
                             <PartitionID>1</PartitionID>
                             <Label>Recovery</Label>
                             <Format>NTFS</Format>
-							              <typeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</typeID>
-                        </ModifyPartition>
-                        <ModifyPartition wcm:action="add">
-                            <Order>4</Order>
-                            <PartitionID>4</PartitionID>
-                            <Label>Windows</Label>
-                            <Format>NTFS</Format>
+		            <typeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</typeID>
                         </ModifyPartition>
                         <ModifyPartition wcm:action="add">
                             <Order>2</Order>
                             <PartitionID>2</PartitionID>
-							              <Format>FAT32</Format>
+			    <Format>FAT32</Format>
                             <Label>System</Label>
                         </ModifyPartition>
-						            <ModifyPartition wcm:action="add">
+			    <ModifyPartition wcm:action="add">
                             <Order>3</Order>
                             <PartitionID>3</PartitionID>
+		        </ModifyPartition>
+                        <ModifyPartition wcm:action="add">
+                            <Order>4</Order>
+                            <PartitionID>4</PartitionID>
+                            <Label>Windows</Label>
+                            <Format>NTFS</Format>
                         </ModifyPartition>
                     </ModifyPartitions>
                     <DiskID>0</DiskID>
@@ -97,6 +98,11 @@
             </DriverPaths>
         </component>
     </settings>
+    <settings pass="specialize">
+        <component name="Microsoft-Windows-ServerManager-SvrMgrNc" 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">
+            <DoNotOpenServerManagerAtLogon>true</DoNotOpenServerManagerAtLogon>
+        </component>
+    </settings>
     <settings pass="oobeSystem">
         <component name="Microsoft-Windows-International-Core" 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">
             <InputLocale>en-US</InputLocale>
@@ -159,5 +165,5 @@
             </FirstLogonCommands>
         </component>
     </settings>
-    <cpi:offlineImage cpi:source="wim://desktop-pumkr1e/users/test/downloads/share/0621/install.wim#Windows Server 2019 SERVERDATACENTER" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
+    <cpi:offlineImage cpi:source="wim:C:/install.wim#Windows Server 2025 SERVERDATACENTER" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>