diff --git a/.jvmopts b/.jvmopts
index afbee1f086..330e2416c8 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -1,6 +1,9 @@
 -Dfile.encoding=UTF8
--Xms1G
--Xmx5G
--XX:ReservedCodeCacheSize=500M
--XX:+TieredCompilation
+-Xms2G
+-Xmx8G
+-Xss4m
+-XX:ReservedCodeCacheSize=512m
+-XX:MaxMetaspaceSize=512M
 -XX:+UseParallelGC
+-XX:+TieredCompilation
+-XX:+UseAdaptiveSizePolicy