diff --git a/.buildkite/beta-builds.yml b/.buildkite/beta-builds.yml
index d7ee1deef39f..f6fb82ade867 100644
--- a/.buildkite/beta-builds.yml
+++ b/.buildkite/beta-builds.yml
@@ -4,12 +4,6 @@
 # This pipeline is meant to be run via the Buildkite API, and is
 # only used for beta builds
 
-# 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"
 
@@ -20,7 +14,7 @@ steps:
   - label: "Gradle Wrapper Validation"
     command: |
       validate_gradle_wrapper
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT]
 
   # Wait for Gradle Wrapper to be validated before running any other jobs
   - wait
@@ -53,7 +47,7 @@ steps:
         key: wpbuild
         command: ".buildkite/commands/beta-build.sh wordpress"
         depends_on: wplint
-        plugins: *common_plugins
+        plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
 
@@ -61,7 +55,7 @@ steps:
         key: jpbuild
         command: ".buildkite/commands/beta-build.sh jetpack"
         depends_on: jplint
-        plugins: *common_plugins
+        plugins: [$CI_TOOLKIT]
         notify:
           - slack: "#build-and-ship"
 
@@ -73,4 +67,4 @@ steps:
       - wpbuild
       - jpbuild
     command: ".buildkite/commands/create-github-release.sh"
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT]
diff --git a/.buildkite/code-freeze.yml b/.buildkite/code-freeze.yml
index 09095a497234..0c8e12918ffd 100644
--- a/.buildkite/code-freeze.yml
+++ b/.buildkite/code-freeze.yml
@@ -1,15 +1,18 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-agents:
-  queue: "android"
 
 steps:
   - label: "Code Freeze"
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-git-for-release-management.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
 
+      echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
+      echo '--- :snowflake: Start Code Freeze'
       bundle exec fastlane code_freeze skip_confirm:true
+    agents:
+       queue: "tumblr-metal"
diff --git a/.buildkite/commands/configure-git-for-release-management.sh b/.buildkite/commands/configure-git-for-release-management.sh
deleted file mode 100755
index eb39be490f66..000000000000
--- a/.buildkite/commands/configure-git-for-release-management.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -eu
-
-# Git command line client is not configured in Buildkite. Temporarily, we configure it in each step.
-# Later on, we should be able to configure the agent instead.
-curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
-git config --global user.email "mobile+wpmobilebot@automattic.com"
-git config --global user.name "Automattic Release Bot"
-
-# Buildkite is currently using the https url to checkout. We need to override it to be able to use the deploy key.
-git remote set-url origin git@github.com:wordpress-mobile/WordPress-Android.git
diff --git a/.buildkite/complete-code-freeze.yml b/.buildkite/complete-code-freeze.yml
index 2b378accabdf..5898aa2e9285 100644
--- a/.buildkite/complete-code-freeze.yml
+++ b/.buildkite/complete-code-freeze.yml
@@ -1,16 +1,21 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-agents:
-  queue: "android"
 
 steps:
   - label: "Complete Code Freeze"
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-git-for-release-management.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
+
+      echo '--- :git: Checkout Release Branch'
       .buildkite/commands/checkout-release-branch.sh
 
+      echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
+      echo '--- :snowflake: Complete Code Freeze'
       bundle exec fastlane complete_code_freeze skip_confirm:true
+    agents:
+       queue: "tumblr-metal"
diff --git a/.buildkite/finalize-release.yml b/.buildkite/finalize-release.yml
index 015ba7cd5d78..0c91008c11f7 100644
--- a/.buildkite/finalize-release.yml
+++ b/.buildkite/finalize-release.yml
@@ -1,18 +1,23 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-agents:
-  queue: "android"
 
 steps:
   - label: "Finalize release"
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-git-for-release-management.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
+
+      echo '--- :git: Checkout Release Branch'
       .buildkite/commands/checkout-release-branch.sh
 
+      echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
       cp gradle.properties-example gradle.properties
 
+      echo '--- :shipit: Finalize Release'
       bundle exec fastlane finalize_release skip_confirm:true
+    agents:
+       queue: "tumblr-metal"
diff --git a/.buildkite/new-beta-release.yml b/.buildkite/new-beta-release.yml
index 3c2a9248fc18..db233146ca9a 100644
--- a/.buildkite/new-beta-release.yml
+++ b/.buildkite/new-beta-release.yml
@@ -1,17 +1,20 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-agents:
-  queue: "android"
 
 steps:
   - label: "New Beta Release"
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-git-for-release-management.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
 
+      echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
       cp gradle.properties-example gradle.properties
 
+      echo '--- :shipit: New Beta Release'
       bundle exec fastlane new_beta_release skip_confirm:true
+    agents:
+       queue: "tumblr-metal"
diff --git a/.buildkite/update-release-notes.yml b/.buildkite/update-release-notes.yml
index e484a67471ab..1b2ee0a53ae0 100644
--- a/.buildkite/update-release-notes.yml
+++ b/.buildkite/update-release-notes.yml
@@ -1,16 +1,21 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
-agents:
-  queue: "android"
 
 steps:
   - label: "Update release notes"
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-git-for-release-management.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
+
+      echo '--- :git: Checkout Editorial Branch'
       .buildkite/commands/checkout-editorial-branch.sh
 
+      echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
+      echo '--- :memo: Update Release Notes'
       bundle exec fastlane update_appstore_strings version:${RELEASE_VERSION}
+    agents:
+       queue: "tumblr-metal"