diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d58068a..2c2c104 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -139,15 +139,20 @@ jobs:
 
           echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_ENV
 
+      # if: github.event_name == 'push' && github.ref == 'refs/heads/action' &&
       - name: Package release - Windows
-        if: github.event_name == 'push' && github.ref == 'refs/heads/action' && startsWith(matrix.os, 'windows-latest')
+        if: startsWith(matrix.os, 'windows-')
         working-directory: extension/build/package
-        run: Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }}
+        run: |
+          Compress-Archive -Path * -Destination ${{ env.ZIP_FILENAME }}
+          Copy-Item -Path ${{ env.ZIP_FILENAME }} -Destination ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}
 
-      - name: Package release
-        if: github.event_name == 'push' && github.ref == 'refs/heads/action' && startsWith(matrix.os, 'ubuntu-latest')
+      - name: Package release - Linux
+        if: startsWith(matrix.os, 'ubuntu-')
         working-directory: extension/build/package
-        run: zip -r "${{ env.ZIP_FILENAME }}" .
+        run: |
+          zip -r "${{ env.ZIP_FILENAME }}" .
+          cp "${{ env.ZIP_FILENAME }}" "${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}"
 
       - name: Upload release
         if: github.event_name == 'push' && github.ref == 'refs/heads/action' && (startsWith(matrix.os, 'ubuntu-latest') || startsWith(matrix.os, 'windows-latest'))
@@ -162,4 +167,17 @@ jobs:
           if test ${HTTP_CODE} -ne 200; then
             exit ${HTTP_CODE}
           fi
-          echo "Upload successful!"
\ No newline at end of file
+          echo "Upload successful!"
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.2
+        with:
+          # Artifact name
+          name: ${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}
+          # optional, default is artifact
+          # A file, directory or wildcard pattern that describes what to upload
+          path: ${{ github.workspace }}/extension/build/package/${{ matrix.os }}_${{ matrix.cc }}_${{ env.ZIP_FILENAME }}
+          # The desired behavior if no files are found using the provided path.
+          if-no-files-found: error
+          # Duration after which artifact will expire in days. 0 means using default retention.
+          retention-days: 14