diff --git a/xCAT-server/share/xcat/netboot/windows/genimage.cmd b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
index e075029f5..65546c7fa 100644
--- a/xCAT-server/share/xcat/netboot/windows/genimage.cmd
+++ b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
@@ -29,16 +29,16 @@ if [%3] EQU [bcdonly] set BCDONLY=1
 if [%WINPENAME%] NEQ [] set BOOTPATH=winboot\%WINPENAME%\Boot
 
 ::location where Windows PE from ADK install is located
-set adkpedir=%defdrive%\Program Files (x86)\Windows Kits\8.0\Assessment and Deployment Kit\Windows Preinstallation Environment
-set oscdimg=%defdrive%\Program Files (x86)\Windows Kits\8.0\Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg
+set adkpedir=%defdrive%\Program Files (x86)\Windows Kits\8.1\Assessment and Deployment Kit\Windows Preinstallation Environment
+set oscdimg=%defdrive%\Program Files (x86)\Windows Kits\8.1\Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg
 set WinPERoot=%adkpedir%
 set OSCDImgRoot=%oscdimg%
-set Path=C:\Program Files (x86)\Windows Kits\8.0\Assessment and Deployment Kit\Deployment Tools\amd64\DISM;%Path%
+set Path=C:\Program Files (x86)\Windows Kits\8.1\Assessment and Deployment Kit\Deployment Tools\amd64\DISM;%Path%
 
 ::clean the c:\winPE_amd64 and copy it from ADK
 if exist %defdrive%\WinPE_%SUFFIX% rd %defdrive%\WinPE_%SUFFIX% /s /q
 set retpath=%cd%
-cd "%adkpedir%"
+cd /d "%adkpedir%"
 call copype.cmd %ARCH% %defdrive%\WinPE_%SUFFIX%
 cd /d %retpath%