diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
index 21f5e18e3..254522c9e 100644
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -1,13 +1,13 @@
 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'
     retry:
       automatic: true
     plugins:
       - docker#v5.3.0:
-          image: 'node:16.13-bullseye'
+          image: 'node:20.10.0-bullseye'
           always-pull: true
           workdir: /comm
           propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/jsi_codegen.yml b/.buildkite/jsi_codegen.yml
index 464aa087a..f3b1d29e3 100644
--- a/.buildkite/jsi_codegen.yml
+++ b/.buildkite/jsi_codegen.yml
@@ -1,19 +1,20 @@
 steps:
   - label: 'JSI Codegen'
     command:
       - '(pkill flow || true)'
       - 'apt update && apt install -y cmake'
       - 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y'
       - '. /root/.cargo/env'
+      - 'git config --global --add safe.directory /comm'
       - 'yarn ci-cleaninstall'
       - 'cd native && yarn codegen-jsi && git diff --exit-code'
     retry:
       automatic: true
     plugins:
       - docker#v5.3.0:
-          image: 'node:16.13-bullseye'
+          image: 'node:20.10.0-bullseye'
           always-pull: true
           workdir: /comm
           propagate-environment: true
     agents:
       - 'autoscaling=true'