diff --git a/apps/desktop/custom-appx-manifest.xml b/apps/desktop/custom-appx-manifest.xml
new file mode 100644
index 00000000000..48379eca674
--- /dev/null
+++ b/apps/desktop/custom-appx-manifest.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--suppress XmlUnusedNamespaceDeclaration -->
+<!-- <Package
+    xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+    xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+    xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+    xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"> -->
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+IgnorableNamespaces="uap rescap com uap10 build"
+xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
+    <!-- use single quotes to avoid double quotes escaping in the publisher value  -->
+    <Identity Name="8bitSolutionsLLC.bitwardendesktop"
+        ProcessorArchitecture="x64"
+        Publisher='CN=com.bitwarden.localdevelopment'
+        Version="2025.6.0.0" />
+    <Properties>
+        <DisplayName>Bitwarden</DisplayName>
+        <PublisherDisplayName>Bitwarden Inc</PublisherDisplayName>
+        <Description>A secure and free password manager for all of your devices.</Description>
+        <Logo>assets\StoreLogo.png</Logo>
+    </Properties>
+    <Resources>
+        <Resource Language="en-US" />
+        <Resource Language="af" />
+        <Resource Language="ar" />
+        <Resource Language="az-latn" />
+        <Resource Language="be" />
+        <Resource Language="bg" />
+        <Resource Language="bn" />
+        <Resource Language="bs" />
+        <Resource Language="ca" />
+        <Resource Language="cs" />
+        <Resource Language="cy" />
+        <Resource Language="da" />
+        <Resource Language="de" />
+        <Resource Language="el" />
+        <Resource Language="en-gb" />
+        <Resource Language="en-in" />
+        <Resource Language="es" />
+        <Resource Language="et" />
+        <Resource Language="eu" />
+        <Resource Language="fa" />
+        <Resource Language="fi" />
+        <Resource Language="fil" />
+        <Resource Language="fr" />
+        <Resource Language="gl" />
+        <Resource Language="he" />
+        <Resource Language="hi" />
+        <Resource Language="hr" />
+        <Resource Language="hu" />
+        <Resource Language="id" />
+        <Resource Language="it" />
+        <Resource Language="ja" />
+        <Resource Language="ka" />
+        <Resource Language="km" />
+        <Resource Language="kn" />
+        <Resource Language="ko" />
+        <Resource Language="lt" />
+        <Resource Language="lv" />
+        <Resource Language="ml" />
+        <Resource Language="mr" />
+        <Resource Language="nb" />
+        <Resource Language="ne" />
+        <Resource Language="nl" />
+        <Resource Language="nn" />
+        <Resource Language="or" />
+        <Resource Language="pl" />
+        <Resource Language="pt-br" />
+        <Resource Language="pt-pt" />
+        <Resource Language="ro" />
+        <Resource Language="ru" />
+        <Resource Language="si" />
+        <Resource Language="sk" />
+        <Resource Language="sl" />
+        <Resource Language="sr-cyrl" />
+        <Resource Language="sv" />
+        <Resource Language="te" />
+        <Resource Language="th" />
+        <Resource Language="tr" />
+        <Resource Language="uk" />
+        <Resource Language="vi" />
+        <Resource Language="zh-cn" />
+        <Resource Language="zh-tw" />
+    </Resources>
+    <Dependencies>
+        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0"
+            MaxVersionTested="10.0.14316.0" />
+    </Dependencies>
+    <Capabilities>
+        <rescap:Capability Name="runFullTrust" />
+    </Capabilities>
+    <Applications>
+        <Application Id="bitwardendesktop" Executable="app\Bitwarden.exe"
+            EntryPoint="Windows.FullTrustApplication">
+            <uap:VisualElements
+                BackgroundColor="#175DDC"
+                DisplayName="Bitwarden"
+                Square150x150Logo="assets\Square150x150Logo.png"
+                Square44x44Logo="assets\Square44x44Logo.png"
+                Description="A secure and free password manager for all of your devices.">
+                <uap:LockScreen Notification="badgeAndTileText" BadgeLogo="assets\BadgeLogo.png" />
+                <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
+                <uap:SplashScreen Image="assets\SplashScreen.png" />
+            </uap:VisualElements>
+            <Extensions>
+                <uap:Extension Category="windows.protocol">
+                    <uap:Protocol Name="bitwarden">
+                        <uap:DisplayName>Bitwarden</uap:DisplayName>
+                    </uap:Protocol>
+                </uap:Extension>
+                <com:Extension Category="windows.comServer">
+                    <com:ComServer>
+                        <com:ExeServer Executable="Bitwarden.exe" DisplayName="Bitwarden Passkey Manager">
+                            <com:Class Id="0f7dc5d9-69ce-4652-8572-6877fd695062"
+                                DisplayName="Bitwarden Passkey Manager" />
+                        </com:ExeServer>
+                    </com:ComServer>
+                </com:Extension>
+            </Extensions>
+        </Application>
+    </Applications>
+</Package>
\ No newline at end of file
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index e412b8ec176..6703dbb1c20 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -163,74 +163,7 @@
   },
   "appx": {
     "artifactName": "${productName}-${version}-${arch}.${ext}",
-    "backgroundColor": "#175DDC",
-    "applicationId": "bitwardendesktop",
-    "identityName": "8bitSolutionsLLC.bitwardendesktop",
-    "publisher": "CN=com.bitwarden.localdevelopment",
-    "publisherDisplayName": "Bitwarden Inc",
-    "languages": [
-      "en-US",
-      "af",
-      "ar",
-      "az-latn",
-      "be",
-      "bg",
-      "bn",
-      "bs",
-      "ca",
-      "cs",
-      "cy",
-      "da",
-      "de",
-      "el",
-      "en-gb",
-      "en-in",
-      "es",
-      "et",
-      "eu",
-      "fa",
-      "fi",
-      "fil",
-      "fr",
-      "gl",
-      "he",
-      "hi",
-      "hr",
-      "hu",
-      "id",
-      "it",
-      "ja",
-      "ka",
-      "km",
-      "kn",
-      "ko",
-      "lt",
-      "lv",
-      "ml",
-      "mr",
-      "nb",
-      "ne",
-      "nl",
-      "nn",
-      "or",
-      "pl",
-      "pt-br",
-      "pt-pt",
-      "ro",
-      "ru",
-      "si",
-      "sk",
-      "sl",
-      "sr-cyrl",
-      "sv",
-      "te",
-      "th",
-      "tr",
-      "uk",
-      "vi",
-      "zh-cn",
-      "zh-tw"
-    ]
+    "customManifestPath": "./custom-appx-manifest.xml"
   },
   "deb": {
     "artifactName": "${productName}-${version}-${arch}.${ext}",