diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ad48b7d8d..5b5a05529 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -169,7 +169,7 @@ jobs:
     needs: changes
     if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'java-hello-world')}}
     with:
-      java: 11, 21
+      java: 17, 21
       scala: 2.13.x, 3.x
       gradle-build-root: play-java-hello-world-tutorial
       add-dimensions: >-
diff --git a/play-java-chatroom-example/build.sbt b/play-java-chatroom-example/build.sbt
index 84cbb2152..2937014f1 100644
--- a/play-java-chatroom-example/build.sbt
+++ b/play-java-chatroom-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-chatroom-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       "org.webjars" %% "webjars-play" % "3.0.2",
diff --git a/play-java-chatroom-example/project/plugins.sbt b/play-java-chatroom-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-chatroom-example/project/plugins.sbt
+++ b/play-java-chatroom-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-compile-di-example/build.sbt b/play-java-compile-di-example/build.sbt
index ebb5356b2..bc243ca54 100644
--- a/play-java-compile-di-example/build.sbt
+++ b/play-java-compile-di-example/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
 //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
 
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 
 scalaVersion := crossScalaVersions.value.head
 
diff --git a/play-java-compile-di-example/project/plugins.sbt b/play-java-compile-di-example/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-java-compile-di-example/project/plugins.sbt
+++ b/play-java-compile-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-dagger2-example/build.sbt b/play-java-dagger2-example/build.sbt
index ebfec54b8..195af618c 100644
--- a/play-java-dagger2-example/build.sbt
+++ b/play-java-dagger2-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-dagger2-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       ws,
diff --git a/play-java-dagger2-example/project/plugins.sbt b/play-java-dagger2-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-dagger2-example/project/plugins.sbt
+++ b/play-java-dagger2-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-ebean-example/build.sbt b/play-java-ebean-example/build.sbt
index 3acd236ac..a65935c62 100644
--- a/play-java-ebean-example/build.sbt
+++ b/play-java-ebean-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-java-ebean-example",
     version := "1.0.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-java-ebean-example/project/plugins.sbt b/play-java-ebean-example/project/plugins.sbt
index 9690c72e6..92513def8 100644
--- a/play-java-ebean-example/project/plugins.sbt
+++ b/play-java-ebean-example/project/plugins.sbt
@@ -1,4 +1,4 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0")
diff --git a/play-java-fileupload-example/build.sbt b/play-java-fileupload-example/build.sbt
index ccc026dc0..de98cc541 100644
--- a/play-java-fileupload-example/build.sbt
+++ b/play-java-fileupload-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-fileupload-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies += guice,
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
diff --git a/play-java-fileupload-example/project/plugins.sbt b/play-java-fileupload-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-fileupload-example/project/plugins.sbt
+++ b/play-java-fileupload-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-forms-example/build.sbt b/play-java-forms-example/build.sbt
index 66ad2332c..ea8c570b5 100644
--- a/play-java-forms-example/build.sbt
+++ b/play-java-forms-example/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
 
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 
 scalaVersion := crossScalaVersions.value.head
 
diff --git a/play-java-forms-example/project/plugins.sbt b/play-java-forms-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-forms-example/project/plugins.sbt
+++ b/play-java-forms-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-grpc-example/build.sbt b/play-java-grpc-example/build.sbt
index 1039ffa90..e3d71f568 100644
--- a/play-java-grpc-example/build.sbt
+++ b/play-java-grpc-example/build.sbt
@@ -50,8 +50,8 @@ lazy val `play-java-grpc-example` = (project in file("."))
     libraryDependencies ++= CompileDeps ++ TestDeps
   )
 
-scalaVersion := "2.13.16"
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+scalaVersion := "2.13.18"
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation")
 // Needed for ssl-config to create self signed certificated under Java 17
diff --git a/play-java-grpc-example/docs/build.sbt b/play-java-grpc-example/docs/build.sbt
index 0279e034c..ddb2e9195 100644
--- a/play-java-grpc-example/docs/build.sbt
+++ b/play-java-grpc-example/docs/build.sbt
@@ -1,4 +1,4 @@
 paradoxTheme := Some(builtinParadoxTheme("generic"))
 
-scalaVersion := "2.13.16"
+scalaVersion := "2.13.18"
 
diff --git a/play-java-grpc-example/project/plugins.sbt b/play-java-grpc-example/project/plugins.sbt
index 9c208c319..f4826fd88 100644
--- a/play-java-grpc-example/project/plugins.sbt
+++ b/play-java-grpc-example/project/plugins.sbt
@@ -3,7 +3,7 @@ val playGrpcV = "0.12.2"
 buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.java.grpc.sample"
 
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 
diff --git a/play-java-hello-world-tutorial/build.sbt b/play-java-hello-world-tutorial/build.sbt
index 8d7d8e922..03f67dc20 100644
--- a/play-java-hello-world-tutorial/build.sbt
+++ b/play-java-hello-world-tutorial/build.sbt
@@ -6,7 +6,7 @@ version := "1.0-SNAPSHOT"
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
 
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 
 scalaVersion := crossScalaVersions.value.head
 
diff --git a/play-java-hello-world-tutorial/gradle/libs.versions.toml b/play-java-hello-world-tutorial/gradle/libs.versions.toml
index 41315e9c5..046d01ea0 100644
--- a/play-java-hello-world-tutorial/gradle/libs.versions.toml
+++ b/play-java-hello-world-tutorial/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.0.9"
+play = "3.0.10"
 junit = "4.13.2"
 
 [libraries]
@@ -9,4 +9,4 @@ play-bom = { group = "org.playframework", name = "play-bom_3", version.ref = "pl
 
 [plugins]
 twirl = { id = "org.playframework.twirl", version.ref = "twirl" }
-play = { id = "org.playframework.play", version = "3.1.0-M2-573139bb-SNAPSHOT" }
+play = { id = "org.playframework.play", version = "3.1.0-M4" }
diff --git a/play-java-hello-world-tutorial/project/plugins.sbt b/play-java-hello-world-tutorial/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-java-hello-world-tutorial/project/plugins.sbt
+++ b/play-java-hello-world-tutorial/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-jpa-example/build.sbt b/play-java-jpa-example/build.sbt
index f5031a2c9..c26eb8e85 100644
--- a/play-java-jpa-example/build.sbt
+++ b/play-java-jpa-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-jpa-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-java-jpa-example/project/plugins.sbt b/play-java-jpa-example/project/plugins.sbt
index 9264e775a..1104a64f3 100644
--- a/play-java-jpa-example/project/plugins.sbt
+++ b/play-java-jpa-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 // Web plugins
 addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1")
diff --git a/play-java-pekko-cluster-example/build.sbt b/play-java-pekko-cluster-example/build.sbt
index 2ec6e34b2..91418ab96 100644
--- a/play-java-pekko-cluster-example/build.sbt
+++ b/play-java-pekko-cluster-example/build.sbt
@@ -8,7 +8,7 @@ version := "1.0-SNAPSHOT"
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
 
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 
 scalaVersion := crossScalaVersions.value.head
 
diff --git a/play-java-pekko-cluster-example/project/plugins.sbt b/play-java-pekko-cluster-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-pekko-cluster-example/project/plugins.sbt
+++ b/play-java-pekko-cluster-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-rest-api-example/build.sbt b/play-java-rest-api-example/build.sbt
index 9d228fd3a..7a2933408 100644
--- a/play-java-rest-api-example/build.sbt
+++ b/play-java-rest-api-example/build.sbt
@@ -1,4 +1,4 @@
-lazy val scala213 = "2.13.16"
+lazy val scala213 = "2.13.18"
 lazy val scala3 = "3.3.4"
 
 lazy val root = (project in file("."))
diff --git a/play-java-rest-api-example/project/plugins.sbt b/play-java-rest-api-example/project/plugins.sbt
index 06ab23935..01ecb2b25 100644
--- a/play-java-rest-api-example/project/plugins.sbt
+++ b/play-java-rest-api-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 // Load testing tool:
 // https://gatling.io/docs/gatling/reference/current/extensions/sbt_plugin/
diff --git a/play-java-starter-example/build.sbt b/play-java-starter-example/build.sbt
index f0cd6e40a..4d4a0af25 100644
--- a/play-java-starter-example/build.sbt
+++ b/play-java-starter-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-starter-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-java-starter-example/project/plugins.sbt b/play-java-starter-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-java-starter-example/project/plugins.sbt
+++ b/play-java-starter-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-streaming-example/build.sbt b/play-java-streaming-example/build.sbt
index de1a307fd..b71d4c383 100644
--- a/play-java-streaming-example/build.sbt
+++ b/play-java-streaming-example/build.sbt
@@ -2,7 +2,7 @@ name := "play-java-streaming-example"
 
 version := "1.0-SNAPSHOT"
 
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 scalaVersion := crossScalaVersions.value.head
 
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
diff --git a/play-java-streaming-example/project/plugins.sbt b/play-java-streaming-example/project/plugins.sbt
index 88479af83..03d9330f1 100644
--- a/play-java-streaming-example/project/plugins.sbt
+++ b/play-java-streaming-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-java-websocket-example/build.sbt b/play-java-websocket-example/build.sbt
index dcfb7ed67..646137e52 100644
--- a/play-java-websocket-example/build.sbt
+++ b/play-java-websocket-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-java-websocket-example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-java-websocket-example/project/plugins.sbt b/play-java-websocket-example/project/plugins.sbt
index 60055ee97..039507623 100644
--- a/play-java-websocket-example/project/plugins.sbt
+++ b/play-java-websocket-example/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1")
 
diff --git a/play-scala-anorm-example/build.sbt b/play-scala-anorm-example/build.sbt
index 3b075f544..7e2889666 100644
--- a/play-scala-anorm-example/build.sbt
+++ b/play-scala-anorm-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-scala-anorm-example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-anorm-example/project/plugins.sbt b/play-scala-anorm-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-anorm-example/project/plugins.sbt
+++ b/play-scala-anorm-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-chatroom-example/build.sbt b/play-scala-chatroom-example/build.sbt
index 41a5cc30b..2f5692bc4 100644
--- a/play-scala-chatroom-example/build.sbt
+++ b/play-scala-chatroom-example/build.sbt
@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-chatroom-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-chatroom-example/project/plugins.sbt b/play-scala-chatroom-example/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-scala-chatroom-example/project/plugins.sbt
+++ b/play-scala-chatroom-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-compile-di-example/build.sbt b/play-scala-compile-di-example/build.sbt
index d1c021768..4213e7da9 100644
--- a/play-scala-compile-di-example/build.sbt
+++ b/play-scala-compile-di-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-compile-di-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2",
     scalacOptions ++= List(
diff --git a/play-scala-compile-di-example/project/plugins.sbt b/play-scala-compile-di-example/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-scala-compile-di-example/project/plugins.sbt
+++ b/play-scala-compile-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-fileupload-example/build.sbt b/play-scala-fileupload-example/build.sbt
index 847aecf16..47684b57c 100644
--- a/play-scala-fileupload-example/build.sbt
+++ b/play-scala-fileupload-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-fileupload-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       ws,
diff --git a/play-scala-fileupload-example/project/plugins.sbt b/play-scala-fileupload-example/project/plugins.sbt
index 2dd5687b2..6cccc253d 100644
--- a/play-scala-fileupload-example/project/plugins.sbt
+++ b/play-scala-fileupload-example/project/plugins.sbt
@@ -1,4 +1,4 @@
 resolvers += Resolver.jcenterRepo
 
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-forms-example/build.sbt b/play-scala-forms-example/build.sbt
index c5db5d9d3..34d5ea6a3 100644
--- a/play-scala-forms-example/build.sbt
+++ b/play-scala-forms-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-forms-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-forms-example/project/plugins.sbt b/play-scala-forms-example/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-scala-forms-example/project/plugins.sbt
+++ b/play-scala-forms-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-grpc-example/build.sbt b/play-scala-grpc-example/build.sbt
index b0cee5a2c..25f3000e9 100644
--- a/play-scala-grpc-example/build.sbt
+++ b/play-scala-grpc-example/build.sbt
@@ -70,8 +70,8 @@ val TestDeps = Seq(
   "org.scalatestplus.play"  %% "scalatestplus-play"  % "7.0.2" % Test,
 )
 
-scalaVersion := "2.13.16"
-crossScalaVersions := Seq("2.13.16", "3.3.6")
+scalaVersion := "2.13.18"
+crossScalaVersions := Seq("2.13.18", "3.3.6")
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 // Needed for ssl-config to create self signed certificated under Java 17
 Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED")
diff --git a/play-scala-grpc-example/docs/build.sbt b/play-scala-grpc-example/docs/build.sbt
index 0279e034c..ddb2e9195 100644
--- a/play-scala-grpc-example/docs/build.sbt
+++ b/play-scala-grpc-example/docs/build.sbt
@@ -1,4 +1,4 @@
 paradoxTheme := Some(builtinParadoxTheme("generic"))
 
-scalaVersion := "2.13.16"
+scalaVersion := "2.13.18"
 
diff --git a/play-scala-grpc-example/project/plugins.sbt b/play-scala-grpc-example/project/plugins.sbt
index 3a3da0102..057861518 100644
--- a/play-scala-grpc-example/project/plugins.sbt
+++ b/play-scala-grpc-example/project/plugins.sbt
@@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.scala.grpc.sample"
 
 
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 
diff --git a/play-scala-hello-world-tutorial/build.sbt b/play-scala-hello-world-tutorial/build.sbt
index 315767ce2..be31dff6c 100644
--- a/play-scala-hello-world-tutorial/build.sbt
+++ b/play-scala-hello-world-tutorial/build.sbt
@@ -5,7 +5,7 @@ lazy val root = (project in file("."))
     name := """play-scala-hello-world-tutorial""",
     organization := "com.example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-hello-world-tutorial/project/plugins.sbt b/play-scala-hello-world-tutorial/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-scala-hello-world-tutorial/project/plugins.sbt
+++ b/play-scala-hello-world-tutorial/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-isolated-slick-example/build.sbt b/play-scala-isolated-slick-example/build.sbt
index bf2278fe8..e4e593906 100644
--- a/play-scala-isolated-slick-example/build.sbt
+++ b/play-scala-isolated-slick-example/build.sbt
@@ -15,7 +15,7 @@ val FlywayVersion = "11.10.1"
   "com.google.inject" % "guice" % "6.0.0"
 )
 
-(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.6")
+(ThisBuild / crossScalaVersions) := Seq("2.13.18", "3.3.6")
 (ThisBuild / scalaVersion) := crossScalaVersions.value.head
 (ThisBuild / scalacOptions) ++= Seq(
   "-encoding", "UTF-8", // yes, this is 2 args
diff --git a/play-scala-isolated-slick-example/project/plugins.sbt b/play-scala-isolated-slick-example/project/plugins.sbt
index 523d08198..924b3b7b1 100644
--- a/play-scala-isolated-slick-example/project/plugins.sbt
+++ b/play-scala-isolated-slick-example/project/plugins.sbt
@@ -9,4 +9,4 @@ addSbtPlugin("com.github.sbt" % "flyway-sbt" % "10.21.0")
 addSbtPlugin("com.github.tototoshi" % "sbt-slick-codegen" % "2.2.0")
 
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-log4j2-example/build.sbt b/play-scala-log4j2-example/build.sbt
index eb78b4190..97f741145 100644
--- a/play-scala-log4j2-example/build.sbt
+++ b/play-scala-log4j2-example/build.sbt
@@ -7,7 +7,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-log4j2-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-log4j2-example/project/plugins.sbt b/play-scala-log4j2-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-log4j2-example/project/plugins.sbt
+++ b/play-scala-log4j2-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-macwire-di-example/build.sbt b/play-scala-macwire-di-example/build.sbt
index 662d9a0c3..ee8495a7c 100644
--- a/play-scala-macwire-di-example/build.sbt
+++ b/play-scala-macwire-di-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-macwire-di-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       "com.softwaremill.macwire" %% "macros" % "2.6.6" % "provided",
diff --git a/play-scala-macwire-di-example/project/plugins.sbt b/play-scala-macwire-di-example/project/plugins.sbt
index 33476a759..01da67a5b 100644
--- a/play-scala-macwire-di-example/project/plugins.sbt
+++ b/play-scala-macwire-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-rest-api-example/build.sbt b/play-scala-rest-api-example/build.sbt
index 5c8b14bca..c8926ebc6 100644
--- a/play-scala-rest-api-example/build.sbt
+++ b/play-scala-rest-api-example/build.sbt
@@ -1,7 +1,7 @@
 import sbt.Keys._
 import play.sbt.PlaySettings
 
-lazy val scala213 = "2.13.16"
+lazy val scala213 = "2.13.18"
 lazy val scala3 = "3.3.4"
 
 lazy val root = (project in file("."))
diff --git a/play-scala-rest-api-example/project/plugins.sbt b/play-scala-rest-api-example/project/plugins.sbt
index 1629293c2..3c3d24c72 100644
--- a/play-scala-rest-api-example/project/plugins.sbt
+++ b/play-scala-rest-api-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 // sbt-paradox, used for documentation
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
diff --git a/play-scala-secure-session-example/build.sbt b/play-scala-secure-session-example/build.sbt
index 72022979b..bde98fb35 100644
--- a/play-scala-secure-session-example/build.sbt
+++ b/play-scala-secure-session-example/build.sbt
@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-secure-session-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       ws,
diff --git a/play-scala-secure-session-example/project/plugins.sbt b/play-scala-secure-session-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-secure-session-example/project/plugins.sbt
+++ b/play-scala-secure-session-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-slick-example/build.sbt b/play-scala-slick-example/build.sbt
index d00ac2269..c0d367bc6 100644
--- a/play-scala-slick-example/build.sbt
+++ b/play-scala-slick-example/build.sbt
@@ -1,4 +1,4 @@
-lazy val scala213 = "2.13.16"
+lazy val scala213 = "2.13.18"
 lazy val scala3 = "3.3.4"
 
 lazy val root = (project in file("."))
diff --git a/play-scala-slick-example/project/plugins.sbt b/play-scala-slick-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-slick-example/project/plugins.sbt
+++ b/play-scala-slick-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-starter-example/build.sbt b/play-scala-starter-example/build.sbt
index 374441164..a21813a44 100644
--- a/play-scala-starter-example/build.sbt
+++ b/play-scala-starter-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-scala-starter-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-starter-example/project/plugins.sbt b/play-scala-starter-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-starter-example/project/plugins.sbt
+++ b/play-scala-starter-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-streaming-example/build.sbt b/play-scala-streaming-example/build.sbt
index b346be9a8..da1a405d4 100644
--- a/play-scala-streaming-example/build.sbt
+++ b/play-scala-streaming-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-scala-streaming-example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-streaming-example/project/plugins.sbt b/play-scala-streaming-example/project/plugins.sbt
index 88479af83..03d9330f1 100644
--- a/play-scala-streaming-example/project/plugins.sbt
+++ b/play-scala-streaming-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-tls-example/build.sbt b/play-scala-tls-example/build.sbt
index 019f47f49..ce5ffa1e1 100644
--- a/play-scala-tls-example/build.sbt
+++ b/play-scala-tls-example/build.sbt
@@ -1,5 +1,5 @@
 val commonSettings = Seq(
-  crossScalaVersions := Seq("2.13.16", "3.3.6"),
+  crossScalaVersions := Seq("2.13.18", "3.3.6"),
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq(
     "-feature",
diff --git a/play-scala-tls-example/project/plugins.sbt b/play-scala-tls-example/project/plugins.sbt
index d7257046f..dfbc8a0b6 100644
--- a/play-scala-tls-example/project/plugins.sbt
+++ b/play-scala-tls-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
diff --git a/play-scala-websocket-example/build.sbt b/play-scala-websocket-example/build.sbt
index 7c8407f6a..57debac86 100644
--- a/play-scala-websocket-example/build.sbt
+++ b/play-scala-websocket-example/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-scala-websocket-example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.16", "3.3.6"),
+    crossScalaVersions := Seq("2.13.18", "3.3.6"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
diff --git a/play-scala-websocket-example/project/plugins.sbt b/play-scala-websocket-example/project/plugins.sbt
index 60055ee97..039507623 100644
--- a/play-scala-websocket-example/project/plugins.sbt
+++ b/play-scala-websocket-example/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
 
 addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1")