diff --git a/scripts/prepare-boot-tools.sh b/scripts/prepare-boot-tools.sh
index 557aaef..eb6e522 100755
--- a/scripts/prepare-boot-tools.sh
+++ b/scripts/prepare-boot-tools.sh
@@ -34,7 +34,7 @@ echo "============================================"
 echo ""
 echo "[1/3] Clonezilla Live"
 
-CLONEZILLA_VERSION="3.2.1-6"
+CLONEZILLA_VERSION="3.3.3-37"
 CLONEZILLA_FILE="clonezilla-live-${CLONEZILLA_VERSION}-amd64.zip"
 CLONEZILLA_URL="https://sourceforge.net/projects/clonezilla/files/clonezilla_live_stable/${CLONEZILLA_VERSION}/${CLONEZILLA_FILE}/download"
 
@@ -269,8 +269,8 @@ ls -lh "$OUT_DIR/blancco/" 2>/dev/null | grep -v '^total' | sed 's/^/    /'
 echo ""
 echo "[3/3] Memtest86+"
 
-MEMTEST_VERSION="7.20"
-MEMTEST_URL="https://memtest.org/download/${MEMTEST_VERSION}/mt86plus_${MEMTEST_VERSION}.binaries.zip"
+MEMTEST_VERSION="8.10"
+MEMTEST_URL="https://memtest.org/download/v${MEMTEST_VERSION}/mt86plus_${MEMTEST_VERSION}.binaries.zip"
 
 if [ -f "$OUT_DIR/memtest/memtest.efi" ]; then
     echo "    Already prepared, skipping."
@@ -290,7 +290,8 @@ else
         unzip -o "$TMPDIR/memtest.zip" -d "$TMPDIR/extract/"
 
         # Find the EFI file regardless of exact name
-        EFI_FILE=$(find "$TMPDIR" "$OUT_DIR/memtest" -name '*.efi' -name '*64*' 2>/dev/null | head -1)
+        # 8.x ships the x86_64 UEFI binary as mt86p_<ver>_x86_64 (no .efi).
+        EFI_FILE=$(find "$TMPDIR" "$OUT_DIR/memtest" \( -name '*.efi' -name '*64*' \) -o -name 'mt86p_*_x86_64' 2>/dev/null | head -1)
         if [ -n "$EFI_FILE" ] && [ ! -f "$OUT_DIR/memtest/memtest.efi" ]; then
             cp "$EFI_FILE" "$OUT_DIR/memtest/memtest.efi"
         fi