diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 10e07855..0fba5896 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,12 +1,16 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+agents:
+  queue: mac
+
+env:
+  IMAGE_ID: xcode-15.3-v3
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  env: &common_env
-    # -v3 contains a workaround for a Simulator boot issue
-    # See paaHJt-6gL-p2#comment-8712
-    IMAGE_ID: xcode-15.3-v3
+    - automattic/a8c-ci-toolkit#3.5.1
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -21,7 +25,6 @@ steps:
       - fastlane/test_output/report.html
       - fastlane/test_output/report.junit
       - .build/derived-data/Logs/**/*.xcactivitylog
-    env: *common_env
     plugins: *common_plugins
 
   #################
@@ -40,7 +43,6 @@ steps:
     key: "lint"
     command: |
       lint_pod
-    env: *common_env
     plugins: *common_plugins
 
   #################
@@ -49,12 +51,9 @@ steps:
   - label: "⬆️ Publish Podspec"
     key: "publish"
     command: .buildkite/publish-pod.sh
-    env: *common_env
     plugins: *common_plugins
     depends_on:
       - "test"
       - "validate"
       - "lint"
     if: build.tag != null
-    agents:
-      queue: "mac"