diff --git a/ci/crosvm_aarch64_builder/Dockerfile b/ci/crosvm_aarch64_builder/Dockerfile
index e4e2000852..f3fac78652 100644
--- a/ci/crosvm_aarch64_builder/Dockerfile
+++ b/ci/crosvm_aarch64_builder/Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends  \
     qemu-user-static
 
 RUN apt-get install --yes --no-install-recommends -o APT::Immediate-Configure=false \
+    libc-dev:arm64 \
     libcap-dev:arm64 \
     libdbus-1-dev:arm64 \
     libdrm-dev:arm64 \
diff --git a/ci/crosvm_base/Dockerfile b/ci/crosvm_base/Dockerfile
index 2117a32199..7a32fe7803 100644
--- a/ci/crosvm_base/Dockerfile
+++ b/ci/crosvm_base/Dockerfile
@@ -20,10 +20,13 @@ RUN echo 'APT::Default-Release "stable";' >/etc/apt/apt.conf.d/99_default_stable
 RUN apt-get update && apt-get install --yes --no-install-recommends \
     ca-certificates \
     curl \
+    clang \
+    libclang-dev \
     g++ \
     gcc \
     git \
     jq \
+    libasound2-dev \
     make \
     meson/testing \
     nasm \
@@ -58,15 +61,13 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- \
     --default-toolchain $(cat rust-toolchain)
 ENV PATH="/root/.cargo/bin:${PATH}"
 
+# The bindgen tool is required to build a crosvm dependency.
+RUN cargo install bindgen
+
 # Point cargo to store data on the scratch volume.
 ENV CARGO_TARGET_DIR=/workspace/scratch/cargo_target
 ENV CARGO_HOME=/workspace/scratch/cargo_home
 
-# Warms up the cargo registry cache for future cargo runs. Cargo will still
-# update the cache using a git pull, but it only needs to download files that
-# were changed since this image was built.
-RUN cargo install thisiznotarealpackage -q || true
-
 # We are building out of source with a readonly source filesystem. This flag
 # tells some build.rs files to not write into the src filesystem.
 ENV RUSTFLAGS='--cfg hermetic'
diff --git a/ci/image_tag b/ci/image_tag
index b7be5a1274..5ef1fd681f 100644
--- a/ci/image_tag
+++ b/ci/image_tag
@@ -1 +1 @@
-r0004
+r0005