diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d08107401a..df36974f57 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,9 +1,6 @@
 steps:
-  - command: |
-      ./builds/run_formatting.sh
-      .buildkite/scripts/push_autoformatting_changes.sh
-      ./builds/run_linting.sh
-    label: "autoformat"
+  - command: ./builds/run_linting.sh
+    label: "linting"
     agents:
       queue: "scala"
 
diff --git a/.buildkite/scripts/push_autoformatting_changes.sh b/.buildkite/scripts/push_autoformatting_changes.sh
deleted file mode 100755
index ffdc33533b..0000000000
--- a/.buildkite/scripts/push_autoformatting_changes.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-<<EOF
-If there are any changes from autoformatting, push them to the PR.
-
-This script is mirrored in our other Scala repos.
-
-== Motivation ==
-
-Running our Scala formatting tool (scalafmt) is moderately slow, enough
-so that we don't want to run it as a pre-commit hook.  Instead, we run
-it on CI and have it push changes to the pull request branch.
-
-This gives us the benefits of consistently formatted code without having
-to pay a multi-second latency penalty on every commit.
-
-EOF
-
-set -o errexit
-set -o nounset
-
-# exit-code 1 = changes, exit code 0 = no changes
-# See https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---exit-code
-git diff --exit-code --quiet && has_changes=$? || has_changes=$?
-
-if (( has_changes == 1 ))
-then
-  echo "There were changes from formatting, creating a commit"
-
-  git config user.name "Buildkite on behalf of Wellcome Collection"
-  git config user.email "wellcomedigitalplatform@wellcome.ac.uk"
-  git remote add ssh-origin "$BUILDKITE_REPO" || echo "(remote repo already configured)"
-
-  # We checkout the branch before we add the commit, so we don't
-  # include the merge commit that Buildkite makes.
-  git fetch ssh-origin
-
-  # If we already have the branch checked out, it's fine.
-  git checkout --track "ssh-origin/$BUILDKITE_BRANCH" || echo "(branch already checked out)"
-
-  git add --verbose --update
-  git commit -m "Apply auto-formatting rules"
-  git push ssh-origin "HEAD:$BUILDKITE_BRANCH"
-
-  # We exit here to fail the build, so Buildkite will skip to the next
-  # build, which includes the autoformat commit.
-  exit 1
-else
-  echo "There were no changes from auto-formatting"
-fi
diff --git a/.github/workflows/autoformat.yml b/.github/workflows/autoformat.yml
new file mode 100644
index 0000000000..8b7366d9e3
--- /dev/null
+++ b/.github/workflows/autoformat.yml
@@ -0,0 +1,13 @@
+# Runs auto-formatting script on push to any branch
+name: "Scala auto-formatting"
+
+on: push
+
+permissions:
+  id-token: write
+  contents: write
+
+jobs:
+  autoformat:
+    uses: wellcomecollection/.github/.github/workflows/scala_formatting.yml@main
+    secrets: inherit
diff --git a/builds/run_sbt_task_in_docker.sh b/builds/run_sbt_task_in_docker.sh
index 896c811dd9..b644ed0879 100755
--- a/builds/run_sbt_task_in_docker.sh
+++ b/builds/run_sbt_task_in_docker.sh
@@ -48,6 +48,9 @@ else
 fi
 
 docker run --tty --rm \
+  -e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-}" \
+  -e AWS_SECRET_KEY="${AWS_SECRET_KEY:-}" \
+  -e AWS_SESSION_TOKEN="${AWS_SESSION_TOKEN:-}" \
   --volume ~/.sbt:/root/.sbt \
   --volume ~/.ivy2:/root/.ivy2 \
   --volume "$HOST_COURSIER_CACHE:/root/$LINUX_COURSIER_CACHE" \
diff --git a/items/src/main/scala/weco/api/items/services/SierraItemUpdater.scala b/items/src/main/scala/weco/api/items/services/SierraItemUpdater.scala
index bb16a2050c..fdddbbf454 100644
--- a/items/src/main/scala/weco/api/items/services/SierraItemUpdater.scala
+++ b/items/src/main/scala/weco/api/items/services/SierraItemUpdater.scala
@@ -194,9 +194,8 @@ class SierraItemUpdater(
   def updateItems(items: Seq[DisplayItem]): Future[Seq[DisplayItem]] = {
     val staleItemIds = items
       .filter(item => item.isStale)
-      .map(
-        item => SierraItemIdentifier.fromSourceIdentifier(item.identifiers.head)
-      )
+      .map(item =>
+        SierraItemIdentifier.fromSourceIdentifier(item.identifiers.head))
 
     staleItemIds.size match {
       case 0 => Future.successful(items)
@@ -214,7 +213,5 @@ class SierraItemUpdater(
   private def parseISOStringToLocalDate(isoString: String): LocalDate =
     LocalDate.parse(
       isoString,
-      DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
-    )
-
+      DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"))
 }