diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.bat b/integration/client-cli/admin-cli/src/main/bin/kcadm.bat
index 1dfdbf10679..19e0310663b 100644
--- a/integration/client-cli/admin-cli/src/main/bin/kcadm.bat
+++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.bat
@@ -5,4 +5,26 @@ if "%OS%" == "Windows_NT" (
 ) else (
   set DIRNAME=.\
 )
-java %KC_OPTS% -cp "%DIRNAME%\client\keycloak-admin-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.admin.cli.KcAdmMain %*
+
+if "x%JAVA%" == "x" (
+  if "x%JAVA_HOME%" == "x" (
+    set JAVA=java
+    echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
+    echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
+  ) else (
+    if not exist "%JAVA_HOME%" (
+      echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
+      goto END
+    ) else (
+      if not exist "%JAVA_HOME%\bin\java.exe" (
+        echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
+        goto END
+      )
+      set "JAVA=%JAVA_HOME%\bin\java"
+    )
+  )
+)
+
+"%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-admin-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.admin.cli.KcAdmMain %*
+
+:END
diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat
index f8252f214b3..f45b2008c95 100644
--- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat
+++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat
@@ -5,4 +5,26 @@ if "%OS%" == "Windows_NT" (
 ) else (
   set DIRNAME=.\
 )
-java %KC_OPTS% -cp "%DIRNAME%\client\keycloak-client-registration-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %*
+
+if "x%JAVA%" == "x" (
+  if "x%JAVA_HOME%" == "x" (
+    set JAVA=java
+    echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
+    echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
+  ) else (
+    if not exist "%JAVA_HOME%" (
+      echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
+      goto END
+    ) else (
+      if not exist "%JAVA_HOME%\bin\java.exe" (
+        echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
+        goto END
+      )
+      set "JAVA=%JAVA_HOME%\bin\java"
+    )
+  )
+)
+
+"%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-client-registration-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %*
+
+:END
diff --git a/quarkus/dist/src/main/content/bin/kc.bat b/quarkus/dist/src/main/content/bin/kc.bat
index 52b7e632911..8f1b229aaca 100644
--- a/quarkus/dist/src/main/content/bin/kc.bat
+++ b/quarkus/dist/src/main/content/bin/kc.bat
@@ -119,20 +119,22 @@ if "%DEBUG_MODE%" == "true" (
 rem Setup Keycloak specific properties
 set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%
 
-if "x%JAVA_HOME%" == "x" (
-  set  JAVA=java
-  echo JAVA_HOME is not set. Unexpected results may occur.
-  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-) else (
-  if not exist "%JAVA_HOME%" (
-    echo JAVA_HOME "%JAVA_HOME%" path doesn't exist
-    goto END
-   ) else (
-     if not exist "%JAVA_HOME%\bin\java.exe" (
-       echo "%JAVA_HOME%\bin\java.exe" does not exist
-       goto END
-     )
-    set "JAVA=%JAVA_HOME%\bin\java"
+if "x%JAVA%" == "x" (
+  if "x%JAVA_HOME%" == "x" (
+    set JAVA=java
+    echo JAVA_HOME is not set. Unexpected results may occur. 1>&2
+    echo Set JAVA_HOME to the directory of your local JDK to avoid this message. 1>&2
+  ) else (
+    if not exist "%JAVA_HOME%" (
+      echo JAVA_HOME "%JAVA_HOME%" path doesn't exist 1>&2
+      goto END
+    ) else (
+      if not exist "%JAVA_HOME%\bin\java.exe" (
+        echo "%JAVA_HOME%\bin\java.exe" does not exist 1>&2
+        goto END
+      )
+      set "JAVA=%JAVA_HOME%\bin\java"
+    )
   )
 )