diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index fd14414..7ba7b1a 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -36,44 +36,46 @@ jobs:
         run: |
             nix develop --no-pure-eval --accept-flake-config --command just audit
 
-      - name: Build
-        run: |
-            nix develop --no-pure-eval --accept-flake-config --command just build-release
+      - name: Build Linux release binary
+        run: nix build --no-pure-eval --accept-flake-config
 
-      - name: Lint
-        run: |
-            nix develop --no-pure-eval --accept-flake-config --command just lint-report
+      - name: Build Windows release binary
+        run: nix build .#windows --no-pure-eval --accept-flake-config
 
       - name: Coverage
         run: |
             nix develop --no-pure-eval --accept-flake-config --command just coverage-ci
 
+      - name: Lint
+        run: |
+            nix develop --no-pure-eval --accept-flake-config --command just lint-report
+
       - name: Sonar analysis
         uses: SonarSource/sonarqube-scan-action@v6
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
 
-      - name: Build Linux release binary
-        run: nix build --no-pure-eval --accept-flake-config
-
-      - name: Package Linux binary
-        run: mv result/bin/jj-cz && zip jj-cz-linux-x86_64.zip jj-cz LICENSE.GPL.md LICENSE.MIT.md
+      - name: Prepare Linux binary
+        run: |
+            mkdir dist-linux
+            cp result/bin/jj-cz dist-linux/
+            cp LICENSE.*.md dist-linux/
 
       - name: Upload Linux artifact
         uses: actions/upload-artifact@v3
         with:
           name: jj-cz-linux-x86_64
-          path: jj-cz-linux-x86_64.zip
+          path: dist-linux/*
 
-      - name: Build Windows release binary
-        run: nix build .#windows --no-pure-eval --accept-flake-config
-
-      - name: Package Windows binary
-        run: zip jj-cz-windows-x86_64.zip result/bin/jj-cz.exe LICENSE.GPL.md LICENSE.MIT.md
+      - name: Prepare Windows binary
+        run: |
+            mkdir -p dist-windows
+            cp result/bin/jj-cz.exe dist-windows/
+            cp LICENSE.*.md dist-windows/
 
       - name: Upload Windows artifact
         uses: actions/upload-artifact@v3
         with:
           name: jj-cz-windows-x86_64
-          path: jj-cz-windows-x86_64.zip
+          path: dist-windows/*