diff --git a/.buildkite/code-freeze.yml b/.buildkite/code-freeze.yml
index bef42bc2d80f..ee8f63392853 100644
--- a/.buildkite/code-freeze.yml
+++ b/.buildkite/code-freeze.yml
@@ -6,7 +6,7 @@ steps:
   - label: "Code Freeze"
     plugins: [$CI_TOOLKIT]
     command: |
-      source .buildkite/commands/configure-git-for-release-management.sh
+      source use-bot-for-git
 
       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 c7c4a7a0821f..000000000000
--- a/.buildkite/commands/configure-git-for-release-management.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -eu
-
-# This script needs to be source'd as use-bot-for-git exports a variable and this needs to be visible outside
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-  echo "This script must be 'source'd (instead of being called directly as an executable) to work properly"
-  exit 1
-fi
-
-echo '--- :robot_face: Use bot for git operations'
-# shellcheck disable=SC1091
-source use-bot-for-git
diff --git a/.buildkite/complete-code-freeze.yml b/.buildkite/complete-code-freeze.yml
index ea813bc1dcb5..f8d3da618d96 100644
--- a/.buildkite/complete-code-freeze.yml
+++ b/.buildkite/complete-code-freeze.yml
@@ -6,7 +6,8 @@ steps:
   - label: "Complete Code Freeze"
     plugins: [$CI_TOOLKIT]
     command: |
-      source .buildkite/commands/configure-git-for-release-management.sh
+      source use-bot-for-git
+
       .buildkite/commands/checkout-release-branch.sh
 
       install_gems
diff --git a/.buildkite/finalize-release.yml b/.buildkite/finalize-release.yml
index 2fd0869df661..9cbade9c8858 100644
--- a/.buildkite/finalize-release.yml
+++ b/.buildkite/finalize-release.yml
@@ -6,7 +6,8 @@ steps:
   - label: "Finalize release"
     plugins: [$CI_TOOLKIT]
     command: |
-      source .buildkite/commands/configure-git-for-release-management.sh
+      source use-bot-for-git
+
       .buildkite/commands/checkout-release-branch.sh
 
       install_gems
diff --git a/.buildkite/new-beta-release.yml b/.buildkite/new-beta-release.yml
index 4f2b8e441881..2e85933cea5a 100644
--- a/.buildkite/new-beta-release.yml
+++ b/.buildkite/new-beta-release.yml
@@ -6,7 +6,7 @@ steps:
   - label: "New Beta Release"
     plugins: [$CI_TOOLKIT]
     command: |
-      source .buildkite/commands/configure-git-for-release-management.sh
+      source use-bot-for-git
 
       install_gems
 
diff --git a/.buildkite/update-release-notes.yml b/.buildkite/update-release-notes.yml
index 57ac1df0e312..943b7769ca7c 100644
--- a/.buildkite/update-release-notes.yml
+++ b/.buildkite/update-release-notes.yml
@@ -6,7 +6,8 @@ steps:
   - label: "Update release notes"
     plugins: [$CI_TOOLKIT]
     command: |
-      source .buildkite/commands/configure-git-for-release-management.sh
+      source use-bot-for-git
+
       .buildkite/commands/checkout-editorial-branch.sh
 
       install_gems