diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d620755..a1ab68d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/cmd.yml@unblock-repo_scala_sbt_org
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt validateCode
 
@@ -23,7 +23,7 @@ jobs:
     name: Tests
     needs:
       - "check-code-style"
-    uses: playframework/.github/.github/workflows/cmd.yml@unblock-repo_scala_sbt_org
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       java: 21, 17
       # Symbolic lanes resolve to exact versions in project/Dependencies.scala.
@@ -35,4 +35,4 @@ jobs:
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@unblock-repo_scala_sbt_org
+    uses: playframework/.github/.github/workflows/rtm.yml@v4
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2891ae5..ded11b2 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@unblock-repo_scala_sbt_org
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     secrets: inherit
diff --git a/project/build.properties b/project/build.properties
index a31b922..58ea449 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=2.1.0-bin-20260918-2ef94e0-NIGHTLY
+sbt.version=2.1.0-M2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0d5af0b..70f2f4c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@
 
 resolvers += Resolver.sonatypeCentralSnapshots
 
-addSbtPlugin("org.playframework.twirl" % "sbt-twirl"      % "2.1.0-M9+123-dae60cad-SNAPSHOT")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl"      % "2.1.0-M9+126-adca2222-SNAPSHOT")
 addSbtPlugin("org.scalameta"           % "sbt-scalafmt"   % "2.6.2")
 addSbtPlugin("com.github.sbt"          % "sbt-ci-release" % "1.12.1")
 addSbtPlugin("com.github.sbt"          % "sbt-header"     % "5.11.0")