diff --git a/Cross.toml b/Cross.toml
index 126ca5d3dac9..0c18c32667c1 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,9 +1,37 @@
 [build.env]
 passthrough = ["RUSTFLAGS"]
+pre-build = [
+    # https://aws.github.io/aws-lc-rs/requirements/linux.html
+    "apt-get update",
+    "apt-get install --assume-yes libclang1",
+    "cargo install --force --locked bindgen-cli",
+]
 
 [target.x86_64-pc-windows-gnu]
 pre-build = [
-    # Install NVIM for rustls, which deps on aws-lc-rs by default, and it needs NASM
+    # Install NASM for rustls, which deps on aws-lc-rs by default, and it needs NASM
     "apt-get update",
-    "apt-get install --assume-yes nasm clang",
+    "apt-get install --assume-yes libclang1 nasm cargo",
+    "cargo install --force --locked bindgen-cli",
 ]
+
+[target.aarch64-unknown-linux-gnu]
+pre-build = []
+
+[target.aarch64-unknown-linux-musl]
+pre-build = []
+
+[target.x86_64-unknown-linux-gnu]
+pre-build = []
+
+[target.x86_64-unknown-linux-musl]
+pre-build = []
+
+[target.i686-unknown-linux-gnu]
+pre-build = []
+
+[target.aarch64-apple-darwin]
+pre-build = []
+
+[target.x86_64-apple-darwin]
+pre-build = []
diff --git a/Dockerfile b/Dockerfile
index ae14d1e880db..61b351329106 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,7 @@ RUN case "$TARGETARCH" in \
     && echo "CC=$CC" \
     && rustup override set stable \
     && rustup target add "$RUST_TARGET" \
+    && cargo install --force --locked bindgen-cli \
     && RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target "$RUST_TARGET" --release --features "full" \
     && mv target/$RUST_TARGET/release/ss* target/release/