diff --git a/build.bat b/build.bat
index f14b4b269..16d8958b4 100644
--- a/build.bat
+++ b/build.bat
@@ -1,14 +1,14 @@
 set CWD=%cd%
 
-echo Starting Lucee5 server with which to build the docs...
+echo Starting Lucee7 server with which to build the docs...
 box server stop luceedocsbuilder
 box start ^
 name="luceedocsbuilder" ^
-cfengine="lucee@5" ^
+cfengine="lucee@7" ^
 port=8765 ^
 openbrowser=false ^
 directory=%CWD% ^
-javaVersion=openjdk8_jre_jdk8u332-b09 ^
+javaVersion=openjdk17 ^
 heapSize=2048
 
 echo Done!
@@ -19,7 +19,7 @@ echo Building documentation (please be patient, it may take some time)...
 
 curl http://localhost:8765/build.cfm?textlogs=true
 
-echo "Stopping Lucee5 server..."
+echo "Stopping Lucee7 server..."
 box server stop luceedocsbuilder
 @echo off
 IF EXIST .exitcode (
diff --git a/serve.bat b/serve.bat
index 0fdd86244..626d8e709 100644
--- a/serve.bat
+++ b/serve.bat
@@ -4,4 +4,4 @@ set CWD=%cd%
 set LUCEE_EXTENSIONS="60772C12-F179-D555-8E2CD2B4F7428718;version=3.0.0.44-RC"
 
 box stop name=luceedocslocalserver
-box start name=luceedocslocalserver directory=%CWD%/server/ force=true rewritesEnable=true rewritesConfig=%CWD%/server/urlrewrite.xml port=4040 trayIcon=%CWD%/luceelogoicon.png heapSize=2048 cfengine="lucee@be" --verbose --console
+box start name=luceedocslocalserver directory=%CWD%/server/ force=true rewritesEnable=true rewritesConfig=%CWD%/server/urlrewrite.xml javaVersion=openJDK17 port=4040 trayIcon=%CWD%/luceelogoicon.png heapSize=2048 cfengine="lucee@be" --verbose --console