diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
index 5aea3c901..3f843c8a5 100644
--- a/.github/workflows/prod-release.yml
+++ b/.github/workflows/prod-release.yml
@@ -128,8 +128,14 @@ jobs:
       env:
         BUILD_NUMBER: ${{ github.run_id }}
 
-    - name: Upload app package
+    - name: Upload app msix package
       uses: actions/upload-artifact@v1
       with:
         name: focalboard.msix
         path: ${{ github.workspace }}/win-wpf/focalboard.msix
+
+    - name: Upload app zip package
+      uses: actions/upload-artifact@v1
+      with:
+        name: focalboard-win.zip
+        path: ${{ github.workspace }}/win-wpf/dist/focalboard-win.zip
diff --git a/Makefile b/Makefile
index 65cccbf2c..bb99d62e5 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,7 @@ mac-app: server-mac webapp
 
 win-wpf-app: server-dll webapp
 	cd win-wpf && ./build.bat && ./package.bat
+	cd win-wpf && ./package-zip.bat
 
 linux-app: server-linux webapp
 	rm -rf linux/temp
diff --git a/win-wpf/.gitignore b/win-wpf/.gitignore
index 8c780b179..35c9aecb2 100644
--- a/win-wpf/.gitignore
+++ b/win-wpf/.gitignore
@@ -1,6 +1,7 @@
 packages
 obj
 msix
+dist
 *.msix
 *.suo
 *.csproj.user
diff --git a/win-wpf/package-zip.bat b/win-wpf/package-zip.bat
new file mode 100644
index 000000000..e1388fe8d
--- /dev/null
+++ b/win-wpf/package-zip.bat
@@ -0,0 +1,6 @@
+@echo off
+
+if exist dist\focalboard-win.zip del /q dist\focalboard-win.zip
+if not exist dist mkdir dist
+
+powershell Compress-Archive -Path Focalboard\bin\x64\Release\* -DestinationPath dist\focalboard-win.zip