diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 911d268b1..862546595 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,9 +1,7 @@
 steps:
   - command: |
-      ./builds/run_formatting.sh
-      .buildkite/scripts/push_autoformatting_changes.sh
       ./builds/run_linting.sh
-    label: "autoformat"
+    label: "linting"
     agents:
       queue: "scala"
 
diff --git a/.github/workflows/autoformat.yml b/.github/workflows/autoformat.yml
new file mode 100644
index 000000000..8b7366d9e
--- /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 5e4b17362..32bbc6475 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" \