diff --git a/entrypoint.sh b/entrypoint.sh
index 0d9e5f4..ce08a3f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -45,7 +45,13 @@ fi
 # https://github.com/moby/buildkit/blob/master/README.md#output
 OUTPUT=""
 if [[ -n "${PLUGIN_NAME:-}" ]]; then
-	OUTPUT="--output type=image,\\\"name=$PLUGIN_NAME\\\""
+	OUTPUT="--output type=image"
+	if [[ "$1" =~ .*,.* ]]; then
+		# https://github.com/moby/buildkit/issues/797#issuecomment-1561601104
+		OUTPUT=",\\\"name=$PLUGIN_NAME\\\""
+	else
+		OUTPUT=",name=$PLUGIN_NAME"
+	fi
 	OUTPUT="$OUTPUT,oci-mediatypes=true,compression=estargz,compression-level=9"
 	OUTPUT="$OUTPUT,rewrite-timestamp=true"
 	#OUTPUT="$OUTPUT$(echo "$PLUGIN_ANNOTATION" | jq --join-output 'keys[] as $k|",annotation.\($k)=\"\(.[$k])\""')"