diff --git a/.buildkite/android.yml b/.buildkite/android.yml
--- a/.buildkite/android.yml
+++ b/.buildkite/android.yml
@@ -13,7 +13,6 @@
       - docker#v3.13.0:
           image: 'reactnativecommunity/react-native-android:latest'
           shell: ['/bin/bash', '-e', '-c']
-          environment:
-            - 'BUILDKITE=true'
+          propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/cmakecheck.yml b/.buildkite/cmakecheck.yml
--- a/.buildkite/cmakecheck.yml
+++ b/.buildkite/cmakecheck.yml
@@ -8,5 +8,6 @@
       - docker#v3.13.0:
           image: 'python:bullseye'
           shell: ['/bin/bash', '-e', '-c']
+          propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -12,5 +12,6 @@
           image: 'node:16.13-bullseye'
           always-pull: true
           workdir: /comm
+          propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/jsi_codegen.yml b/.buildkite/jsi_codegen.yml
--- a/.buildkite/jsi_codegen.yml
+++ b/.buildkite/jsi_codegen.yml
@@ -9,5 +9,6 @@
           image: 'node:16.13-bullseye'
           always-pull: true
           workdir: /comm
+          propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/shellcheck.yml b/.buildkite/shellcheck.yml
--- a/.buildkite/shellcheck.yml
+++ b/.buildkite/shellcheck.yml
@@ -1,5 +1,5 @@
 steps:
-  - label: ":shell: ShellCheck"
+  - label: ':shell: ShellCheck'
     command:
       - 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y shellcheck'
       - 'shopt -s globstar'
@@ -7,6 +7,7 @@
     plugins:
       - docker#v3.13.0:
           image: 'debian:stable'
-          shell: ["/bin/bash", "-e", "-c"]
+          shell: ['/bin/bash', '-e', '-c']
+          propagate-environment: true
     agents:
       - 'autoscaling=true'