diff --git a/.github/workflows/build-win.yaml b/.github/workflows/build-win.yaml
index a3c5d841..1c4f8e48 100644
--- a/.github/workflows/build-win.yaml
+++ b/.github/workflows/build-win.yaml
@@ -76,14 +76,18 @@ jobs:
         run: ./win/dll2lib.bat ${{ matrix.env }} build\dist\libcurl.dll
 
       - name: Build tarball
-        if: startsWith(github.ref, 'refs/tags/')
         shell: msys2 {0}
-        run: tar cvzf libcurl-impersonate-${{ github.head_ref || github.ref_name }}.${{ matrix.env }}-win32.tar.gz -C ./build/dist .
+        run: |
+          if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
+            tar cvzf libcurl-impersonate-${{ github.head_ref || github.ref_name }}.${{ matrix.env }}-win32.tar.gz -C ./build/dist .
+          else
+            tar cvzf libcurl-impersonate-${{ matrix.env }}-win32.tar.gz -C ./build/dist .
+          fi
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: libcurl-impersonate.${{ matrix.host }}.tar.gz
+          name: libcurl-impersonate.${{ matrix.env }}-win32.tar.gz
           path: ./libcurl-impersonate*.tar.gz
 
       - name: Upload release files