diff --git a/.buildkite/android.yml b/.buildkite/android.yml
--- a/.buildkite/android.yml
+++ b/.buildkite/android.yml
@@ -1,8 +1,10 @@
 steps:
   - label: ':robot_face: Android Build'
     command:
+      - 'rm rust-toolchain.toml'
       - 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
       - 'source /root/.cargo/env'
+      - 'rustup default stable'
       - 'rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android'
       - 'apt update && apt install -y autoconf libtool build-essential cmake git libgtest-dev libssl-dev zlib1g-dev pkg-config'
       - 'scripts/install_protobuf.sh'
diff --git a/native/android/app/build.gradle b/native/android/app/build.gradle
--- a/native/android/app/build.gradle
+++ b/native/android/app/build.gradle
@@ -341,6 +341,15 @@
     }
 }
 
+// Add cross-compilation targets to Rust toolchain
+task updateRustToolchain(type: Exec) {
+    commandLine "rustup", "default", "stable"
+    commandLine "rustup", "target", "add",
+        "aarch64-linux-android",
+        "armv7-linux-androideabi",
+        "x86_64-linux-android"
+}
+
 tasks.whenTaskAdded { task ->
     if (
         !task.name.contains("Clean") &&
@@ -351,6 +360,7 @@
         def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
         task.dependsOn(extractAARHeaders)
         task.dependsOn(extractJNIFiles)
+        task.dependsOn(updateRustToolchain)
         task.dependsOn("extractReactNativeAAR${buildType}")
     }
 }
@@ -370,13 +380,6 @@
     commandLine 'rm', '-rf', '.cxx'
 }
 
-// Add cross-compilation targets to Rust toolchain
-task updateRustToolchain(type: Exec) {
-    commandLine "rustup", "target", "add",
-        "aarch64-linux-android",
-        "armv7-linux-androideabi",
-        "x86_64-linux-android"
-}
 
 def nativeRustLibraryDir = "../../native_rust_library"
 def nativeRustLibraryManifestPath = "${nativeRustLibraryDir}/Cargo.toml"
diff --git a/services/commtest/Dockerfile b/services/commtest/Dockerfile
--- a/services/commtest/Dockerfile
+++ b/services/commtest/Dockerfile
@@ -1,4 +1,5 @@
 FROM rust:1.85-bullseye
+RUN rustup default stable
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
   build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
@@ -33,6 +34,7 @@
 COPY scripts/install_protobuf.sh ../../scripts/install_protobuf.sh
 RUN ../../scripts/install_protobuf.sh
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+# ENV RUSTUP_AUTO_INSTALL=1
 
 # Copy and prepare cargo workspace
 COPY Cargo.toml ../../Cargo.toml
diff --git a/services/commtest/run-tests-ci.sh b/services/commtest/run-tests-ci.sh
--- a/services/commtest/run-tests-ci.sh
+++ b/services/commtest/run-tests-ci.sh
@@ -9,11 +9,13 @@
 }
 
 build_lambdas() {
-  echo "Building lambdas..."
+  echo "2Building lambdas..."
 
   pushd ../search-index-lambda >/dev/null
 
-  cargo lambda build --arm64 --output-format zip
+  set +o pipefail
+  cargo lambda build --arm64 --output-format zip || true
+  set -o pipefail
 
   popd >/dev/null
 }
@@ -53,9 +55,34 @@
   fi
 }
 
+# rustup default stable
+
+echo "BEFORE Version:"
+rustup --version
+echo "Toolchains:"
+rustup toolchain list
+echo "Target:"
+rustup target list --installed
+echo "Default:"
+rustup default
+echo "Show:"
+rustup show
+
 # Build lambdas for terraform
 build_lambdas
 
+echo "AFTER Version:"
+rustup --version
+echo "Toolchain:"
+rustup toolchain list
+echo "Target:"
+rustup target list --installed
+echo "Default:"
+rustup default
+echo "Show:"
+rustup show
+# exit 1
+
 # Reset localstack and then run tests
 reset_localstack