diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 82e3e40600..d8d8e3215a 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -1,4 +1,4 @@
-@rem echo off
+@echo off
 for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
@@ -8,4 +8,9 @@ IF NOT EXIST workspace\.metadata (
     copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
 )
 
-java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+SET VMARGS_OPTS = ""
+If Not Defined JAVA_OPTS (
+    SET VMARGS_OPTS = "-Xmx2048M"
+)
+
+java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs %VMARGS_OPTS%
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index 9321d25647..b6d0e3565b 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -6,4 +6,6 @@ echo "Starting Cloudbeaver Server"
 
 [ ! -d "workspace/.metadata" ] && mkdir -p workspace/GlobalConfiguration/.dbeaver && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
-java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+VMARGS_OPTS="${JAVA_OPTS:--Xmx2048M}"
+
+java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs ${VMARGS_OPTS}