diff --git a/.buildkite/beta-builds.yml b/.buildkite/beta-builds.yml
index d54c253621cb..d7ee1deef39f 100644
--- a/.buildkite/beta-builds.yml
+++ b/.buildkite/beta-builds.yml
@@ -1,3 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # This pipeline is meant to be run via the Buildkite API, and is
 # only used for beta builds
 
@@ -7,6 +10,9 @@ common_params:
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   #################
   # Gradle Wrapper Validation
diff --git a/.buildkite/code-freeze.yml b/.buildkite/code-freeze.yml
index d46b6568e8a9..ab1e90253793 100644
--- a/.buildkite/code-freeze.yml
+++ b/.buildkite/code-freeze.yml
@@ -1,9 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   - label: "Code Freeze"
     plugins: *common_plugins
diff --git a/.buildkite/complete-code-freeze.yml b/.buildkite/complete-code-freeze.yml
index c50c7ff05254..8e27d9888b7a 100644
--- a/.buildkite/complete-code-freeze.yml
+++ b/.buildkite/complete-code-freeze.yml
@@ -1,9 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   - label: "Complete Code Freeze"
     plugins: *common_plugins
diff --git a/.buildkite/finalize-release.yml b/.buildkite/finalize-release.yml
index 7c03f7137228..1900c4ad6b3f 100644
--- a/.buildkite/finalize-release.yml
+++ b/.buildkite/finalize-release.yml
@@ -1,9 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   - label: "Finalize release"
     plugins: *common_plugins
diff --git a/.buildkite/new-beta-release.yml b/.buildkite/new-beta-release.yml
index 0cde24c0912b..1b72021511c1 100644
--- a/.buildkite/new-beta-release.yml
+++ b/.buildkite/new-beta-release.yml
@@ -1,9 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   - label: "New Beta Release"
     plugins: *common_plugins
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 290f05477e29..227a0a21dcf2 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,3 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
diff --git a/.buildkite/release-builds.yml b/.buildkite/release-builds.yml
index 0e44afed36d1..eb4df6618207 100644
--- a/.buildkite/release-builds.yml
+++ b/.buildkite/release-builds.yml
@@ -1,3 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # This pipeline is meant to be run via the Buildkite API, and is
 # only used for release builds
 
@@ -7,6 +10,9 @@ common_params:
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   #################
   # Gradle Wrapper Validation
diff --git a/.buildkite/schedules/dependency-analysis.yml b/.buildkite/schedules/dependency-analysis.yml
index fb6cd3b469f7..5787bb5c2d5e 100644
--- a/.buildkite/schedules/dependency-analysis.yml
+++ b/.buildkite/schedules/dependency-analysis.yml
@@ -1,3 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
@@ -9,9 +12,7 @@ agents:
 
 steps:
   - label: "dependency analysis"
-    # The meta-data added is used by Apps Metrics Prometheus collector to find the build.
     command: |
-      buildkite-agent meta-data set "scheduled-build" "dependency-analysis"
       echo "--- 📊 Analyzing"
       cp gradle.properties-example gradle.properties
       ./gradlew buildHealth
diff --git a/.buildkite/update-release-notes.yml b/.buildkite/update-release-notes.yml
index dcdca7b56518..4d1aab1ef66b 100644
--- a/.buildkite/update-release-notes.yml
+++ b/.buildkite/update-release-notes.yml
@@ -1,9 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#3.4.2
 
+agents:
+  queue: "android"
+
 steps:
   - label: "Update release notes"
     plugins: *common_plugins