diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d071e5c4..46500c3f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,12 +32,9 @@ jobs:
           cache-dependency-path: "./package-lock.json"
           node-version-file: ".nvmrc"
 
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version-file: ".java-version"
-          distribution: "corretto"
-          cache: "sbt"
+      # See https://github.com/guardian/setup-scala
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Lint and test
         run: |
diff --git a/.java-version b/.java-version
deleted file mode 100644
index 98d9bcb7..00000000
--- a/.java-version
+++ /dev/null
@@ -1 +0,0 @@
-17
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..1199420d
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java corretto-17.0.13
\ No newline at end of file