diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad_uefi.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_ad_uefi.win2k8.x86_64.tmpl
new file mode 100644
index 000000000..13cbcba0f
--- /dev/null
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad_uefi.win2k8.x86_64.tmpl
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+ en-US
+
+ en-US
+ en-US
+ en-US
+ 0409:00000409
+
+
+
+ OnError
+
+ 0
+ true
+
+
+ 1
+ EFI
+ 50
+
+
+ 2
+ MSR
+ 128
+
+
+ 3
+ Primary
+ true
+
+
+
+
+
+ false
+
+
+
+
+ 0
+ 3
+
+
+
+ /IMAGE/INDEX
+ 3
+
+
+
+
+
+ true
+ xCAT USER
+ xCAT
+
+
+
+
+
+
+
+ I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers
+
+
+
+
+
+
+
+ 32
+ 1024
+ 768
+
+
+ true
+ 1
+ false
+ false
+
+
+
+
+
+
+
+ Administrators
+ Domain Admins
+
+ #Table:site:key=domain:value#
+
+
+
+
+
+
+
+
+ 32
+ 1024
+ 768
+
+
+
+
+
+
+ #TABLE:site:key=domain:value#
+ #MACHINEPASSWORD#
+ true
+
+
+
+ false
+
+
+ 0
+
+
+
+
+ true
+ Remote Desktop
+ all
+
+
+
+
+
+
+ 100
+ cmd /c %systemroot%\system32\net.exe user Administrator /active:no
+
+
+
+
+ #TABLE:nodelist:$NODE:node#
+ #TABLE:site:key=wintimezone:value#
+
+
+
+
+
+
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8.x86_64.tmpl
new file mode 100644
index 000000000..c50878068
--- /dev/null
+++ b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win2k8.x86_64.tmpl
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+ en-US
+
+ en-US
+ en-US
+ en-US
+ 0409:00000409
+
+
+
+ OnError
+
+ 0
+ true
+
+
+ 1
+ EFI
+ 50
+
+
+ 2
+ MSR
+ 128
+
+
+ 3
+ Primary
+ true
+
+
+
+
+
+ false
+
+
+
+
+ 0
+ 3
+
+
+
+ /IMAGE/INDEX
+ 2
+
+
+
+
+
+
+ OnError
+ #TABLE:prodkey:$NODE,product=win2k8.enterprise:key#
+
+ true
+ xCAT USER
+ xCAT
+
+
+
+
+
+
+
+ I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers
+
+
+
+
+
+
+
+ 32
+ 1024
+ 768
+
+
+ true
+ 1
+ false
+ false
+
+
+
+
+
+ #TABLE:passwd:key=system,username=Administrator:password#
+ true
+
+
+
+
+
+
+
+ 32
+ 1024
+ 768
+
+
+
+
+
+ false
+
+
+ 0
+
+
+
+
+ true
+ Remote Desktop
+ all
+
+
+
+
+
+
+ #TABLE:nodelist:$NODE:node#
+
+
+
+
+
+
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_uefi.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win7.x86_64.tmpl
new file mode 100755
index 000000000..4d52ae564
--- /dev/null
+++ b/xCAT-server/share/xcat/install/windows/enterprise_uefi.win7.x86_64.tmpl
@@ -0,0 +1,117 @@
+
+
+
+
+
+ en-US
+
+ 0409:00000409
+ en-US
+ en-US
+
+
+
+
+
+
+ 1
+ EFI
+ 50
+
+
+ 2
+ MSR
+ 128
+
+
+ 3
+ Primary
+ true
+
+
+ 0
+ true
+
+ OnError
+
+
+
+
+
+ /IMAGE/NAME
+ Windows 7 ENTERPRISE
+
+
+
+ 0
+ 3
+
+
+
+
+ true
+ xCAT USER
+ xCAT
+
+
+
+
+
+
+ #TABLE:site:key=domain:value#
+ #MACHINEPASSWORD#
+ true
+
+
+
+ true
+
+
+ false
+
+
+
+
+ true
+ Remote Desktop
+ all
+
+
+
+
+ #TABLE:nodelist:$NODE:node#
+ #TABLE:site:key=wintimezone:value#
+
+
+
+
+
+
+ i:\drivers\win7\x86_64\Drivers
+
+
+
+
+
+
+
+ true
+ Other
+ 1
+
+
+
+
+
+
+ Administrators
+ Domain Admins
+
+ #TABLE:site:key=domain:value#
+
+
+
+
+
+
+