diff --git a/README.md b/README.md
index e34ae8c0..5437e222 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ See also the list of [contributors](CONTRIBUTORS.txt) who participated in this p
 
 [![build-bionic](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-bionic.yml/badge.svg)](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-bionic.yml)
 [![build-focal](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-focal.yml/badge.svg)](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-focal.yml)
+[![build-jammy](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-jammy.yml/badge.svg)](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-jammy.yml)
+[![build-noble](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-noble.yml/badge.svg)](https://github.com/mvallim/live-custom-ubuntu-from-scratch/actions/workflows/build-noble.yml)
 
 ## Terms
 
diff --git a/scripts/chroot_build.sh b/scripts/chroot_build.sh
index 90fdafe8..42e5a053 100755
--- a/scripts/chroot_build.sh
+++ b/scripts/chroot_build.sh
@@ -117,6 +117,7 @@ function install_pkg() {
         grub2-common \
         grub-efi-amd64-signed \
         shim-signed \
+        memtest86+ \
         mtools \
         binutils
     
@@ -179,7 +180,14 @@ function build_image() {
     cp /boot/initrd.img-**-**-generic casper/initrd
 
     # memtest86
-    cp /boot/memtest86+.bin install/memtest86+
+    case $TARGET_UBUNTU_VERSION in
+        "noble")
+            cp /boot/memtest86+x64.bin install/memtest86+
+            ;;
+        *)
+            cp /boot/memtest86+.bin install/memtest86+
+            ;;
+    esac
 
     # memtest86++
     wget --progress=dot https://www.memtest86.com/downloads/memtest86-usb.zip -O install/memtest86-usb.zip