diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
index 7a1b8ac10..fea5db501 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
@@ -14,11 +14,7 @@
         <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>
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-		    ==BOOTPARTITIONS==
-                </Disk>
+		    ==DISKCONFIG==
             </DiskConfiguration>
             <DynamicUpdate>
                 <Enable>false</Enable>
@@ -82,6 +78,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" 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">
             <fDenyTSConnections>false</fDenyTSConnections>
@@ -97,6 +94,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
index 2d7ef8086..98429bf47 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
@@ -11,12 +11,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>
-                <Disk wcm:action="add">
-                    <DiskID>==INSTALLTODISK==</DiskID>
-		    ==BOOTPARTITIONS==
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
                 <WillShowUI>OnError</WillShowUI>
+		    ==DISKCONFIG==
             </DiskConfiguration>
             <ImageInstall>
                 <OSImage>
@@ -39,6 +35,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-Security-SPP-UX" 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">
             <SkipAutoActivation>true</SkipAutoActivation>
@@ -57,6 +54,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
index f1dcc37e8..8991b8e42 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
@@ -11,12 +11,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>
-                <Disk wcm:action="add">
-		    ==BOOTPARTITIONS==
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
                 <WillShowUI>OnError</WillShowUI>
+                ==DISKCONFIG==
             </DiskConfiguration>
             <ImageInstall>
                 <OSImage>
@@ -39,6 +35,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-Security-SPP-UX" 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">
             <SkipAutoActivation>true</SkipAutoActivation>
@@ -57,6 +54,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
index cb2a790eb..6cb436c23 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
@@ -14,11 +14,7 @@
         <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>
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-		    ==BOOTPARTITIONS==
-                </Disk>
+                ==DISKCONFIG==
             </DiskConfiguration>
             <DynamicUpdate>
                 <Enable>false</Enable>
@@ -91,6 +87,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
      <component name="Microsoft-Windows-UnattendedJoin" 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">
             <Identification>
                <JoinDomain>#TABLE:site:key=domain:value#</JoinDomain>
@@ -112,6 +109,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		 <RunSynchronousCommand wcm:action="add">
 			<Order>100</Order>
 			<Path>cmd /c %systemroot%\system32\net.exe user Administrator /active:no</Path>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
index 84c1f02f8..44b871d67 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
@@ -14,11 +14,7 @@
         <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>
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-		    ==BOOTPARTITIONS==
-                </Disk>
+                ==DISKCONFIG==
             </DiskConfiguration>
             <DynamicUpdate>
                 <Enable>false</Enable>
@@ -82,6 +78,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" 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">
             <fDenyTSConnections>false</fDenyTSConnections>
@@ -97,6 +94,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
index b2bf083d2..d1f28ab20 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
@@ -14,11 +14,7 @@
         <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>
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-		    ==BOOTPARTITIONS==
-                </Disk>
+		    ==DISKCONFIG==
             </DiskConfiguration>
             <DynamicUpdate>
                 <Enable>false</Enable>
@@ -90,6 +86,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" 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">
             <fDenyTSConnections>false</fDenyTSConnections>
         </component>
@@ -103,6 +100,14 @@
             </FirewallGroups>
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
+        <RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
+        </RunSynchronous>
         </component>
         <component name="Microsoft-Windows-Shell-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">
             <ComputerName>#TABLE:nodelist:$NODE:node#</ComputerName>
diff --git a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
index f4b6a8f04..1a565f371 100755
--- a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
@@ -11,12 +11,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>
-                <Disk wcm:action="add">
-		    ==BOOTPARTITIONS==
-                    <DiskID>==INSTALLTODISK==</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
                 <WillShowUI>OnError</WillShowUI>
+		    ==DISKCONFIG==
             </DiskConfiguration>
             <ImageInstall>
                 <OSImage>
@@ -39,6 +35,7 @@
         </component>
     </settings>
     <settings pass="specialize">
+        #WINNETCFG#
         #WINADJOIN#
         <component name="Microsoft-Windows-Security-SPP-UX" 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">
             <SkipAutoActivation>true</SkipAutoActivation>
@@ -57,6 +54,12 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
 		<RunSynchronous>
+            <RunSynchronousCommand wcm:action="add">
+                <Description>StartPointOfPostscripts</Description>
+                <Order>50</Order>
+                <Path>cmd /c c:\xcatpost\xcatwinpost.vbs</Path>
+                <WillReboot>OnRequest</WillReboot>
+            </RunSynchronousCommand>
 		#WINDISABLENULLADMIN#
 		</RunSynchronous>
         </component>