diff --git a/bb-u-boot-beagleboneai64-debian-12/readme.log b/bb-u-boot-beagleboneai64-debian-12/readme.log
index 9d0a7c8e14498f17e0e031165fca671e650b8c8b..13ab54b6c19a48d28943a41c52f9fa6758b95300 100644
--- a/bb-u-boot-beagleboneai64-debian-12/readme.log
+++ b/bb-u-boot-beagleboneai64-debian-12/readme.log
@@ -1,7 +1,7 @@
-  * 20240520 - v2024.07-rc3 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc3
+  * 20240603 - v2024.07-rc4 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc4
   * 20240513 - 09.02.00.010 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.02.00.010
   * 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
-  * 20240522 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/6370f2cbbe963df6ee7b0c6056f630a34035f58c
+  * 20240604 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/416aa42e55d8e7a00313803d5f07d9bab56220fa
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * Enable a extlinux.conf option to flash other media directly
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/changelog b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/changelog
index 987a57a971240d4c521122425534757d7c870b10..e033b427d310154facb5d2b38718eda7bdd789b2 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/changelog
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~bookworm+20240523) bookworm; urgency=low
+bb-u-boot-beagleboneai64 (2024.07.20240603.0-0~bookworm+20240606) bookworm; urgency=low
 
-  * 20240520 - v2024.07-rc3 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc3
+  * 20240603 - v2024.07-rc4 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc4
   * 20240513 - 09.02.00.010 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.02.00.010
   * 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
-  * 20240522 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/6370f2cbbe963df6ee7b0c6056f630a34035f58c
+  * 20240604 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/416aa42e55d8e7a00313803d5f07d9bab56220fa
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * Enable a extlinux.conf option to flash other media directly
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~bookworm+20240523) bookworm; urge
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Thu, 23 May 2024 16:06:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 06 Jun 2024 17:45:55 -0500
 
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/control b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/control
index eeea7f009389dc35c004bd662960e00899c2608b..fa41cca2e09914e0e4c8ed828e1466f7f0f694af 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/control
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/control
@@ -31,5 +31,5 @@ Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
  , mmc-utils
-Description: bb-u-boot-beagleboneai64
- bb-u-boot-beagleboneai64
+Description: beagleboard.org u-boot for beagleboneai64
+ beagleboard.org u-boot for beagleboneai64
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/rules b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/rules
index ce07a025890709644d45b0ef4445d1b6f2ae149a..e7bda540e812e15ae970f26a2b4a15b2d2511515 100755
--- a/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/rules
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/bookworm/debian/rules
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2024.07-rc3"
+UB_TAG="v2024.07-rc4"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/changelog b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/changelog
index d0a72ed7f87964261a43ad5c89f729d28672bce8..9b26896a366703c6783bf11236ea5afaf551d6d1 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/changelog
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~jammy+20240523) jammy; urgency=low
+bb-u-boot-beagleboneai64 (2024.07.20240603.0-0~jammy+20240606) jammy; urgency=low
 
-  * 20240520 - v2024.07-rc3 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc3
+  * 20240603 - v2024.07-rc4 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc4
   * 20240513 - 09.02.00.010 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.02.00.010
   * 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
-  * 20240522 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/6370f2cbbe963df6ee7b0c6056f630a34035f58c
+  * 20240604 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/416aa42e55d8e7a00313803d5f07d9bab56220fa
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * Enable a extlinux.conf option to flash other media directly
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~jammy+20240523) jammy; urgency=lo
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Thu, 23 May 2024 16:06:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 06 Jun 2024 17:45:55 -0500
 
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/control b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/control
index eeea7f009389dc35c004bd662960e00899c2608b..fa41cca2e09914e0e4c8ed828e1466f7f0f694af 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/control
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/control
@@ -31,5 +31,5 @@ Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
  , mmc-utils
-Description: bb-u-boot-beagleboneai64
- bb-u-boot-beagleboneai64
+Description: beagleboard.org u-boot for beagleboneai64
+ beagleboard.org u-boot for beagleboneai64
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/rules b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/rules
index 62115951070c934ded0a755262db5dc81f2e9862..939c04db3279d7d8c06b375ac24060239df46fcc 100755
--- a/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/rules
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/jammy/debian/rules
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2024.07-rc3"
+UB_TAG="v2024.07-rc4"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/changelog b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/changelog
index a553b52df15aa058949ffd3aa9f32f38eec8c24a..2ff00553ba4128bbd736d6a66cf7e5418980bc70 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/changelog
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~noble+20240523) noble; urgency=low
+bb-u-boot-beagleboneai64 (2024.07.20240603.0-0~noble+20240606) noble; urgency=low
 
-  * 20240520 - v2024.07-rc3 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc3
+  * 20240603 - v2024.07-rc4 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc4
   * 20240513 - 09.02.00.010 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.02.00.010
   * 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
-  * 20240522 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/6370f2cbbe963df6ee7b0c6056f630a34035f58c
+  * 20240604 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/416aa42e55d8e7a00313803d5f07d9bab56220fa
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * Enable a extlinux.conf option to flash other media directly
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~noble+20240523) noble; urgency=lo
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Thu, 23 May 2024 16:06:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 06 Jun 2024 17:45:55 -0500
 
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/control b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/control
index eeea7f009389dc35c004bd662960e00899c2608b..fa41cca2e09914e0e4c8ed828e1466f7f0f694af 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/control
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/control
@@ -31,5 +31,5 @@ Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
  , mmc-utils
-Description: bb-u-boot-beagleboneai64
- bb-u-boot-beagleboneai64
+Description: beagleboard.org u-boot for beagleboneai64
+ beagleboard.org u-boot for beagleboneai64
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/rules b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/rules
index 52096570a894a531a34bf96cf798bd14abe14168..c326f3b505cf44a43a9e70b062022d0ccc3e3af7 100755
--- a/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/rules
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/noble/debian/rules
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2024.07-rc3"
+UB_TAG="v2024.07-rc4"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/changelog b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/changelog
index 1975829efc2a593a18a4c8cf8d238570be92b655..96eeec0f8a0871101db46c41328664d0890f99b6 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/changelog
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/changelog
@@ -1,9 +1,9 @@
-bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~trixie+20240523) trixie; urgency=low
+bb-u-boot-beagleboneai64 (2024.07.20240603.0-0~trixie+20240606) trixie; urgency=low
 
-  * 20240520 - v2024.07-rc3 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc3
+  * 20240603 - v2024.07-rc4 - https://github.com/u-boot/u-boot/releases/tag/v2024.07-rc4
   * 20240513 - 09.02.00.010 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.02.00.010
   * 20240412 - 4.2.0 - https://github.com/OP-TEE/optee_os/commits/4.2.0
-  * 20240522 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/6370f2cbbe963df6ee7b0c6056f630a34035f58c
+  * 20240604 - master - https://github.com/ARM-software/arm-trusted-firmware/commit/416aa42e55d8e7a00313803d5f07d9bab56220fa
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * Enable a extlinux.conf option to flash other media directly
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64 (2024.07.20240520.0-0~trixie+20240523) trixie; urgency=
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Thu, 23 May 2024 16:06:01 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 06 Jun 2024 17:45:55 -0500
 
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/control b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/control
index eeea7f009389dc35c004bd662960e00899c2608b..fa41cca2e09914e0e4c8ed828e1466f7f0f694af 100644
--- a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/control
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/control
@@ -31,5 +31,5 @@ Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
  , mmc-utils
-Description: bb-u-boot-beagleboneai64
- bb-u-boot-beagleboneai64
+Description: beagleboard.org u-boot for beagleboneai64
+ beagleboard.org u-boot for beagleboneai64
diff --git a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/rules b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/rules
index 6596a01cf6f93c476b142ec861d47bc5670f36f4..cfe0ffe52b96eb765c2a1c8f7c43a03eff43fa6e 100755
--- a/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/rules
+++ b/bb-u-boot-beagleboneai64-debian-12/suite/trixie/debian/rules
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2024.07-rc3"
+UB_TAG="v2024.07-rc4"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
diff --git a/bb-u-boot-beagleboneai64-debian-12/version.sh b/bb-u-boot-beagleboneai64-debian-12/version.sh
index 5f35e1bda00ab0341333adb156f8f42e4c9d8b4d..eced5a2375a28f97c868a6c451c52e5006aebd7a 100644
--- a/bb-u-boot-beagleboneai64-debian-12/version.sh
+++ b/bb-u-boot-beagleboneai64-debian-12/version.sh
@@ -5,7 +5,7 @@
 
 package_name="bb-u-boot-beagleboneai64"
 debian_pkg_name="${package_name}"
-package_version="2024.07.20240520.0"
+package_version="2024.07.20240603.0"
 package_source=""
 src_dir=""
 
@@ -20,7 +20,7 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bookworm_version="~bookworm+20240523"
-trixie_version="~trixie+20240523"
-jammy_version="~jammy+20240523"
-noble_version="~noble+20240523"
+bookworm_version="~bookworm+20240606"
+trixie_version="~trixie+20240606"
+jammy_version="~jammy+20240606"
+noble_version="~noble+20240606"