diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 9bf13c455..f7b257594 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -228,8 +228,8 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.BINARY_DEST_PATH }}-digest
-          path: /tmp/digests/*
+          name: ${{ env.BINARY_DEST_PATH }}-digests
+          path: /tmp/digests/${{ matrix.name.image_name }}
           if-no-files-found: error
           retention-days: 1
 
@@ -306,8 +306,11 @@ jobs:
       - name: Download digests
         uses: actions/download-artifact@v4
         with:
-          pattern: '*-digest'
+          pattern: "*-digests"
+          merge-multiple: true
           path: /tmp/digests
+      - name: Display structure of downloaded artifacts
+        run: ls -R /tmp/digests
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build Version Tags