diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 52f5eca..93eac89 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -4,7 +4,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - run: ./project/scripts/check-cla.sh
-      env:
-        AUTHOR: ${{ github.event.pull_request.user.login }}
+    - uses: scala/cla-verification-action@main
+      with:
+        author: ${{ github.event.pull_request.user.login }}
diff --git a/project/scripts/check-cla.sh b/project/scripts/check-cla.sh
deleted file mode 100755
index 8538a27..0000000
--- a/project/scripts/check-cla.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-AUTHOR=$GITHUB_ACTOR
-echo "Pull request submitted by $AUTHOR";
-signed=$(curl -s https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR | jq -r ".signed");
-if [ "$signed" = "true" ] ; then
-  echo "CLA check for $AUTHOR successful";
-else
-  echo "CLA check for $AUTHOR failed";
-  echo "Please sign the Scala CLA to contribute to the Scala compiler.";
-  echo "Go to https://www.lightbend.com/contribute/cla/scala and then";
-  echo "comment on the pull request to ask for a new check.";
-  echo "";
-  echo "Check if CLA is signed: https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR";
-  exit 1;
-fi;
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index a565798..1de06b0 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -1,5 +1,5 @@
 val scala2Version = "2.13.13"
-val scala3Version = "3.5.2"
+val scala3Version = "3.6.2"
 
 lazy val root = project
   .in(file("."))