diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index a1171ed04..4c58d7e20 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -70,11 +70,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create manifest
+      - name: Create and push manifests
         run: |
-          docker manifest create ${{ env.GHCR_REPO }}:${{ github.sha }} \
-            ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 \
-            ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64
-      - name: Push manifest
-        run: |
-          docker manifest push ${{ env.GHCR_REPO }}:${{ github.sha }}
+          for tag in ${{ env.GHCR_REPO }}:${{ github.sha }} ${{ steps.meta.outputs.tags }} \
+          do \
+            docker manifest create ${{ tag }} \
+              ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 \
+              ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64 \
+            docker manifest push ${{ env.GHCR_REPO }}:${{ github.sha }} \
+          done