diff --git a/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8r2.x86_64.tmpl
index c50878068..f422eb561 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8r2.x86_64.tmpl
@@ -48,16 +48,12 @@
                     <InstallFrom>
                         <MetaData wcm:action="add">
                             <Key>/IMAGE/INDEX</Key>
-                            <Value>2</Value>
+                            <Value>3</Value>
                         </MetaData>
                     </InstallFrom>
                 </OSImage>
             </ImageInstall>
             <UserData>
-                <ProductKey>
-                    <WillShowUI>OnError</WillShowUI>
-                    <Key>#TABLE:prodkey:$NODE,product=win2k8.enterprise:key#</Key>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>xCAT USER</FullName>
                 <Organization>xCAT</Organization>
@@ -125,9 +121,11 @@
         </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>
+            <TimeZone>#TABLE:site:key=wintimezone:value#</TimeZone>
+            <ProductKey>#TABLE:prodkey:$NODE,product=win2k8r2.enterprise:key#</ProductKey>
         </component>
     </settings>
     <settings pass="auditSystem">
     </settings>
-    <cpi:offlineImage cpi:source="wim:i:/win2k8/x86_64/sources/install.wim#Windows Longhorn SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
+    <cpi:offlineImage cpi:source="wim:i:/win2k8r2/x86_64/sources/install.wim#Windows Server 2008 R2 SERVERENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>