diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4908a274..24ec2b3fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,16 +16,16 @@ jobs:
             java: 11
             jobtype: 1
           - os: ubuntu-latest
-            java: 17
+            java: 21
             jobtype: 1
           - os: windows-latest
             java: 8
             jobtype: 2
           - os: ubuntu-latest
-            java: 17
+            java: 21
             jobtype: 3
           - os: ubuntu-latest
-            java: 17
+            java: 21
             jobtype: 4
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
index 233b5f8a8..3ad7e0fa4 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
@@ -15,14 +15,14 @@ object BenchmarkProjects {
   object Shapeless
       extends BenchmarkProject(
         "milessabin/shapeless",
-        "19a9c3a5951e4197084285bd568c2fef6717ef81",
+        "62611554399e0d04466da95591253706b2d3020d",
         List("coreJVM")
       )
 
   object Scalac
       extends BenchmarkProject(
         "scala/scala",
-        "df355f9d2dcc945f8c772a8b9f74300aef0f959a",
+        "31539736462078b1da615880ef11890a6538b45e",
         List("library")
       )
 }