diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml
index a5045b495..14f48a85f 100644
--- a/.github/workflows/_rust.yml
+++ b/.github/workflows/_rust.yml
@@ -94,15 +94,19 @@ jobs:
           tauri build
 
           # Used for release artifact
-          cp target/release/firezone-windows-client.exe "windows-client-x64.exe"
-
-          # There's an MSI and NSIS installer too, but their names include the version so I'll try those later.
+          # In release mode the name comes from tauri.conf.json
+          cp "target/release/Firezone Windows Client.exe" "windows-client-x64.exe"
 
       - name: Save Windows client
         uses: actions/upload-artifact@v3
         with:
-          name: windows-client-x64.exe
+          name: windows-client-x64
           path: ${{ github.workspace }}/rust/windows-client-x64.exe
+      - name: Save Windows installer
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-client-x64-msi
+          path: ${{ github.workspace }}/rust/target/release/bundle/msi
 
   smoke-test-relay:
     runs-on: ubuntu-22.04
diff --git a/rust/windows-client/src-tauri/tauri.conf.json b/rust/windows-client/src-tauri/tauri.conf.json
index 388301a39..b1d0800df 100755
--- a/rust/windows-client/src-tauri/tauri.conf.json
+++ b/rust/windows-client/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
     "withGlobalTauri": true
   },
   "package": {
-    "productName": "firezone-windows-client",
+    "productName": "Firezone Windows Client",
     "version": "1.0.0"
   },
   "tauri": {
@@ -24,7 +24,9 @@
       "identifier": "dev.firezone.client",
       "icon": [
         "icons/firezone.ico"
-      ]
+      ],
+      "publisher": "Firezone",
+      "shortDescription": "The Firezone Windows client"
     },
     "security": {
       "csp": null