diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6e3691fcb..32128561f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -360,6 +360,40 @@ jobs:
           path: app.tar
           if-no-files-found: error
 
+#
+# MSI package
+#
+  win-msi:
+    name: Build Cryptomator.msi
+    runs-on: windows-latest
+    needs: [appdir]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download appdir-win
+        uses: actions/download-artifact@v2
+        with:
+          name: appdir-win
+      - name: Untar appdir.tar
+        run: tar -xvf appdir.tar
+      - uses: actions/setup-java@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+      - name: Create MSI
+        run: >
+          ${JAVA_HOME}/bin/jpackage
+          --verbose
+          --type msi
+          --app-image appdir
+          --dest installer
+      - name: Upload appdir-${{ matrix.profile }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: win-msi
+          path: installer/*
+          if-no-files-found: error
+
+#--app-image
+
   # release:
   #   name: Draft a Release on GitHub Releases
   #   runs-on: ubuntu-latest