diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml
index fc1a3b7d7..5ae32cc89 100644
--- a/.github/workflows/build-app.yaml
+++ b/.github/workflows/build-app.yaml
@@ -1,5 +1,3 @@
-
-
 name: Electron app
 
 on:
@@ -35,18 +33,27 @@ jobs:
       - name: Publish
         run: |
           yarn run build:app
+
       - name: Cleanup artifacts
+        if: matrix.os != 'windows-2016'
         run: |
-          npx rimraf "app/dist/!(*.exe|*.deb|*.AppImage|*.dmg)"
+          mkdir artifacts
+          mv "app/dist/(*.exe,*.deb,*.AppImage,*.dmg)" artifacts || true
+      - name: Cleanup artifacts Win
+        if: matrix.os == 'windows-2016'
+        run: |
+          mkdir artifacts
+          mv app/dist/*.exe artifacts
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.os }}
-          path: app/dist
+          path: artifacts
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: "app/dist/**"
+          files: "artifacts/**"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}