diff --git a/.github/workflows/ea-jdk.yml b/.github/workflows/ea-jdk.yml
index 007aefa7..e70364df 100644
--- a/.github/workflows/ea-jdk.yml
+++ b/.github/workflows/ea-jdk.yml
@@ -5,7 +5,7 @@ env:
 jobs:
   linux-ea:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v11-openjdk23-ea"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v12-openjdk24-ea"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c6d54700..de08dbf7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v11-openjdk22"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v12-openjdk22"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
 
   linux:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v11-openjdk22"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v12-openjdk22"
     continue-on-error: true
     steps:
       - name: Git checkout
@@ -194,7 +194,7 @@ jobs:
   plugins:
     runs-on: ubuntu-latest
     needs: linux
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v11-openjdk11-with-ant-gcc"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v12-openjdk11-with-ant-gcc"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -235,12 +235,15 @@ jobs:
           - openjdk11
           - openjdk17
           - openjdk21
+          - openjdk22
+          - openjdk23
+          - openjdk24-ea
           - openj9-openjdk11
           - openj9-openjdk17
           - openj9-openjdk21
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v11-${{ matrix.image }}"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v12-${{ matrix.image }}"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
diff --git a/tools/ci/common.sh b/tools/ci/common.sh
index ba5cc8ae..e34a1bad 100644
--- a/tools/ci/common.sh
+++ b/tools/ci/common.sh
@@ -52,7 +52,7 @@ cp_reflink() {
 
 get_jvm_workaround_args() {
     case "$RENAISSANCE_JVM_MAJOR_VERSION" in
-        16|17|18|19|20|21|22|23-ea)
+        16|17|18|19|20|21|22|23-ea|23|24-ea|24)
             echo "--add-opens=java.base/java.lang=ALL-UNNAMED"
             echo "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
             echo "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"