diff --git a/.buildkite/android.yml b/.buildkite/android.yml
--- a/.buildkite/android.yml
+++ b/.buildkite/android.yml
@@ -8,6 +8,7 @@
       - 'scripts/install_protobuf.sh'
       - 'yarn ci-cleaninstall'
       - 'cd native/android'
+      - 'yes | sdkmanager "cmake;3.18.1"'
       - './gradlew clean && ./gradlew bundleRelease --no-daemon "-Dorg.gradle.jvmargs=-Xmx32g -XX:MaxMetaspaceSize=8g"'
     retry:
       automatic: 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
@@ -1,11 +1,11 @@
 steps:
   - label: ':eslint: :jest: ESLint & Flow & Jest'
-    command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . /root/.cargo/env && apt update && apt install -y cmake && yarn ci-cleaninstall && yarn eslint:all --max-warnings=0 && yarn flow:all && yarn jest:all'
+    command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . "$HOME/.cargo/env" && apt update && apt install -y cmake && yarn ci-cleaninstall && yarn eslint:all --max-warnings=0 && yarn flow:all && yarn jest:all'
     retry:
       automatic: true
     plugins:
       - docker#v5.3.0:
-          image: 'node:20.10.0-bullseye'
+          image: 'cimg/node:20.19'
           always-pull: true
           workdir: /comm
           propagate-environment: true
diff --git a/.buildkite/ios.yml b/.buildkite/ios.yml
--- a/.buildkite/ios.yml
+++ b/.buildkite/ios.yml
@@ -5,7 +5,7 @@
       - 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y'
       - 'source /Users/comm/.cargo/env'
       - 'yarn ci-cleaninstall'
-      - 'cd native && yarn xcodebuild -workspace Comm.xcworkspace -scheme Comm -destination generic/platform=iOS -allowProvisioningUpdates'
+      - 'cd native && yarn xcodebuild -version && yarn xcodebuild -workspace Comm.xcworkspace -scheme Comm -destination generic/platform=iOS -allowProvisioningUpdates'
     retry:
       automatic: true
     env: