diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 7dcdb2a..1ff4a6b 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -55,17 +55,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-v1.0-service-node-
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - uses: actions/download-artifact@v4
         with:
           merge-multiple: true
-          pattern: build-
+          pattern: build-*
           path: dist
+          run-id: ${{ github.run_id }}
 
       - name: Rename built artifacts
         run: |
@@ -73,6 +68,12 @@ jobs:
             mv "$file" "${file%.deb}-signed.deb"
           done
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push the images
         run: |
           docker buildx bake \