diff --git a/configure-debian-system.sh b/configure-debian-system.sh
index d531d98..6b52b53 100755
--- a/configure-debian-system.sh
+++ b/configure-debian-system.sh
@@ -25,6 +25,8 @@ ln ${TFTP}/pxelinux.cfg/default ${TFTP}/default -s
 
 # set file access
 chown ${USERID}:${GROUPID} * -R
+chmod a+rw * -R
+
 chown ${USERID}:${GROUPID} ${TFTP}/* -R
 chmod a+rwx ${TFTP} -R
 
diff --git a/configure-windows-pxeboot.sh b/configure-windows-pxeboot.sh
index 0453c5a..f790026 100644
--- a/configure-windows-pxeboot.sh
+++ b/configure-windows-pxeboot.sh
@@ -27,13 +27,19 @@ if [ -e $FILENAME ]; then
   7z x -aos -o./temp/waik $FILENAME
 fi
 
+# parse winpestart.bat
+cat ./resources/winpestart.bat | sed -e "s/__NFSSERVERIP__/${NFSSERVERIP}/g" > ./temp/winpestart.bat
+
 # Create winpe.iso
-if ! [ -e ./non-free/windows/winpe.iso ]; then
-  if [ -e ./temp/waik/WinPE.cab ]; then
-    mkwinpeimg --iso --arch=amd64 --waik-dir=./temp/waik --start-script=./resources/winpestart.bat ./non-free/windows/winpe.iso
-  fi
+if [ -e ./non-free/windows/winpe.iso ]; then
+ rm ./non-free/windows/winpe.iso
+fi
+if [ -e ./temp/waik/WinPE.cab ]; then
+ mkwinpeimg --iso --arch=amd64 --waik-dir=./temp/waik --start-script=./temp/winpestart.bat ./non-free/windows/winpe.iso
+ #mkwinpeimg --iso --arch=amd64 --waik-dir=./temp/waik ./non-free/windows/winpe.iso
 fi
 
+# download Deployment Toolkit
 DLURL="https://download.microsoft.com/download/3/3/9/339BE62D-B4B8-4956-B58D-73C4685FC492/MicrosoftDeploymentToolkit_x64.msi"
 FILENAME="./non-free/windows/MicrosoftDeploymentToolkit_x64.msi"
 if ! [ -e $FILENAME ]; then
diff --git a/resources/winpestart.bat b/resources/winpestart.bat
index d105c8c..82aa7e2 100644
--- a/resources/winpestart.bat
+++ b/resources/winpestart.bat
@@ -1,6 +1,14 @@
-rem ----------------------------
-rem WinPE Startfile:
-rem ----------------------------
+@echo off
+
+echo Init Network...
+wpeinit
+
+echo Mount CIFS-Share with Windows 10 DVD...
 net use z: \\__NFSSERVERIP__\windows
 z:
-setup.exe
\ No newline at end of file
+
+echo Start Windows Setup...
+setup.exe
+
+pause
+