diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
index fe18d6a66..122b66d9e 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
@@ -55,18 +55,16 @@
         </component>
     </settings>
     <settings pass="offlineServicing">
+        <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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">
+            <DriverPaths>
+                <PathAndCredentials wcm:action="add" wcm:keyValue="1">
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                </PathAndCredentials>
+            </DriverPaths>
+        </component>
     </settings>
     <settings pass="oobeSystem">
         <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">
-            <!-- <AutoLogon>
-                <LogonCount>10</LogonCount>
-                <Enabled>true</Enabled>
-                <Username>Administrator</Username>
-                <Password>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon> -->
             <Display>
                 <ColorDepth>32</ColorDepth>
                 <HorizontalResolution>1024</HorizontalResolution>
@@ -120,30 +118,6 @@
         </component>
     </settings>
     <settings pass="auditSystem">
-        <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">
-            <!-- <AutoLogon>
-                <Enabled>true</Enabled>
-                <LogonCount>5</LogonCount>
-                <Username>Administrator</Username>
-                <Password>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </Password>
-            </AutoLogon> -->
-            <UserAccounts>
-                <AdministratorPassword>
-                    <Value>#TABLE:passwd:key=system,username=Administrator:password#</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
-            </UserAccounts>
-        </component>
-        <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" 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">
-            <DriverPaths>
-                <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
-                </PathAndCredentials>
-            </DriverPaths>
-        </component>
     </settings>
     <cpi:offlineImage cpi:source="wim:i:/win2k8/x86_64/sources/install.wim#Windows Longhorn SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>