diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml
index ed0251e80..7e2c6eea1 100644
--- a/.github/workflows/package-windows.yml
+++ b/.github/workflows/package-windows.yml
@@ -65,16 +65,22 @@ jobs:
         pip install -r requirements-win.txt
     - name: Run tests
       run: python setup.py test
-    - name: Build Windows 10 app package
+    # - name: Build Windows 10 signed app package
+    #   run: |
+    #     If ($Env:CODESIGN) {
+    #       & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER -CertificateFile .\codesign.pfx -CertificatePassword $Env:CODESIGN_PFX_PASSWORD
+    #     } Else {
+    #       & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
+    #     }
+    #     Move-Item .\dist\*.msix .\artifacts
+    #   env:
+    #     CODESIGN_PFX_PASSWORD: ${{ secrets.CODESIGN_PFX_PASSWORD }}
+    - name: Build Windows 10 store app package
       run: |
-        If ($Env:CODESIGN) {
-          & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER -CertificateFile .\codesign.pfx -CertificatePassword $Env:CODESIGN_PFX_PASSWORD
-        } Else {
-          & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
-        }
+        & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
         Move-Item .\dist\*.msix .\artifacts
       env:
-        CODESIGN_PFX_PASSWORD: ${{ secrets.CODESIGN_PFX_PASSWORD }}
+        PICARD_APPX_PUBLISHER: CN=0A9169B7-05A3-4ED9-8876-830F17846709
     - name: Build Windows installer
       if: always()
       run: |
diff --git a/appxmanifest.xml.in b/appxmanifest.xml.in
index 66419e044..eada45f8b 100644
--- a/appxmanifest.xml.in
+++ b/appxmanifest.xml.in
@@ -6,7 +6,7 @@
   <Identity
     Name="%(app-id)s"
     Version="%(version)s"
-    Publisher="CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US"
+    Publisher="%(publisher)s"
     ProcessorArchitecture="x64"/>
   <Properties>
     <DisplayName>%(display-name)s</DisplayName>
diff --git a/setup.py b/setup.py
index 9c3183059..9c4d52e94 100644
--- a/setup.py
+++ b/setup.py
@@ -244,10 +244,12 @@ class picard_build(build):
             }
             generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args})
 
+            default_publisher = 'CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US'
             generate_file('appxmanifest.xml.in', 'appxmanifest.xml', {
-                'app-id': PICARD_APP_ID,
+                'app-id': "MetaBrainzFoundationInc." + PICARD_APP_ID,
                 'display-name': PICARD_DISPLAY_NAME,
                 'short-name': PICARD_APP_NAME,
+                'publisher': os.environ.get('PICARD_APPX_PUBLISHER', default_publisher)
                 'version': file_version_str,
             })
         elif sys.platform == 'linux':