diff --git a/.github/workflows/build-baseline.yml b/.github/workflows/build-baseline.yml
index 3b211df..d3af455 100644
--- a/.github/workflows/build-baseline.yml
+++ b/.github/workflows/build-baseline.yml
@@ -87,17 +87,15 @@ jobs:
       - name: Build frontend
         run: npm run build --workspace @bandscope/desktop
       - name: Build native shell
-        run: cargo +stable build --manifest-path apps/desktop/src-tauri/Cargo.toml --release --locked --target $env:BANDSCOPE_TARGET_TRIPLE
+        working-directory: apps/desktop
+        run: npx @tauri-apps/cli build --target $env:BANDSCOPE_TARGET_TRIPLE --bundles nsis
       - name: Package Windows amd64 artifact
         run: python scripts/release/package_desktop_artifact.py
       - name: Upload Windows amd64 artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: bandscope-windows-amd64-${{ github.sha }}
-          path: |
-            artifacts/*.zip
-            artifacts/*.sha256
-            artifacts/*.manifest.txt
+          path: artifacts/*
 
   build-windows-arm64:
     name: build / windows / arm64
@@ -168,17 +166,15 @@ jobs:
       - name: Build frontend
         run: npm run build --workspace @bandscope/desktop
       - name: Build native shell
-        run: cargo +stable build --manifest-path apps/desktop/src-tauri/Cargo.toml --release --locked --target $env:BANDSCOPE_TARGET_TRIPLE
+        working-directory: apps/desktop
+        run: npx @tauri-apps/cli build --target $env:BANDSCOPE_TARGET_TRIPLE --bundles nsis
       - name: Package Windows arm64 artifact
         run: python scripts/release/package_desktop_artifact.py
       - name: Upload Windows arm64 artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: bandscope-windows-arm64-${{ github.sha }}
-          path: |
-            artifacts/*.zip
-            artifacts/*.sha256
-            artifacts/*.manifest.txt
+          path: artifacts/*
 
   gate-windows:
     name: gate / build / windows
@@ -226,17 +222,15 @@ jobs:
       - name: Build frontend
         run: npm run build --workspace @bandscope/desktop
       - name: Build native shell
-        run: cargo +stable build --manifest-path apps/desktop/src-tauri/Cargo.toml --release --locked --target "$BANDSCOPE_TARGET_TRIPLE"
+        working-directory: apps/desktop
+        run: npx @tauri-apps/cli build --target "$BANDSCOPE_TARGET_TRIPLE" --bundles dmg
       - name: Package macOS amd64 artifact
         run: python3 scripts/release/package_desktop_artifact.py
       - name: Upload macOS amd64 artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: bandscope-macos-amd64-${{ github.sha }}
-          path: |
-            artifacts/*.zip
-            artifacts/*.sha256
-            artifacts/*.manifest.txt
+          path: artifacts/*
 
   build-macos-arm64:
     name: build / macos / arm64
@@ -274,17 +268,15 @@ jobs:
       - name: Build frontend
         run: npm run build --workspace @bandscope/desktop
       - name: Build native shell
-        run: cargo +stable build --manifest-path apps/desktop/src-tauri/Cargo.toml --release --locked --target "$BANDSCOPE_TARGET_TRIPLE"
+        working-directory: apps/desktop
+        run: npx @tauri-apps/cli build --target "$BANDSCOPE_TARGET_TRIPLE" --bundles dmg
       - name: Package macOS arm64 artifact
         run: python3 scripts/release/package_desktop_artifact.py
       - name: Upload macOS arm64 artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: bandscope-macos-arm64-${{ github.sha }}
-          path: |
-            artifacts/*.zip
-            artifacts/*.sha256
-            artifacts/*.manifest.txt
+          path: artifacts/*
 
   gate-macos:
     name: gate / build / macos
@@ -315,7 +307,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_TAG: ${{ github.event.release.tag_name }}
-        run: gh release upload "$RELEASE_TAG" artifacts/*.zip artifacts/*.sha256 artifacts/*.manifest.txt --clobber --repo ${{ github.repository }}
+        run: gh release upload "$RELEASE_TAG" artifacts/* --clobber --repo ${{ github.repository }}
 
   attach-macos-release-artifact:
     name: release-artifact / macos
@@ -336,4 +328,4 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_TAG: ${{ github.event.release.tag_name }}
-        run: gh release upload "$RELEASE_TAG" artifacts/*.zip artifacts/*.sha256 artifacts/*.manifest.txt --clobber --repo ${{ github.repository }}
+        run: gh release upload "$RELEASE_TAG" artifacts/* --clobber --repo ${{ github.repository }}
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 71b11ac..8fc55a8 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [build-dependencies]
-tauri-build = { version = "2" }
+tauri-build = { version = "2", features = [] }
 
 [dependencies]
 rfd = "0.17.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tauri = { version = "2.3.1" }
+tauri = { version = "2.3.1", features = [] }
 time = { version = "0.3", features = ["formatting", "macros"] }
 tokio = { version = "1.50.0", features = ["time"] }
 url = "2.5.8"
diff --git a/scripts/release/package_desktop_artifact.py b/scripts/release/package_desktop_artifact.py
index 81df8c0..6b544aa 100644
--- a/scripts/release/package_desktop_artifact.py
+++ b/scripts/release/package_desktop_artifact.py
@@ -87,10 +87,10 @@ def find_installer_packages(repo_root: Path) -> list[Path]:
     
     if bundle_dir.exists():
         # macOS DMG
-        installers.extend(bundle_dir.glob("dmg/*.dmg"))
+        installers.extend(bundle_dir.rglob("*.dmg"))
         # Windows EXE/MSI
-        installers.extend(bundle_dir.glob("nsis/*.exe"))
-        installers.extend(bundle_dir.glob("msi/*.msi"))
+        installers.extend(bundle_dir.rglob("*.exe"))
+        installers.extend(bundle_dir.rglob("*.msi"))
         
     return installers