diff --git a/entrypoint.sh b/entrypoint.sh
index 2a9af5c..8e59589 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -113,14 +113,13 @@ if [ -n "$INPUT_PLATFORMS" ]; then
         DIGESTS="$DIGESTS -m $digest"
     done
 
-    TAGS="-t $IMAGE"
-    if [ -n "$IMAGE_LATEST" ]; then
-        TAGS="$TAGS -t $IMAGE_LATEST"
-    fi
-
-    manifest_cmd="crane index append $TAGS $DIGESTS"
+    manifest_cmd="crane index append -t $IMAGE $DIGESTS"
     echo "Building manifest: $manifest_cmd"
     IMAGE_TAG_DIGEST=$(eval "$manifest_cmd")
+
+    if [ -n "$IMAGE_LATEST" ]; then
+        crane tag "$IMAGE" latest
+    fi
 else
     # Build and push image for the default platform
     echo "⚒️ Building image $IMAGE"