diff --git a/.github/actions/apply-version/action.yml b/.github/actions/apply-version/action.yml
index 0617abc..b65b667 100644
--- a/.github/actions/apply-version/action.yml
+++ b/.github/actions/apply-version/action.yml
@@ -44,11 +44,17 @@ runs:
                   src-tauri/tauri.appstore.conf.json > src-tauri/tauri.appstore.conf.json.tmp
               mv src-tauri/tauri.appstore.conf.json.tmp src-tauri/tauri.appstore.conf.json
 
-              jq --arg id "$WINDOWS_IDENTIFIER" --arg v "$INPUT_VERSION" \
+              jq --arg id "$WINDOWS_IDENTIFIER" --arg v "$SEMVER" \
                   '.identifier = $id | .version = $v' \
                   src-tauri/tauri.windows.conf.json > src-tauri/tauri.windows.conf.json.tmp
               mv src-tauri/tauri.windows.conf.json.tmp src-tauri/tauri.windows.conf.json
 
+              if [[ -f "src-tauri/gen/windows/bundle.config.json" ]]; then
+                  jq --arg v "$INPUT_VERSION" '.version = $v' \
+                      src-tauri/gen/windows/bundle.config.json > src-tauri/gen/windows/bundle.config.json.tmp
+                  mv src-tauri/gen/windows/bundle.config.json.tmp src-tauri/gen/windows/bundle.config.json
+              fi
+
               sed -i.bak "s/^version = \".*\"/version = \"$SEMVER\"/" src-tauri/Cargo.toml
               rm -f src-tauri/Cargo.toml.bak
 
diff --git a/.github/actions/setup-desktop-build/action.yml b/.github/actions/setup-desktop-build/action.yml
index 97e03e6..d11ca42 100644
--- a/.github/actions/setup-desktop-build/action.yml
+++ b/.github/actions/setup-desktop-build/action.yml
@@ -27,6 +27,11 @@ runs:
           with:
               targets: x86_64-pc-windows-msvc, aarch64-pc-windows-msvc
 
+        - name: Setup Rust cache
+          uses: swatinem/rust-cache@v2
+          with:
+              workspaces: "src-tauri -> target"
+
         - name: Install msixbundle-cli
           if: inputs.platform == 'windows'
           shell: bash
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index a1e6a54..21ba5e4 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -94,7 +94,7 @@ jobs:
         runs-on: windows-latest
         needs: prepare
         env:
-            APP_PATH: src-tauri/target/msix/Scriptio.msixbundle
+            APP_PATH: src-tauri/target/msix/Scriptio_${{ needs.prepare.outputs.version }}.msixbundle
         steps:
             - uses: actions/checkout@v6
 
@@ -118,7 +118,7 @@ jobs:
 
             - name: Rename output to fixed name
               run: |
-                  Get-Item "src-tauri/target/msix/*.msixbundle" | Rename-Item -NewName "Scriptio.msixbundle"
+                  Get-Item "src-tauri/target/msix/*.msixbundle" | Rename-Item -NewName "Scriptio_${{ needs.prepare.outputs.version }}.msixbundle"
 
             - name: Configure Microsoft Store CLI
               uses: microsoft/microsoft-store-apppublisher@v1.1