diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 2a9ed04d..7ce260f4 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -11,17 +11,17 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/sbt.yml@v1
+    uses: playframework/.github/.github/workflows/cmd.yml@v2
     with:
       cmd: sbt validateCode
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@v1
+    uses: playframework/.github/.github/workflows/binary-check.yml@v2
 
   check-docs:
     name: Docs
-    uses: playframework/.github/.github/workflows/sbt.yml@v1
+    uses: playframework/.github/.github/workflows/cmd.yml@v2
     with:
       cmd: sbt doc
 
@@ -31,16 +31,14 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    uses: playframework/.github/.github/workflows/sbt-matrix.yml@v1
+    uses: playframework/.github/.github/workflows/cmd.yml@v2
     with:
-      java: >-
-        [ "11", "8" ]
-      scala: >-
-        [ "2.13.8", "3.1.2-RC3" ]
-      cmd: sbt ++$SCALA_VERSION 'testOnly -- xonly timefactor 5'
+      java: 11, 8
+      scala: 2.13.8, 3.1.2-RC3
+      cmd: sbt ++$MATRIX_SCALA 'testOnly -- xonly timefactor 5'
 
   finish:
     name: Finish
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v1
+    uses: playframework/.github/.github/workflows/rtm.yml@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f0004ffe..14b41c9d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   publish-artifacts:
     name: Publish / Artifacts
-    uses: playframework/.github/.github/workflows/publish.yml@v1
+    uses: playframework/.github/.github/workflows/publish.yml@v2
     secrets:
       username: ${{ secrets.SONATYPE_USERNAME }}
       password: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/build.sbt b/build.sbt
index b08d9c0e..29401af4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -450,4 +450,11 @@ lazy val root = project
     bench
   )
 
-addCommandAlias("validateCode", "headerCheckAll; scalafmtSbtCheck; scalafmtCheckAll")
+addCommandAlias(
+  "validateCode",
+  List(
+    "headerCheckAll",
+    "scalafmtSbtCheck",
+    "scalafmtCheckAll",
+  ).mkString(";")
+)