diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml
index 57bfc8785..f4696687b 100644
--- a/.github/workflows/_tauri.yml
+++ b/.github/workflows/_tauri.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Sign the MSI
         if: ${{ runner.os == 'Windows' }}
         shell: bash
-        run: ../../scripts/build/sign.sh ../target/release/bundle/msi/firezone-client-gui_${{ env.VERSION }}_x64_en-US.msi
+        run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_${{ env.VERSION }}_x64_en-US.msi
       - name: Rename artifacts and compute SHA256
         shell: bash
         run: ${{ matrix.rename-script }}
diff --git a/rust/gui-client/src-tauri/tauri.windows.conf.json b/rust/gui-client/src-tauri/tauri.windows.conf.json
index f1098c400..b7c2f19f7 100644
--- a/rust/gui-client/src-tauri/tauri.windows.conf.json
+++ b/rust/gui-client/src-tauri/tauri.windows.conf.json
@@ -1,5 +1,8 @@
 {
   "build": {
-    "beforeBundleCommand": "bash -c '../../scripts/build/sign.sh ../target/release/firezone-client-gui.exe'"
+    "beforeBundleCommand": "bash -c '../../scripts/build/sign.sh ../target/release/Firezone.exe'"
+  },
+  "package": {
+    "productName": "Firezone"
   }
 }
diff --git a/scripts/build/tauri-rename-windows.sh b/scripts/build/tauri-rename-windows.sh
index 32f5f1f7e..e410ee751 100755
--- a/scripts/build/tauri-rename-windows.sh
+++ b/scripts/build/tauri-rename-windows.sh
@@ -6,7 +6,7 @@ ls ../target/release ../target/release/bundle/msi
 
 # Used for release artifact
 # In release mode the name comes from tauri.conf.json
-cp ../target/release/firezone-client-gui.exe "$BINARY_DEST_PATH.exe"
+cp ../target/release/Firezone.exe "$BINARY_DEST_PATH.exe"
 cp ../target/release/bundle/msi/*.msi "$BINARY_DEST_PATH.msi"
 cp ../target/release/firezone_gui_client.pdb "$BINARY_DEST_PATH.pdb"