diff --git a/entrypoint.sh b/entrypoint.sh
index e1dc8b8..cc22014 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -51,10 +51,7 @@ if [ "$REGISTRY" = "ghcr.io" ]; then
     fi
 fi
 
-if [ "$REGISTRY" = "docker.io" ]; then
-    kanikoRegistry="index.docker.io/v1/"
-else
-    kanikoRegistry="$REGISTRY"
+if [ "$REGISTRY" != "docker.io" ]; then
     IMAGE="${REGISTRY}/${IMAGE}"
 
     if [ -n "$IMAGE_LATEST" ]; then
@@ -72,16 +69,7 @@ TARGET=${INPUT_TARGET:+"--target=$INPUT_TARGET"}
 
 ARGS="$CACHE $CONTEXT $DOCKERFILE $TARGET $INPUT_EXTRA_ARGS"
 
-cat <<EOF >/kaniko/.docker/config.json
-{
-    "auths": {
-        "https://${kanikoRegistry}": {
-            "username": "${USERNAME}",
-            "password": "${PASSWORD}"
-        }
-    }
-}
-EOF
+crane auth login "$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
 
 runKaniko() {
     # https://github.com/GoogleContainerTools/kaniko/issues/1803
@@ -111,12 +99,12 @@ if [ -n "$INPUT_PLATFORMS" ]; then
     done
 
     echo; echo "🚀 Pushing images"
-    crane auth login "$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
 
     DIGESTS=""
     for platform in $platformArray; do
-        crane push "/build/${platformFn}.tar" "$IMAGE"
-        DIGESTS="$DIGESTS -m $(head -n 1 "/build/${platformFn}_image-tag-digest")"
+        digest=$(head -n 1 "/build/${platformFn}_image-tag-digest")
+        crane push "/build/${platformFn}.tar" "$digest"
+        DIGESTS="$DIGESTS -m $digest"
     done
 
     TAGS="-t $IMAGE"