diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc3a8310..e81bf983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,9 +72,10 @@ jobs:
       - name: Create artifact archive
         shell: bash
         run: |
+          mkdir -p artifacts
           if [ -d dist ]; then
-            tar -C dist -czf templates.tar.gz .
-            ls -la
+            tar -C dist -czf artifacts/templates.tar.gz .
+            ls -la artifacts
           else
             echo "dist directory not found"
             exit 1
@@ -84,11 +85,11 @@ jobs:
         uses: actions/attest-build-provenance@v1
         with:
           show-summary: false
-          subject-path: templates.tar.gz
+          subject-path: artifacts/*
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: templates
-          path: templates.tar.gz
+          path: artifacts/*
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 73af6a6a..af1b1eac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,7 +93,8 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          path: templates.tar.gz
+          path: artifacts
+          merge-multiple: true
 
       - name: Create release
         env:
@@ -108,7 +109,7 @@ jobs:
       - name: Upload release artifacts
         env:
           GH_TOKEN: ${{ github.token }}
-        run: gh release upload $VERSION templates.tar.gz
+        run: gh release upload $VERSION artifacts/*
 
       - name: Publish release
         env: