diff --git a/.cargo/config.toml b/.cargo/config.toml
index 2cb3f276de..3567686fc0 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -8,6 +8,9 @@ rustflags = [
     # "-Dwarnings",
 
     # TODO(crbug/908640): To be resolved.
+    "-Aclippy::needless_return",
+    "-Aclippy::needless_doctest_main",
+    "-Aclippy::blocks_in_if_conditions",
     "-Aclippy::missing_safety_doc", # 26 errors
 
     # False positives affecting WlVfd @ `devices/src/virtio/wl.rs`.
diff --git a/rust-toolchain b/rust-toolchain
index 094d6ad00c..43c989b553 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.55.0
+1.56.1
diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version
index 9742708e66..baaec99b32 100644
--- a/tools/impl/dev_container/version
+++ b/tools/impl/dev_container/version
@@ -1 +1 @@
-r0002
+r0003
diff --git a/tools/install-aarch64-deps b/tools/install-aarch64-deps
index 69d92ca181..a97eee6bcf 100755
--- a/tools/install-aarch64-deps
+++ b/tools/install-aarch64-deps
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 set -ex
 
-sudo apt-get install --yes --no-install-recommends  \
+sudo apt-get install --yes --no-install-recommends \
     g++-aarch64-linux-gnu \
     gcc-aarch64-linux-gnu \
     ipxe-qemu \
@@ -24,5 +24,21 @@ rustup target add aarch64-unknown-linux-gnu
 
 # Generate a cross file for meson to compile for aarch64
 sudo mkdir -p -m 0755 /usr/local/share/meson/cross
-sudo /usr/share/meson/debcrossgen --arch arm64 \
-    -o /usr/local/share/meson/cross/aarch64
+sudo tee /usr/local/share/meson/cross/aarch64 >/dev/null <<EOF
+[binaries]
+c = '/usr/bin/aarch64-linux-gnu-gcc'
+cpp = '/usr/bin/aarch64-linux-gnu-g++'
+ar = '/usr/bin/aarch64-linux-gnu-ar'
+strip = '/usr/bin/aarch64-linux-gnu-strip'
+objcopy = '/usr/bin/aarch64-linux-gnu-objcopy'
+ld= '/usr/bin/aarch64-linux-gnu-ld'
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'
+
+[properties]
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'arm64'
+endian = 'little'
+EOF
diff --git a/tools/install-armhf-deps b/tools/install-armhf-deps
index cb06f07bf2..4758a5a15e 100755
--- a/tools/install-armhf-deps
+++ b/tools/install-armhf-deps
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 set -ex
 
-sudo apt-get install --yes --no-install-recommends  \
+sudo apt-get install --yes --no-install-recommends \
     g++-arm-linux-gnueabihf \
     gcc-arm-linux-gnueabihf \
     libc-dev:armhf \
@@ -20,5 +20,21 @@ rustup target add armv7-unknown-linux-gnueabihf
 
 # Generate a cross file for meson to compile for armhf
 sudo mkdir -p -m 0755 /usr/local/share/meson/cross
-sudo /usr/share/meson/debcrossgen --arch armhf \
-    -o /usr/local/share/meson/cross/armhf
+sudo tee /usr/local/share/meson/cross/armhf >/dev/null <<EOF
+[binaries]
+c = '/usr/bin/arm-linux-gnueabihf-gcc'
+cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ar = '/usr/bin/arm-linux-gnueabihf-ar'
+strip = '/usr/bin/arm-linux-gnueabihf-strip'
+objcopy = '/usr/bin/arm-linux-gnueabihf-objcopy'
+ld= '/usr/bin/arm-linux-gnueabihf-ld'
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+[properties]
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'arm7hlf'
+endian = 'little'
+EOF