diff --git a/.github/workflows/baseline-profile.yml b/.github/workflows/baseline-profile.yml
index 416d002d1..6ddb37572 100644
--- a/.github/workflows/baseline-profile.yml
+++ b/.github/workflows/baseline-profile.yml
@@ -34,7 +34,7 @@ jobs:
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe52c7b6e..680381351 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -64,7 +64,7 @@ jobs:
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-default-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          key: cmake-default-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
           restore-keys: cmake-default-
 
       - name: Build
@@ -132,7 +132,7 @@ jobs:
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -150,7 +150,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          key: cmake-marshmallow-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
           restore-keys: cmake-marshmallow-
 
       - name: Build
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 041409a5e..178a4d5d5 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -28,7 +28,7 @@ jobs:
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index a8556b57d..c23c74361 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -129,6 +129,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Android")
     set(ANDROID 1)
 endif ()
 
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ../../../../rust-toolchain.toml)
+unset(Rust_TOOLCHAIN CACHE)
 FetchContent_Declare(
         Corrosion
         GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 916796962..d493afedb 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,5 @@
 [toolchain]
-channel = "nightly-2025-06-10"
+channel = "nightly-2025-08-14"
 components = ["rustfmt", "clippy", "rust-src"]
+targets = ["aarch64-linux-android", "x86_64-linux-android"]
 profile = "minimal"