diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9af7cc45..83ad3d49 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -111,7 +111,7 @@ jobs:
       - name: 'Upload artifact'
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: mvnd-${{ env.OS }}-${{ env.ARCH }}
           path: |
             dist/target/maven-mvnd-*.zip
             dist/target/maven-mvnd-*.tar.gz
@@ -159,7 +159,7 @@ jobs:
       - name: 'Upload artifact'
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: mvnd-sources
           path: |
             target/maven-mvnd-*.zip
             target/maven-mvnd-*.tar.gz
@@ -214,7 +214,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-src.zip
+          asset_path: mvnd-sources/maven-mvnd-${{ env.VERSION }}-src.zip
           asset_name: maven-mvnd-${{ env.VERSION }}-src.zip
           asset_content_type: application/zip
 
@@ -224,7 +224,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-mvnd-${{ env.VERSION }}-src.tar.gz
+          asset_path: mvnd-sources/maven-mvnd-${{ env.VERSION }}-src.tar.gz
           asset_name: maven-mvnd-${{ env.VERSION }}-src.tar.gz
           asset_content_type: application/tar.gz
 
@@ -234,7 +234,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-linux-amd64.zip
+          asset_path: mvnd-linux-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-linux-amd64.zip
           asset_name: maven-mvnd-${{ env.VERSION }}-linux-amd64.zip
           asset_content_type: application/zip
 
@@ -244,7 +244,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-linux-amd64.tar.gz
+          asset_path: mvnd-linux-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-linux-amd64.tar.gz
           asset_name: maven-mvnd-${{ env.VERSION }}-linux-amd64.tar.gz
           asset_content_type: application/x-gzip
 
@@ -254,7 +254,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-amd64.zip
+          asset_path: mvnd-darwin-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-amd64.zip
           asset_name: maven-mvnd-${{ env.VERSION }}-darwin-amd64.zip
           asset_content_type: application/zip
 
@@ -264,7 +264,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-amd64.tar.gz
+          asset_path: mvnd-darwin-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-amd64.tar.gz
           asset_name: maven-mvnd-${{ env.VERSION }}-darwin-amd64.tar.gz
           asset_content_type: application/x-gzip
 
@@ -274,7 +274,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-aarch64.zip
+          asset_path: mvnd-darwin-aarch64/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-aarch64.zip
           asset_name: maven-mvnd-${{ env.VERSION }}-darwin-aarch64.zip
           asset_content_type: application/zip
 
@@ -284,7 +284,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-aarch64.tar.gz
+          asset_path: mvnd-darwin-aarch64/dist/target/maven-mvnd-${{ env.VERSION }}-darwin-aarch64.tar.gz
           asset_name: maven-mvnd-${{ env.VERSION }}-darwin-aarch64.tar.gz
           asset_content_type: application/x-gzip
 
@@ -294,7 +294,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-windows-amd64.zip
+          asset_path: mvnd-windows-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-windows-amd64.zip
           asset_name: maven-mvnd-${{ env.VERSION }}-windows-amd64.zip
           asset_content_type: application/zip
 
@@ -304,7 +304,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/dist/target/maven-mvnd-${{ env.VERSION }}-windows-amd64.tar.gz
+          asset_path: mvnd-windows-amd64/dist/target/maven-mvnd-${{ env.VERSION }}-windows-amd64.tar.gz
           asset_name: maven-mvnd-${{ env.VERSION }}-windows-amd64.tar.gz
           asset_content_type: application/x-gzip