diff --git a/.buildkite/commands/configure-environment.sh b/.buildkite/commands/configure-environment.sh
deleted file mode 100755
index bc8c3fe62a2..00000000000
--- a/.buildkite/commands/configure-environment.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -eu
-
-echo '--- :git: Configure Git for Release Management'
-.buildkite/commands/configure-git-for-release-management.sh
-
-echo '--- :ruby: Setup Ruby Tools'
-install_gems
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 4c7588d459c..00000000000
--- a/.buildkite/commands/configure-git-for-release-management.sh
+++ /dev/null
@@ -1,7 +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.
-add_host_to_ssh_known_hosts github.com
-git config --global user.email "mobile+wpmobilebot@automattic.com"
-git config --global user.name "Automattic Release Bot"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b455390ab9b..f83a3f8b12f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -92,7 +92,7 @@ steps:
   # UI Tests
   #################
   - label: ":microscope: UI Tests (iPhone)"
-    command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16 (18.1)'
+    command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16'
     depends_on: build
     plugins: [$CI_TOOLKIT]
     artifact_paths:
@@ -102,7 +102,7 @@ steps:
           context: UI Tests (iPhone)
 
   - label: ":microscope: UI Tests (iPad)"
-    command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation) (18.1)"
+    command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation)"
     depends_on: build
     plugins: [$CI_TOOLKIT]
     artifact_paths:
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 47f80f4d52f..58f055434f6 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -11,11 +11,15 @@ steps:
   - label: Complete Code Freeze
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/release-pipelines/finalize-hotfix-release.yml b/.buildkite/release-pipelines/finalize-hotfix-release.yml
index 98c39d3392b..e53311bcbb8 100644
--- a/.buildkite/release-pipelines/finalize-hotfix-release.yml
+++ b/.buildkite/release-pipelines/finalize-hotfix-release.yml
@@ -11,11 +11,15 @@ steps:
   - label: Finalize Hotfix Release
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/release-pipelines/finalize-release.yml b/.buildkite/release-pipelines/finalize-release.yml
index 4b34192f0bd..4aa90baeb80 100644
--- a/.buildkite/release-pipelines/finalize-release.yml
+++ b/.buildkite/release-pipelines/finalize-release.yml
@@ -11,11 +11,15 @@ steps:
   - label: Finalize Release
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml
index 6104cd11a07..c4be3565838 100644
--- a/.buildkite/release-pipelines/new-beta-release.yml
+++ b/.buildkite/release-pipelines/new-beta-release.yml
@@ -11,11 +11,15 @@ steps:
   - label: New Beta Release
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/release-pipelines/new-hotfix-release.yml b/.buildkite/release-pipelines/new-hotfix-release.yml
index f8c5c56dcb6..b3c49b88d0d 100644
--- a/.buildkite/release-pipelines/new-hotfix-release.yml
+++ b/.buildkite/release-pipelines/new-hotfix-release.yml
@@ -11,7 +11,11 @@ steps:
   - label: New Hotfix Release
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.sh
+      echo '--- :robot_face: Use bot for Git operations'
+      source use-bot-for-git
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
 
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
diff --git a/.buildkite/release-pipelines/publish-release.yml b/.buildkite/release-pipelines/publish-release.yml
index d2fec414b21..f7d8577d08f 100644
--- a/.buildkite/release-pipelines/publish-release.yml
+++ b/.buildkite/release-pipelines/publish-release.yml
@@ -11,11 +11,15 @@ steps:
   - label: Publish Release
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index 20c94a08049..6d233449f20 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -11,7 +11,11 @@ steps:
   - label: Start Code Freeze
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.sh
+      echo '--- :robot_face: Use bot for Git operations'
+      source use-bot-for-git
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
 
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
diff --git a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml
index e5e842827eb..47279c5a66d 100644
--- a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml
+++ b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml
@@ -11,11 +11,15 @@ steps:
   - label: Update Metadata on App Store Connect
     plugins: [$CI_TOOLKIT]
     command: |
-      .buildkite/commands/configure-environment.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 "$RELEASE_VERSION"
 
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access Secrets'
       bundle exec fastlane run configure_apply
 
diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 62d8b23932e..cf2a19dccd9 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,4 +1,4 @@
 CURRENT_PROJECT_VERSION = $VERSION_LONG
 MARKETING_VERSION = $VERSION_SHORT
-VERSION_LONG = 21.0.0.0
-VERSION_SHORT = 21.0
+VERSION_LONG = 20.9.0.0
+VERSION_SHORT = 20.9