diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 445f010c3b..477e130649 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -54,9 +54,9 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 21
 
       - name: Install node dependencies (oeq-rest-api)
@@ -223,9 +223,9 @@ jobs:
             libimage-exiftool-perl
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 21
 
       - uses: actions/checkout@v4
@@ -252,15 +252,14 @@ jobs:
 
       - name: Setup for tests
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
+          ./sbt "project autotest" \
             installEquella startEquella configureInstall setupForTests
 
       - name: Run Scalacheck tests
         # We only need to run these once, so we focus on the New UI
         if: matrix.newui
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            Tests/test Tests/Serial/test dumpCoverage
+          ./sbt "project autotest" Tests/test Tests/Serial/test dumpCoverage
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
@@ -271,8 +270,7 @@ jobs:
 
       - name: Run TestNG tests
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            OldTests/test dumpCoverage
+          ./sbt "project autotest" OldTests/test dumpCoverage
 
       - name: Save TestNG Reports
         if: failure()
@@ -297,8 +295,7 @@ jobs:
 
       - name: Generate coverage report
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            coverageReport
+          ./sbt "project autotest" coverageReport
 
       # To save significant time on file upload, we first tar up the directory
       # as it contains > 10k files and the artefact upload was taking almost
@@ -348,9 +345,9 @@ jobs:
             libimage-exiftool-perl
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 21
 
       - name: Setup node
@@ -375,7 +372,7 @@ jobs:
 
       - name: Install openEquella
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
+          ./sbt "project autotest" \
             installEquella startEquella configureInstall setupForTests
 
       - name: Run tests
@@ -386,8 +383,7 @@ jobs:
       - name: Stop oEQ
         if: failure()
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-          stopEquella
+          ./sbt "project autotest" stopEquella
 
       - name: Save oEQ logs for REST Module
         if: failure()
diff --git a/autotest/.jvmopts b/.jvmopts
similarity index 74%
rename from autotest/.jvmopts
rename to .jvmopts
index 610e0fe681..3035c6fe36 100644
--- a/autotest/.jvmopts
+++ b/.jvmopts
@@ -1,4 +1,4 @@
--Xms2048m
--Xmx2048m
+-Xms2g
+-Xmx4g
 -XX:ReservedCodeCacheSize=256m
 -XX:MaxMetaspaceSize=512m
diff --git a/.sbtopts b/.sbtopts
deleted file mode 100644
index 2b63e3b2d8..0000000000
--- a/.sbtopts
+++ /dev/null
@@ -1 +0,0 @@
--J-Xmx4G
diff --git a/sbt b/sbt
index 4ee84afcfc..f63a9ee5a7 100755
--- a/sbt
+++ b/sbt
@@ -34,11 +34,11 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.5.6"
-declare -r sbt_unreleased_version="1.6.0-M1"
+declare -r sbt_release_version="1.9.7"
+declare -r sbt_unreleased_version="1.9.7"
 
-declare -r latest_213="2.13.7"
-declare -r latest_212="2.12.15"
+declare -r latest_213="2.13.12"
+declare -r latest_212="2.12.18"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"