diff --git a/.vscode/launch.json b/.vscode/launch.json
index 291242cde3..85a5f2b760 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -48,7 +48,7 @@
         "-Declipse.pde.launch=true",
         "-XstartOnFirstThread",
         "-Dfile.encoding=UTF-8",
-        "--add-modules=ALL-SYSTEM",
+        "--add-modules=ALL-DEFAULT",
         "--add-opens=java.base/java.io=ALL-UNNAMED",
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
         "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 32367aa93c..8714c04a1b 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -17,7 +17,7 @@ If Not Defined JAVA_OPTS (
 
 java %JAVA_OPTS% ^
     -Dfile.encoding=UTF-8 ^
-    --add-modules=ALL-SYSTEM ^
+    --add-modules=ALL-DEFAULT ^
     --add-opens=java.base/java.io=ALL-UNNAMED ^
     --add-opens=java.base/java.lang=ALL-UNNAMED ^
     --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ^
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index 8b67c5ca96..86cc8c2e92 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -11,7 +11,7 @@ echo "Starting Cloudbeaver Server"
 
 exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
-  --add-modules=ALL-SYSTEM \
+  --add-modules=ALL-DEFAULT \
   --add-opens=java.base/java.io=ALL-UNNAMED \
   --add-opens=java.base/java.lang=ALL-UNNAMED \
   --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
diff --git a/server/product/web-server-test/CloudbeaverServerUnitTest.product b/server/product/web-server-test/CloudbeaverServerUnitTest.product
index db340de85a..37b5e3abd3 100644
--- a/server/product/web-server-test/CloudbeaverServerUnitTest.product
+++ b/server/product/web-server-test/CloudbeaverServerUnitTest.product
@@ -12,7 +12,7 @@
         <programArgsMac></programArgsMac>
         <vmArgs>
             -Dfile.encoding=UTF-8 
-            --add-modules=ALL-SYSTEM
+            --add-modules=ALL-DEFAULT
             --add-opens=java.base/java.io=ALL-UNNAMED
             --add-opens=java.base/java.lang=ALL-UNNAMED
             --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product
index a544603cf7..5f2a806132 100644
--- a/server/product/web-server/CloudbeaverServer.product
+++ b/server/product/web-server/CloudbeaverServer.product
@@ -12,7 +12,7 @@
         <programArgsMac></programArgsMac>
         <vmArgs>
             -Dfile.encoding=UTF-8 
-            --add-modules=ALL-SYSTEM
+            --add-modules=ALL-DEFAULT
             --add-opens=java.base/java.io=ALL-UNNAMED
             --add-opens=java.base/java.lang=ALL-UNNAMED
             --add-opens=java.base/java.lang.reflect=ALL-UNNAMED