diff --git a/vault-cli/src/main/appassembler/unix-template.sh b/vault-cli/src/main/appassembler/unix-template.sh
index 9e5702b..4ff0ec2 100644
--- a/vault-cli/src/main/appassembler/unix-template.sh
+++ b/vault-cli/src/main/appassembler/unix-template.sh
@@ -126,12 +126,6 @@
     EXTRA_JVM_ARGUMENTS="$EXTRA_JVM_ARGUMENTS -Denv.term.width=${COLS}"
 fi
 
-JAVA_VER=$($JAVACMD -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
-
-if [ "$JAVA_VER" -lt 18 ]; then
-    EXTRA_JVM_ARGUMENTS="$EXTRA_JVM_ARGUMENTS -XX:PermSize=128m -XX:-UseGCOverheadLimit"
-fi
-
 exec "$JAVACMD" $VLT_OPTS $EXTRA_JVM_ARGUMENTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="@APP_NAME@" \
diff --git a/vault-cli/src/main/appassembler/windows-template.bat b/vault-cli/src/main/appassembler/windows-template.bat
index fd9554e..3666be3 100644
--- a/vault-cli/src/main/appassembler/windows-template.bat
+++ b/vault-cli/src/main/appassembler/windows-template.bat
@@ -81,17 +81,13 @@
 
 if "%REPO%"=="" set REPO=%VLT_HOME%\#REPO#
 
-set EXTRA_JVM_ARGUMENTS=#EXTRA_JVM_ARGUMENTS#
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('%JAVACMD% -fullversion 2^>^&1') do set "jver=%%j%%k%%l%%m"
-if %jver% LSS 18000 set EXTRA_JVM_ARGUMENTS=#EXTRA_JVM_ARGUMENTS# -XX:PermSize=128m -XX:-UseGCOverheadLimit
-
 set CLASSPATH=#CLASSPATH#
 goto endInit
 
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %VLT_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH_PREFIX%;%CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%VLT_HOME%" -Dvlt.home="%VLT_HOME%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
+%JAVACMD% %VLT_OPTS% #EXTRA_JVM_ARGUMENTS# -classpath %CLASSPATH_PREFIX%;%CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%VLT_HOME%" -Dvlt.home="%VLT_HOME%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end