diff --git a/.github/workflows/build-quick.yml b/.github/workflows/build-quick.yml
index 4ff057588..d72523186 100644
--- a/.github/workflows/build-quick.yml
+++ b/.github/workflows/build-quick.yml
@@ -134,9 +134,10 @@ jobs:
       - name: Install macos self-hosted pre-requisites
         # All platforms require cargo to build correctly, but our self-hosted tartelet
         # image doesn't have cargo (or rustup) installed by default. Easily fixed
-        if: contains(matrix.os, 'macos-tartelet')
+        if: contains(runner.environment, 'self-hosted') && contains(runner.os, 'macOS')
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Ubuntu setup
         # We get KVM set up on Ubuntu as we run the emulator there (only platform with nested virt)
@@ -173,7 +174,7 @@ jobs:
       - name: Restore Rust Cache (Unix)
         id: rust-cache-unix
         uses: actions/cache/restore@v5
-        if: contains(matrix.os, 'windows') == false
+        if: contains(matrix.os, 'windows') == false && contains(runner.environment, 'self-hosted') == false
         with:
           path: |
             ~/.cargo/registry
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 65627d335..8dc0399f9 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -72,10 +72,13 @@ jobs:
       - name: Install macos self-hosted pre-requisites
         # All platforms require cargo to build correctly, but our self-hosted tartelet
         # image doesn't have cargo (or rustup) installed by default. Easily fixed
+        if: contains(runner.environment, 'self-hosted') && contains(runner.os, 'macOS')
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Restore Rust Cache
+        if: contains(runner.environment, 'self-hosted') == false
         id: rust-cache
         uses: actions/cache/restore@v5
         with:
diff --git a/gradle.properties b/gradle.properties
index 87600edb2..0abc42d71 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 GROUP=io.github.david-allison
-VERSION_NAME=0.1.62-anki25.09.2
+VERSION_NAME=0.1.63-anki25.09.2
 
 POM_INCEPTION_YEAR=2020