diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 341c69e..b7514d4 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -17,7 +17,7 @@ jobs:
     name: Tests
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 21, 17
+      java: 25, 21, 17
       scala: 2.13.x, 3.x
       cmd: |
         sbt ++$MATRIX_SCALA test
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 01d7f83..6c0938a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.10")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
diff --git a/src/main/scala/org/webjars/play/RequireJS.scala b/src/main/scala/org/webjars/play/RequireJS.scala
index 35ed0fd..2f2c60d 100644
--- a/src/main/scala/org/webjars/play/RequireJS.scala
+++ b/src/main/scala/org/webjars/play/RequireJS.scala
@@ -3,7 +3,7 @@ package org.webjars.play
 import play.api.http.MimeTypes
 import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents}
 
-import javax.inject.{Inject, Singleton}
+import jakarta.inject.{Inject, Singleton}
 
 @Singleton
 class RequireJS @Inject() (webJarsUtil: WebJarsUtil, controllerComponents: ControllerComponents)
diff --git a/src/main/scala/org/webjars/play/WebJarAssets.scala b/src/main/scala/org/webjars/play/WebJarAssets.scala
index 54befac..bb65b14 100644
--- a/src/main/scala/org/webjars/play/WebJarAssets.scala
+++ b/src/main/scala/org/webjars/play/WebJarAssets.scala
@@ -7,7 +7,7 @@ import play.api.Environment
 import play.api.http.HttpErrorHandler
 import play.api.mvc.{Action, AnyContent}
 
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 // this is needed to avoid conflicts with the controllers.Assets controller
 class WebJarAssets @Inject() (errorHandler: HttpErrorHandler, assetsMetadata: AssetsMetadata, env: Environment) extends controllers.AssetsBuilder(errorHandler, assetsMetadata, env) {
diff --git a/src/main/scala/org/webjars/play/WebJarsUtil.scala b/src/main/scala/org/webjars/play/WebJarsUtil.scala
index b865281..7eed62b 100644
--- a/src/main/scala/org/webjars/play/WebJarsUtil.scala
+++ b/src/main/scala/org/webjars/play/WebJarsUtil.scala
@@ -1,6 +1,6 @@
 package org.webjars.play
 
-import javax.inject.{Inject, Singleton}
+import jakarta.inject.{Inject, Singleton}
 import org.webjars.WebJarVersionLocator
 import play.api.mvc.Call
 import play.api.{Configuration, Environment, Logging, Mode}
diff --git a/test-project/project/plugins.sbt b/test-project/project/plugins.sbt
index afcb999..9bf358d 100644
--- a/test-project/project/plugins.sbt
+++ b/test-project/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M1")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")