diff --git a/.github/workflows/container-build-and-release.yml b/.github/workflows/container-build-and-release.yml
index b6967aa..055f854 100644
--- a/.github/workflows/container-build-and-release.yml
+++ b/.github/workflows/container-build-and-release.yml
@@ -62,6 +62,11 @@ jobs:
       packages: write
 
     steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Set IMAGE_NAME
         run: |
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" | tee -a ${GITHUB_ENV}
@@ -124,7 +129,7 @@ jobs:
       - name: Upload digest
         uses: keyfactor/upload-artifact@v4
         with:
-          name: digests
+          name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -143,8 +148,9 @@ jobs:
       - name: Download digests
         uses: keyfactor/download-artifact@v4.1.7
         with:
-          name: digests
           path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache