diff --git a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
index cfbf29a6d2f1..389e57a798d6 100644
--- a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
+++ b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
@@ -409,6 +409,9 @@ goto:eof
   call:serverEnv
   call:serverExists true
   if %RC% == 2 goto:eof
+  if not exist "!WLP_OUTPUT_DIR!\%SERVER_NAME%\logs" (
+     mkdir "!WLP_OUTPUT_DIR!\%SERVER_NAME%\logs"
+  )
   "!WLP_INSTALL_DIR!\bin\tools\win\prunsrv.exe"  //IS//%SERVER_NAME% --Startup=manual --DisplayName="%SERVER_NAME%" --Description="Open Liberty" ++DependsOn=Tcpip --LogPath="!WLP_OUTPUT_DIR!\%SERVER_NAME%\logs" --StdOutput=auto --StdError=auto --StartMode=exe --StartPath="%WLP_INSTALL_DIR%" --StartImage="%WLP_INSTALL_DIR%\bin\server.bat" ++StartParams=start#%SERVER_NAME% --StopMode=exe --StopPath="%WLP_INSTALL_DIR%" --StopImage="%WLP_INSTALL_DIR%\bin\server.bat" ++StopParams=stop#%SERVER_NAME% --ServiceUser=LocalSystem                                                                                                                          
   set RC=!errorlevel!
 goto:eof
diff --git a/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.2.2-bin-windows-signed.jar b/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.2.2-bin-windows-signed.jar
deleted file mode 100644
index e42257864981..000000000000
Binary files a/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.2.2-bin-windows-signed.jar and /dev/null differ
diff --git a/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.4.0-bin-windows.zip b/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.4.0-bin-windows.zip
new file mode 100644
index 000000000000..2761d18362c4
Binary files /dev/null and b/dev/com.ibm.ws.org.apache.commons.daemon/lib/commons-daemon-1.4.0-bin-windows.zip differ
diff --git a/dev/com.ibm.ws.org.apache.commons.daemon/publish/bin/tools/win/prunsrv.exe b/dev/com.ibm.ws.org.apache.commons.daemon/publish/bin/tools/win/prunsrv.exe
index 8d4d0d2370e9..53265bc395d6 100644
Binary files a/dev/com.ibm.ws.org.apache.commons.daemon/publish/bin/tools/win/prunsrv.exe and b/dev/com.ibm.ws.org.apache.commons.daemon/publish/bin/tools/win/prunsrv.exe differ