diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e071b1b8f0..11dfdc3387 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,8 +17,8 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  JAVA_OPTS: '-Xms15G -Xmx15G -Xss10M -XX:MaxMetaspaceSize=2G -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8'
-  JVM_OPTS: '-Xms15G -Xmx15G -Xss10M -XX:MaxMetaspaceSize=2G -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8'
+  JDK_JAVA_OPTIONS: '-Xms4G -Xmx8G -XX:+UseG1GC -Xss10M -XX:ReservedCodeCacheSize=1G -XX:NonProfiledCodeHeapSize=512m -Dfile.encoding=UTF-8'
+  SBT_OPTS: '-Xms4G -Xmx8G -XX:+UseG1GC -Xss10M -XX:ReservedCodeCacheSize=1G -XX:NonProfiledCodeHeapSize=512m -Dfile.encoding=UTF-8'
 
 jobs:
   build:
diff --git a/.sbtopts b/.sbtopts
index c3570bedb5..946ca46c81 100644
--- a/.sbtopts
+++ b/.sbtopts
@@ -1,4 +1,5 @@
--J-Xms2048m
--J-Xmx2048m
--J-XX:ReservedCodeCacheSize=256m
--J-XX:MaxMetaspaceSize=512m
\ No newline at end of file
+-J-Xms2G
+-J-Xmx4G
+-J-XX:+UseG1GC
+-J-XX:ReservedCodeCacheSize=1G
+-J-XX:NonProfiledCodeHeapSize=512M
diff --git a/build.sbt b/build.sbt
index 7b1ed456d7..10bf818f06 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,8 +9,8 @@ val releaseDrafterVersion = "5"
 val _ = sys.props += ("ZIOHttpLogLevel" -> Debug.ZIOHttpLogLevel)
 
 // CI Configuration
-ThisBuild / githubWorkflowEnv += ("JAVA_OPTS" -> "-Xms15G -Xmx15G -Xss10M -XX:MaxMetaspaceSize=2G -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8")
-ThisBuild / githubWorkflowEnv += ("JVM_OPTS" -> "-Xms15G -Xmx15G -Xss10M -XX:MaxMetaspaceSize=2G -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8")
+ThisBuild / githubWorkflowEnv += ("JDK_JAVA_OPTIONS" -> "-Xms4G -Xmx8G -XX:+UseG1GC -Xss10M -XX:ReservedCodeCacheSize=1G -XX:NonProfiledCodeHeapSize=512m -Dfile.encoding=UTF-8")
+ThisBuild / githubWorkflowEnv += ("SBT_OPTS" -> "-Xms4G -Xmx8G -XX:+UseG1GC -Xss10M -XX:ReservedCodeCacheSize=1G -XX:NonProfiledCodeHeapSize=512m -Dfile.encoding=UTF-8")
 
 ThisBuild / githubWorkflowJavaVersions := Seq(
   JavaSpec.graalvm(Graalvm.Distribution("graalvm"), "17"),