diff --git a/bb-u-boot-beagley-ai-evt/readme.log b/bb-u-boot-beagley-ai-evt/readme.log
index d4ebab2c347d01bf6a69cde7b85419676820d854..00e76f80cb0fdecec532a5bcb8be9350db624167 100644
--- a/bb-u-boot-beagley-ai-evt/readme.log
+++ b/bb-u-boot-beagley-ai-evt/readme.log
@@ -1,4 +1,4 @@
* 20240319 - 09.02.00.009 - https://openbeagle.org/beagleboard/u-boot/-/commits/v2023.04-ti-09.02.00.009-BeagleY-AI-Production
* 20240320 - 09.02.00.009 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/09.02.00.009
- * 20240507 - master - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/7d0093277104dbd3c6a94dbf36611767c96e544f
* 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
+ * 20240515 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/91ec786ebd2364c964aa6a7fb405b6be461fee3d
diff --git a/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/changelog b/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/changelog
index a4e7131ebc9d61d96f45dc424b39255167ed1d6d..85f85a3cc579d4f7614cc26abb95849c8c877ba9 100644
--- a/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/changelog
+++ b/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagley-ai-evt (2023.04.20240319.7-09.02.00.009-0~bookworm+20240508) bookworm; urgency=low
+bb-u-boot-beagley-ai-evt (2023.04.20240319.8-09.02.00.009-0~bookworm+20240516) bookworm; urgency=low
* 20240319 - 09.02.00.009 - https://openbeagle.org/beagleboard/u-boot/-/commits/v2023.04-ti-09.02.00.009-BeagleY-AI-Production
* 20240320 - 09.02.00.009 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/09.02.00.009
- * 20240507 - master - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/7d0093277104dbd3c6a94dbf36611767c96e544f
* 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
+ * 20240515 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/91ec786ebd2364c964aa6a7fb405b6be461fee3d
- -- Robert Nelson <robertcnelson@gmail.com> Wed, 08 May 2024 22:56:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Thu, 16 May 2024 09:48:26 -0500
diff --git a/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/microsd-extlinux.conf b/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/microsd-extlinux.conf
index 5c0c25a3fc32549d344b2f72441e2658dad12c30..c916dbcf8c9cb069758eaf921003a27da95f4a79 100644
--- a/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/microsd-extlinux.conf
+++ b/bb-u-boot-beagley-ai-evt/suite/bookworm/debian/microsd-extlinux.conf
@@ -52,6 +52,14 @@ label microSD (production test)
fdtoverlays /overlays/k3-am67a-beagley-ai-hdmi-dss0-dpi1.dtbo /overlays/k3-am67a-beagley-ai-lincolntech-185lcd-panel.dtbo /overlays/k3-am67a-beagley-ai-csi0-imx219.dtbo /overlays/k3-am67a-beagley-ai-csi1-imx219.dtbo
initrd /initrd.img
+label transfer microSD rootfs to NVMe (advanced)
+ kernel /Image
+ append console=ttyS2,115200n8 root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait net.ifnames=0 init=/usr/sbin/init-beagle-flasher
+ fdtdir /
+ fdt /ti/k3-j722s-beagley-ai-evt.dtb
+ #fdtoverlays /overlays/<file>.dtbo
+ initrd /initrd.img
+
label microSD (debug)
kernel /Image
append console=ttyS2,115200n8 root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait net.ifnames=0
diff --git a/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/changelog b/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/changelog
index 0e9f612bd7188b2b0083be95228b7bc6ca060e16..87ce10fb7e5f96322467ecd93bbf839dfe21f4b3 100644
--- a/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/changelog
+++ b/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagley-ai-evt (2023.04.20240319.7-09.02.00.009-0~bullseye+20240508) bullseye; urgency=low
+bb-u-boot-beagley-ai-evt (2023.04.20240319.8-09.02.00.009-0~bullseye+20240516) bullseye; urgency=low
* 20240319 - 09.02.00.009 - https://openbeagle.org/beagleboard/u-boot/-/commits/v2023.04-ti-09.02.00.009-BeagleY-AI-Production
* 20240320 - 09.02.00.009 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/09.02.00.009
- * 20240507 - master - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/7d0093277104dbd3c6a94dbf36611767c96e544f
* 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
+ * 20240515 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/91ec786ebd2364c964aa6a7fb405b6be461fee3d
- -- Robert Nelson <robertcnelson@gmail.com> Wed, 08 May 2024 22:56:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Thu, 16 May 2024 09:48:26 -0500
diff --git a/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/microsd-extlinux.conf b/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/microsd-extlinux.conf
index 5c0c25a3fc32549d344b2f72441e2658dad12c30..c916dbcf8c9cb069758eaf921003a27da95f4a79 100644
--- a/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/microsd-extlinux.conf
+++ b/bb-u-boot-beagley-ai-evt/suite/bullseye/debian/microsd-extlinux.conf
@@ -52,6 +52,14 @@ label microSD (production test)
fdtoverlays /overlays/k3-am67a-beagley-ai-hdmi-dss0-dpi1.dtbo /overlays/k3-am67a-beagley-ai-lincolntech-185lcd-panel.dtbo /overlays/k3-am67a-beagley-ai-csi0-imx219.dtbo /overlays/k3-am67a-beagley-ai-csi1-imx219.dtbo
initrd /initrd.img
+label transfer microSD rootfs to NVMe (advanced)
+ kernel /Image
+ append console=ttyS2,115200n8 root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait net.ifnames=0 init=/usr/sbin/init-beagle-flasher
+ fdtdir /
+ fdt /ti/k3-j722s-beagley-ai-evt.dtb
+ #fdtoverlays /overlays/<file>.dtbo
+ initrd /initrd.img
+
label microSD (debug)
kernel /Image
append console=ttyS2,115200n8 root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait net.ifnames=0
diff --git a/bb-u-boot-beagley-ai-evt/version.sh b/bb-u-boot-beagley-ai-evt/version.sh
index 00f5e9773c854082c7470aafecdd64ecab0f6b7a..1bd61a7dcdebe8c675edda2074cb2c71208bb274 100644
--- a/bb-u-boot-beagley-ai-evt/version.sh
+++ b/bb-u-boot-beagley-ai-evt/version.sh
@@ -5,7 +5,7 @@
package_name="bb-u-boot-beagley-ai-evt"
debian_pkg_name="${package_name}"
-package_version="2023.04.20240319.7-09.02.00.009"
+package_version="2023.04.20240319.8-09.02.00.009"
package_source=""
src_dir=""
@@ -20,5 +20,5 @@ debian_patch=""
clear_changelog="enable"
-bullseye_version="~bullseye+20240508"
-bookworm_version="~bookworm+20240508"
+bullseye_version="~bullseye+20240516"
+bookworm_version="~bookworm+20240516"