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
@@ -5,7 +5,7 @@
       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
diff --git a/.buildkite/jsi_codegen.yml b/.buildkite/jsi_codegen.yml
--- a/.buildkite/jsi_codegen.yml
+++ b/.buildkite/jsi_codegen.yml
@@ -5,13 +5,14 @@
       - '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