diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index c2dda835..5bac9e18 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@main
+    uses: playframework/.github/.github/workflows/sbt.yml@v1
     with:
       cmd: sbt validateCode
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@main
+    uses: playframework/.github/.github/workflows/binary-check.yml@v1
 
   check-docs:
     name: Docs
-    uses: playframework/.github/.github/workflows/sbt.yml@main
+    uses: playframework/.github/.github/workflows/sbt.yml@v1
     with:
       cmd: sbt doc
 
@@ -31,7 +31,7 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    uses: playframework/.github/.github/workflows/sbt-matrix.yml@main
+    uses: playframework/.github/.github/workflows/sbt-matrix.yml@v1
     with: # Should be sync with Mergify conditions (.mergify.yml)
       java: >-
         [ "11", "8" ]
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fa268dd6..f0004ffe 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@main
+    uses: playframework/.github/.github/workflows/publish.yml@v1
     secrets:
       username: ${{ secrets.SONATYPE_USERNAME }}
       password: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/.mergify.yml b/.mergify.yml
index e60f569c..46d84174 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -20,7 +20,7 @@ pull_request_rules:
       - check-success~=^Tests / Scala 3\.(\d+)\.(\d+)(-RC\d+)? & JDK 11$
       - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 8$
       - check-success~=^Tests / Scala 3\.(\d+)\.(\d+)(-RC\d+)? & JDK 8$
-      - status-success=typesafe-cla-validator
+      - check-success=typesafe-cla-validator
       - "#approved-reviews-by>=1"
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
diff --git a/build.sbt b/build.sbt
index 9d97c76a..b08d9c0e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -450,7 +450,4 @@ lazy val root = project
     bench
   )
 
-addCommandAlias(
-  "validateCode",
-  "scalafmtSbtCheck;scalafmtCheckAll;headerCheck;test:headerCheck"
-)
+addCommandAlias("validateCode", "headerCheckAll; scalafmtSbtCheck; scalafmtCheckAll")