diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 30ad55fa..4429ab06 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -15,17 +15,17 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt scalafmtCheckAll scalafmtSbtCheck
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@v3
+    uses: playframework/.github/.github/workflows/binary-check.yml@v4
 
   check-docs:
     name: Docs
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt docs/scalafmtCheckAll docs/scalafmtSbtCheck docs/test docs/validateDocs
 
@@ -35,9 +35,9 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 17, 11
+      java: 21, 17
       scala: 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA test
 
@@ -46,4 +46,4 @@ jobs:
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v3
+    uses: playframework/.github/.github/workflows/rtm.yml@v4
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index db1edc72..ded11b27 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,5 +9,5 @@ on:
 jobs:
   publish-artifacts:
     name: Publish / Artifacts
-    uses: playframework/.github/.github/workflows/publish.yml@v3
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     secrets: inherit
diff --git a/build.sbt b/build.sbt
index d6086b97..a4b2ca1b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -21,8 +21,8 @@ lazy val commonSettings = Seq(
   homepage             := Some(url(s"https://github.com/playframework/${Common.repoName}")),
   licenses             := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
   javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
-  compile / javacOptions ++= Seq("--release", "11"),
-  doc / javacOptions := Seq("-source", "11"),
+  compile / javacOptions ++= Seq("--release", "17"),
+  doc / javacOptions := Seq("-source", "17"),
   scalaVersion       := "2.13.16",
   crossScalaVersions := Seq("2.13.16", "3.3.4"),
   scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") ++