diff --git a/.jvmopts b/.jvmopts
index 0c9757c0..80ad8010 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -18,11 +18,5 @@
 -Xmx4096M
 -Xss2m
 -XX:MetaspaceSize=1024m
--XX:+UseCompressedOops
--XX:+UseCompressedClassPointers
 -XX:ReservedCodeCacheSize=256M
--XX:+TieredCompilation
--XX:+CMSClassUnloadingEnabled
--XX:+UseConcMarkSweepGC
 -XX:+HeapDumpOnOutOfMemoryError
-
diff --git a/build.sbt b/build.sbt
index 4c32a31e..37066dec 100644
--- a/build.sbt
+++ b/build.sbt
@@ -63,10 +63,8 @@ ThisBuild / javacOptions ++= Seq(
 )
 // Options provided to forked JVMs through sbt, based on our .jvmopts file
 ThisBuild / javaOptions ++= Seq(
-  "-Xms1024M", "-Xmx4096M", "-Xss2m", "-XX:MaxPermSize=1024M",
-  "-XX:ReservedCodeCacheSize=256M", "-XX:+TieredCompilation",
-  "-XX:+CMSClassUnloadingEnabled",
-  "-XX:+UseConcMarkSweepGC", "-XX:+HeapDumpOnOutOfMemoryError"
+  "-Xms1024M", "-Xmx4096M", "-Xss2m", "-XX:MetaspaceSize=1024M",
+  "-XX:ReservedCodeCacheSize=256M", "-XX:+HeapDumpOnOutOfMemoryError"
 )
 // Add additional test option to show time taken per test
 ThisBuild / Test / testOptions += Tests.Argument("-oDF")