diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 131bfbb..a88cec2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
         distribution: temurin
         java-version: 11
         cache: sbt
+    - uses: sbt/setup-sbt@v1
     - if: ${{ matrix.jobtype == 1 }}
       shell: bash
       run: sbt -v "++2.13.x" library/test
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index f9ead39..c951003 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -6,19 +6,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Check CLA
-      env:
-        AUTHOR: ${{ github.event.pull_request.user.login }}
-      run: |
-        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;
+      uses: scala/cla-checker@v1
+      with:
+        author: ${{ github.event.pull_request.user.login }}