diff --git a/.github/workflows/job-clang-analyzer.yml b/.github/workflows/job-clang-analyzer.yml
index 08d77fa64..53aca4239 100644
--- a/.github/workflows/job-clang-analyzer.yml
+++ b/.github/workflows/job-clang-analyzer.yml
@@ -69,5 +69,5 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: ${{ failure() && !env.ACT }}
         with:
-          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}
+          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.ssl }}-${{ inputs.hup }}-${{ inputs.debug }}
           path: work/scans/*
diff --git a/.github/workflows/job-unit-tests.yml b/.github/workflows/job-unit-tests.yml
index 20aa42d49..7f6417f20 100644
--- a/.github/workflows/job-unit-tests.yml
+++ b/.github/workflows/job-unit-tests.yml
@@ -161,7 +161,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: ${{ failure() && !env.ACT }}
         with:
-          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.runtime }}
+          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.module_type == 'dynamic' && 'dynamic' || 'static'}}-${{ inputs.ssl }}-${{ inputs.hup }}
           path: |
             work/buildroot/
             t/servroot*
diff --git a/.github/workflows/job-valgrind-tests.yml b/.github/workflows/job-valgrind-tests.yml
index 231efc1d0..0f54153c9 100644
--- a/.github/workflows/job-valgrind-tests.yml
+++ b/.github/workflows/job-valgrind-tests.yml
@@ -143,7 +143,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: ${{ failure() && !env.ACT }}
         with:
-          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.runtime }}
+          name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.hup }}
           path: |
             work/buildroot/
             t/servroot*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5343de32..566d2f216 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
       - name: Upload archive
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
 
@@ -182,7 +182,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -214,7 +214,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -246,7 +246,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -286,7 +286,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -318,7 +318,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -350,7 +350,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v4
@@ -382,7 +382,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v3
@@ -413,7 +413,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v3
         with:
-          name: release-artifacts
+          name: ${{ github.job }}-artifacts
           path: dist
           retention-days: ${{ env.RETENTION_DAYS }}
       - uses: actions/upload-artifact@v3
@@ -429,9 +429,9 @@ jobs:
     timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     steps:
       - name: Retrieve sibling release artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          pattern: *-artifacts
       - name: Drop Wasmer binaries
         run: find . -name '*wasmer*' | xargs rm -f
         # Channel: nightly