diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c466dc0..7dad900 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '11'
-          cache: sbt
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
       - name: CI
         run: |
           LAST_TEAMCITY_BUILD=6410
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..b4e8fc6
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java corretto-21
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index e88a0d8..73df629 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.10.7