diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml
index 53c09b6e..20cc1e23 100644
--- a/.github/workflows/build-and-test-make.yml
+++ b/.github/workflows/build-and-test-make.yml
@@ -167,16 +167,24 @@ jobs:
           python_bin=$(which python3)
           sudo $python_bin -m pytest . --log-cli-level DEBUG --install-dir ${{ runner.temp }}/install --capture-interface ${{ matrix.capture_interface }}
 
-       # Upload pre-compiled binaries to GitHub releases page.
+       # Upload pre-compiled binaries to GitHub releases page and Github actions archives.
       - name: Create tar release files for libcurl-impersonate
-        if: startsWith(github.ref, 'refs/tags/')
         run: |
-            cd ${{ runner.temp }}/install/lib
+          cd ${{ runner.temp }}/install/lib
+          if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
             tar -c -z -f ${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz libcurl-impersonate*
-            echo "release_file_lib=${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV
+          else
+            tar -c -z -f ${{ runner.temp }}/libcurl-impersonate.${{ matrix.host }}.tar.gz libcurl-impersonate*
+          fi
+          echo "release_file_lib=${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: libcurl-impersonate.${{ matrix.host }}.tar.gz
+          path: ${{ runner.temp }}/libcurl-impersonate*.tar.gz
 
       - name: Clean build
-        if: startsWith(github.ref, 'refs/tags/')
         uses: addnab/docker-run-action@v3
         with:
           image: curl-impersonate-builder
@@ -192,7 +200,6 @@ jobs:
 
        # Recompile curl-impersonate statically when doing a release.
       - name: Reconfigure statically
-        if: startsWith(github.ref, 'refs/tags/') && matrix.arch == 'x86_64'
         uses: addnab/docker-run-action@v3
         with:
           image: curl-impersonate-builder
@@ -205,7 +212,6 @@ jobs:
             ./configure --prefix=${{ runner.temp }}/install --enable-static
 
       - name: Rebuild statically
-        if: startsWith(github.ref, 'refs/tags/')
         uses: addnab/docker-run-action@v3
         with:
           image: curl-impersonate-builder
@@ -220,12 +226,21 @@ jobs:
             make chrome-install-strip
 
       - name: Create tar release files for curl-impersonate
-        if: startsWith(github.ref, 'refs/tags/')
         run: |
           cd ${{ runner.temp }}/install/bin
-          tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+          if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
+            tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+          else
+            tar -c -z -f ${{ runner.temp }}/curl-impersonate.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+          fi
           echo "release_file_bin=${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: curl-impersonate.${{ matrix.host }}.tar.gz
+          path: ${{ runner.temp }}/curl-impersonate*.tar.gz
+
       - name: Upload release files
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')