diff --git a/apps/desktop/cross-build.ps1 b/apps/desktop/cross-build.ps1
new file mode 100755
index 00000000000..dd5c10959a2
--- /dev/null
+++ b/apps/desktop/cross-build.ps1
@@ -0,0 +1,110 @@
+#!/usr/bin/env pwsh
+param(
+    $CertificatePath,
+    $CertificatePassword
+)
+$ErrorActionPreference = "Stop"
+$PSNativeCommandUseErrorActionPreference = $true
+$startTime = get-Date
+$originalLocation = Get-Location
+try {
+
+cd $PSScriptRoot
+
+$builderConfig = Get-Content electron-builder.json | ConvertFrom-Json
+$packageConfig = Get-Content package.json | ConvertFrom-Json
+$manifestTemplate = Get-Content custom-appx-manifest.xml
+
+$srcDir = Get-Location
+$assetsDir = Get-Item $builderConfig.directories.buildResources
+$buildDir = Get-Item $builderConfig.directories.app
+$outDir = Join-Path (Get-Location) ($builderConfig.directories.output ?? "dist")
+
+$arch = 'arm64'
+$ext = "appx"
+$version = Get-Date -Format "yyyy.M.d.Hmm"
+# $buildNumber = Get-Date -Format "HHmm"
+# $version = "$($packageConfig.version).$buildNumber"
+$productName = $builderConfig.productName
+$artifactName = "${productName}-$($packageConfig.version)-${arch}.$ext"
+
+Write-Host "Building native code"
+npm run build-native-win-cross
+
+Write-Host "Building Javascript code"
+npm run build:dev
+
+Write-Host "Cleaning output folder"
+Remove-Item -Recurse -Force $outDir -ErrorAction Ignore
+
+Write-Host "Packaging Electron executable"
+& npx electron-builder --publish never --dir --win --$arch
+
+cd $outDir
+New-Item -Type Directory (Join-Path $outDir "appx")
+
+Write-Host "Building Appx directory structure"
+$appxDir = (Join-Path $outDir appx/app)
+Move-Item (Join-Path $outDir "win-${arch}-unpacked") $appxDir
+
+# # Copy native module
+# Write-Host "Copying native module"
+# $napiUnpackDir = Join-Path $outDir "appx/app/resources/app.asar.unpacked/node_modules/@bitwarden/desktop-napi/"
+# New-Item -Type Directory -Force $napiUnpackDir
+# $napiDir = Join-Path $buildDir "node_modules/`@bitwarden/desktop-napi/"
+# Push-Location $napiDir
+# Copy-Item *.node $napiUnpackDir
+# #Copy-Item index.js $napiUnpackDir
+# Pop-Location
+
+Write-Host "Copying Assets"
+New-Item -Type Directory (Join-Path $outDir appx/assets)
+Copy-Item $srcDir/resources/appx/* $outDir/appx/assets/
+
+Write-Host "Building Appx manifest"
+$translationMap = @{
+    'arch' = $arch
+    'applicationId' = $builderConfig.appx.applicationId
+    'displayName' = $productName
+    'executable' = 'app\Bitwarden.exe'
+    'publisher' = $builderConfig.appx.publisher
+    'publisherDisplayName' = $builderConfig.appx.publisherDisplayName
+    'version' = $version
+}
+
+$manifest = $manifestTemplate
+$translationMap.Keys | ForEach-Object {
+    $manifest = $manifest.Replace("`${$_}", $translationMap[$_])
+}
+$manifest | Out-File appx/AppxManifest.xml
+$unsignedArtifactpath = [System.IO.Path]::GetFileNameWithoutExtension($artifactName) + "-unsigned.$ext"
+Write-Host "Creating unsigned Appx"
+makemsix pack -d appx -p $unsignedArtifactpath
+
+$outfile = Join-Path $outDir $unsignedArtifactPath
+if ($null -eq $CertificatePath || $null -eq $CertificatePassword) {
+    Write-Warning "No Certificate specified. Not signing Appx."
+}
+else {
+
+    $cert = (Get-Item $CertificatePath).FullName
+    $pw = $CertificatePassword
+    $unsigned = $outfile
+    $outfile = (Join-Path $outDir $artifactName)
+    Write-Host "Signing $artifactName with $cert"
+    osslsigncode sign `
+        -pkcs12 "$cert" `
+        -pass "$pw" `
+        -in $unsigned `
+        -out $outfile
+    Remove-Item $unsigned
+}
+
+$endTime = Get-Date
+$elapsed = $endTime - $startTime
+Write-Host "Successfully packaged $(Get-Item $outfile)"
+Write-Host ("Finished in $($elapsed.ToString('mm')) minutes and $($elapsed.ToString('ss')).$($elapsed.ToString('fff')) seconds")
+}
+finally {
+    Set-Location -Path $originalLocation
+}
\ No newline at end of file
diff --git a/apps/desktop/electron-builder.beta.json b/apps/desktop/electron-builder.beta.json
index 71850804cbd..2673dd213a3 100644
--- a/apps/desktop/electron-builder.beta.json
+++ b/apps/desktop/electron-builder.beta.json
@@ -13,12 +13,11 @@
   },
   "afterSign": "scripts/after-sign.js",
   "afterPack": "scripts/after-pack.js",
-  "asarUnpack": ["**/*.node"],
   "files": [
-    "**/*",
-    "!**/node_modules/@bitwarden/desktop-napi/**/*",
-    "**/node_modules/@bitwarden/desktop-napi/index.js",
-    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
+    "!node_modules/@bitwarden/desktop-napi/src",
+    "!node_modules/@bitwarden/desktop-napi/Cargo.toml",
+    "!node_modules/@bitwarden/desktop-napi/build.rs",
+    "!node_modules/@bitwarden/desktop-napi/package.json"
   ],
   "electronVersion": "36.9.3",
   "generateUpdatesFilesForAllChannels": true,
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 0bd6d93970b..e619da007eb 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -15,12 +15,11 @@
   },
   "afterSign": "scripts/after-sign.js",
   "afterPack": "scripts/after-pack.js",
-  "asarUnpack": ["**/*.node"],
   "files": [
-    "**/*",
-    "!**/node_modules/@bitwarden/desktop-napi/**/*",
-    "**/node_modules/@bitwarden/desktop-napi/index.js",
-    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
+    "!node_modules/@bitwarden/desktop-napi/src",
+    "!node_modules/@bitwarden/desktop-napi/Cargo.toml",
+    "!node_modules/@bitwarden/desktop-napi/build.rs",
+    "!node_modules/@bitwarden/desktop-napi/package.json"
   ],
   "electronVersion": "36.9.3",
   "generateUpdatesFilesForAllChannels": true,
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index d418570da43..32874688861 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -20,6 +20,7 @@
     "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build",
     "build-native-macos": "cd desktop_native && ./macos_provider/build.sh && node build.js cross-platform",
     "build-native": "cd desktop_native && node build.js",
+    "build-native-win-cross": "cd desktop_native && node build.js cross-platform --target=aarch64-pc-windows-msvc",
     "build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"",
     "build:dev": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\" \"npm run build:preload:dev\"",
     "build:preload": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload",