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
new file mode 100755
index 000000000..f7c071740
--- /dev/null
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
@@ -0,0 +1,107 @@
+
+
+
+
+
+ en-US
+
+ 0409:00000409
+ en-US
+ en-US
+
+
+
+
+
+
+ 1
+ Primary
+ true
+
+
+ 0
+ true
+
+ OnError
+
+
+
+
+
+ /IMAGE/NAME
+ Windows 8 Enterprise
+
+
+
+ 0
+ 1
+
+
+
+
+ true
+ xCAT USER
+ xCAT
+
+
+
+
+
+
+ #TABLE:site:key=domain:value#
+ #MACHINEPASSWORD#
+ true
+
+
+
+ true
+
+
+ false
+
+
+
+
+ true
+ Remote Desktop
+ all
+
+
+
+
+ #TABLE:nodelist:$NODE:node#
+ #WINTIMEZONE#
+
+
+
+
+
+
+ i:\drivers\win7\x86_64\Drivers
+
+
+
+
+
+
+
+ true
+ Other
+ 1
+
+
+
+
+
+
+ Administrators
+ Domain Admins
+
+ #TABLE:site:key=domain:value#
+
+
+
+
+
+
+
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi
new file mode 100755
index 000000000..1c6c22908
--- /dev/null
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi
@@ -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 8 Enterprise
+
+
+
+ 0
+ 3
+
+
+
+
+ true
+ xCAT USER
+ xCAT
+
+
+
+
+
+
+ #TABLE:site:key=domain:value#
+ #MACHINEPASSWORD#
+ true
+
+
+
+ true
+
+
+ false
+
+
+
+
+ true
+ Remote Desktop
+ all
+
+
+
+
+ #TABLE:nodelist:$NODE:node#
+ #WINTIMEZONE#
+
+
+
+
+
+
+ i:\drivers\win7\x86_64\Drivers
+
+
+
+
+
+
+
+ true
+ Other
+ 1
+
+
+
+
+
+
+ Administrators
+ Domain Admins
+
+ #TABLE:site:key=domain:value#
+
+
+
+
+
+
+
diff --git a/xCAT-server/share/xcat/netboot/windows/genimage.cmd b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
index 52cb30ed6..ac1f7ba46 100644
--- a/xCAT-server/share/xcat/netboot/windows/genimage.cmd
+++ b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
@@ -33,6 +33,7 @@ if [%ARCH%] EQU [amd64] copy %SystemDrive%\WinPE_%SUFFIX%\media\Boot\BCD.%SUFFI
dism /mount-image /imagefile:%SystemDrive%\WinPE_%SUFFIX%\media\Sources\boot.wim /index:1 /mountdir:%SystemDrive%\WinPE_%SUFFIX%\mount
+cd /d %retpath%
copy startnet.cmd %SystemDrive%\WinPE_%SUFFIX%\mount\Windows\system32
copy getnextserver.exe %SystemDrive%\WinPE_%SUFFIX%\mount\Windows\system32
rem copy "%SystemDrive%\Program Files\Windows AIK\Tools\%ARCH%\imagex.exe" %SystemDrive%\WinPE_%SUFFIX%\mount\Windows\system32