diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
index 78ec135..a152f82 100644
--- a/.github/workflows/build-push-image.yml
+++ b/.github/workflows/build-push-image.yml
@@ -180,8 +180,8 @@ jobs:
 
           # Calculate and print the digests
           digest_root=$(jq -r .digest manifest)
-          digest_amd64=$(jq -r .manifests[0].digest manifest)
-          digest_arm64=$(jq -r .manifests[1].digest manifest)
+          digest_amd64=$(jq -r '.manifests[] | select(.platform.architecture=="amd64") | .digest' manifest)
+          digest_arm64=$(jq -r '.manifests[] | select(.platform.architecture=="arm64") | .digest' manifest)
 
           echo "The image digests are:"
           echo "  Root: $digest_root"