diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
index 0c1a45484..b1c36961f 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
@@ -111,7 +111,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
             <ProductKey>#TABLE:prodkey:$NODE,product=win2k8r2.enterprise:key#</ProductKey>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
index f422eb561..a240689bc 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
@@ -121,7 +121,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
             <ProductKey>#TABLE:prodkey:$NODE,product=win2k8r2.enterprise:key#</ProductKey>
         </component>
     </settings>
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 583c38f94..c6891d8a9 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
@@ -70,7 +70,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
         </component>
     </settings>
     <settings pass="offlineServicing">
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
index 4d52ae564..4eeb53c92 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
@@ -80,7 +80,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
         </component>
     </settings>
     <settings pass="offlineServicing">
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 b32f60526..97d860045 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
@@ -129,7 +129,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
         </component>
     </settings>
     <settings pass="auditSystem">
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
index bb92c4f91..809f58fc4 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
@@ -139,7 +139,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
         </component>
     </settings>
     <settings pass="auditSystem">
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 d631ea997..3d9d84ea6 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
@@ -74,7 +74,7 @@
         </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>
+            <TimeZone>#WINTIMEZONE#</TimeZone>
         </component>
     </settings>
     <settings pass="offlineServicing">