diff --git a/.buildkite/package-lock.json b/.buildkite/package-lock.json
index ef418f07408edf..3dcfe7abd92869 100644
--- a/.buildkite/package-lock.json
+++ b/.buildkite/package-lock.json
@@ -8,7 +8,7 @@
       "name": "kibana-buildkite",
       "version": "1.0.0",
       "dependencies": {
-        "kibana-buildkite-library": "elastic/kibana-buildkite-library#eb8ddcd9436811454da83b2581df6a484a1707ea"
+        "kibana-buildkite-library": "elastic/kibana-buildkite-library#2515d6c5943db49bb8e3614b6fed6942ec81c7c6"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -406,9 +406,9 @@
       }
     },
     "node_modules/kibana-buildkite-library": {
-      "version": "1.1.1",
-      "resolved": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#eb8ddcd9436811454da83b2581df6a484a1707ea",
-      "integrity": "sha512-0+Oco84tVzrLyS93CQNoMRDga3uugfP5m4c7AUoI1HI7aNpJcw0ByJO59zF4YYUw45MboeVsFbwON1u+8Ot8Vg==",
+      "version": "1.1.2",
+      "resolved": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#2515d6c5943db49bb8e3614b6fed6942ec81c7c6",
+      "integrity": "sha512-TvtPQF9x0NCiyilORjxoo/yYrdMbbO7j8IKrhR/zc7v7AwWOwx0JA9UcNTI3uXn7bE0Y77xlVjRhB5b3FZVQpA==",
       "dependencies": {
         "@octokit/rest": "^18.10.0",
         "axios": "^1.6.3",
@@ -931,9 +931,9 @@
       }
     },
     "kibana-buildkite-library": {
-      "version": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#eb8ddcd9436811454da83b2581df6a484a1707ea",
-      "integrity": "sha512-0+Oco84tVzrLyS93CQNoMRDga3uugfP5m4c7AUoI1HI7aNpJcw0ByJO59zF4YYUw45MboeVsFbwON1u+8Ot8Vg==",
-      "from": "kibana-buildkite-library@elastic/kibana-buildkite-library#eb8ddcd9436811454da83b2581df6a484a1707ea",
+      "version": "git+ssh://git@github.com/elastic/kibana-buildkite-library.git#2515d6c5943db49bb8e3614b6fed6942ec81c7c6",
+      "integrity": "sha512-TvtPQF9x0NCiyilORjxoo/yYrdMbbO7j8IKrhR/zc7v7AwWOwx0JA9UcNTI3uXn7bE0Y77xlVjRhB5b3FZVQpA==",
+      "from": "kibana-buildkite-library@elastic/kibana-buildkite-library#2515d6c5943db49bb8e3614b6fed6942ec81c7c6",
       "requires": {
         "@octokit/rest": "^18.10.0",
         "axios": "^1.6.3",
diff --git a/.buildkite/package.json b/.buildkite/package.json
index 7dcd00b9118432..682a903a4c790d 100644
--- a/.buildkite/package.json
+++ b/.buildkite/package.json
@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "kibana-buildkite-library": "elastic/kibana-buildkite-library#eb8ddcd9436811454da83b2581df6a484a1707ea"
+    "kibana-buildkite-library": "elastic/kibana-buildkite-library#2515d6c5943db49bb8e3614b6fed6942ec81c7c6"
   }
 }
\ No newline at end of file
diff --git a/.buildkite/scripts/lifecycle/post_build.sh b/.buildkite/scripts/lifecycle/post_build.sh
index 50e225e2b5bbc5..c18e4c0167f6f7 100755
--- a/.buildkite/scripts/lifecycle/post_build.sh
+++ b/.buildkite/scripts/lifecycle/post_build.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 BUILD_SUCCESSFUL=$(node "$(dirname "${0}")/build_status.js")
 export BUILD_SUCCESSFUL
 
-if [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
+if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
   "$(dirname "${0}")/commit_status_complete.sh"
 fi
 
diff --git a/.buildkite/scripts/lifecycle/pre_build.sh b/.buildkite/scripts/lifecycle/pre_build.sh
index 2ebc015fbdcc4f..defea6ba1c4a69 100755
--- a/.buildkite/scripts/lifecycle/pre_build.sh
+++ b/.buildkite/scripts/lifecycle/pre_build.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-if [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
+if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
   "$(dirname "${0}")/commit_status_start.sh"
 fi