diff --git a/tools/macrecovery/build-image.sh b/tools/macrecovery/build-image.sh
index 8dc7107..100b41b 100755
--- a/tools/macrecovery/build-image.sh
+++ b/tools/macrecovery/build-image.sh
@@ -1,18 +1,76 @@
 #!/bin/bash -e
 
-rm -rf Recovery.RO.dmg Recovery.RO.raw Recovery.dmg.sparseimage
+# Script: create-recovery-disk.sh
+# Author: Gabriel Luchina
+# https://luchina.com.br 
+# Description: Creates a Recovery DMG and converts it to raw for QEMU use
+
+# Clean up on exit
+cleanup() {
+    echo "Cleaning up temporary files..."
+    hdiutil verify "$SPARSE_IMAGE" &>/dev/null || true
+    hdiutil detach "$DEVICE" &>/dev/null || true
+    rm -f "$SPARSE_IMAGE" "$OUTPUT_DMG" &>/dev/null || true
+}
+trap cleanup EXIT
+
+# Constants
+SPARSE_IMAGE="Recovery.dmg.sparseimage"
+OUTPUT_DMG="Recovery.RO.dmg"
+OUTPUT_RAW="Recovery.RO.raw"
+
+# Check prerequisites
+if ! command -v hdiutil &>/dev/null; then
+    echo "Error: hdiutil not found. Install macOS command-line tools." >&2
+    exit 1
+fi
+
+if ! command -v qemu-img &>/dev/null; then
+    echo "Error: qemu-img not found. Please install qemu-utils." >&2
+    exit 1
+fi
+
+# Clean previous builds
+echo "Removing old recovery disk files..."
+rm -f "$SPARSE_IMAGE" "$OUTPUT_DMG" "$OUTPUT_RAW"
+
+# Create sparse image
+echo "Creating sparse disk image..."
 hdiutil create -size 800m -layout "UNIVERSAL HD" -type SPARSE -o Recovery.dmg
-newDevice=$(hdiutil attach -nomount Recovery.dmg.sparseimage | head -n 1 | awk  '{print $1}')
-echo newdevice "$newDevice"
-diskutil partitionDisk "${newDevice}" 1 MBR fat32 RECOVERY R
-N=$(echo "$newDevice" | tr -dc '0-9')
-diskutil mount disk"${N}"s1
-MOUNT="$(diskutil info  disk"${N}"s1 | sed -n 's/.*Mount Point: *//p')"
-mkdir -p "$MOUNT/com.apple.recovery.boot"
-cp ./*.dmg ./*.chunklist "$MOUNT/com.apple.recovery.boot/"
-diskutil umount disk"${N}"s1
-hdiutil detach "$newDevice"
-hdiutil convert -format UDZO Recovery.dmg.sparseimage -o Recovery.RO.dmg
-rm Recovery.dmg.sparseimage
-qemu-img convert -f dmg -O raw Recovery.RO.dmg Recovery.raw
-rm Recovery.RO.dmg
+
+# Mount the sparse image
+echo "Mounting disk image..."
+DEVICE=$(hdiutil attach -nomount "$SPARSE_IMAGE" | head -n 1 | awk '{print $1}')
+echo "New device: $DEVICE"
+
+# Partition the disk
+echo "Partitioning disk..."
+N=$(echo "$DEVICE" | tr -dc '0-9')
+diskutil partitionDisk "$DEVICE" 1 MBR fat32 RECOVERY R
+diskutil mount "disk${N}s1"
+
+# Find mount point
+MOUNT_POINT="$(diskutil info "disk${N}s1" | sed -n 's/.*Mount Point: *//p')"
+echo "Mounted at: $MOUNT_POINT"
+
+# Prepare Recovery folder
+RECOVERY_FOLDER="$MOUNT_POINT/com.apple.recovery.boot"
+mkdir -p "$RECOVERY_FOLDER"
+
+# Copy required files
+echo "Copying .dmg and .chunklist files to recovery partition..."
+cp *.dmg *.chunklist "$RECOVERY_FOLDER/"
+
+# Unmount and convert
+echo "Unmounting and finalizing image..."
+hdiutil detach "$DEVICE"
+hdiutil convert -format UDZO "$SPARSE_IMAGE" -o "$OUTPUT_DMG"
+rm -f "$SPARSE_IMAGE"
+
+# Convert to raw format
+echo "Converting DMG to RAW format..."
+qemu-img convert -f dmg -O raw "$OUTPUT_DMG" "$OUTPUT_RAW"
+rm -f "$OUTPUT_DMG"
+
+echo "✅ Recovery disk created successfully!"
+echo "Output file: $OUTPUT_RAW"