diff --git a/bb-beagle-version/suite/bookworm/debian/beagle-version b/bb-beagle-version/suite/bookworm/debian/beagle-version
index 3128f0029fc7861a54c397c4db5dfad2395ecd4f..35cd580835f4f180d2a327a7d4041a3f54557e14 100755
--- a/bb-beagle-version/suite/bookworm/debian/beagle-version
+++ b/bb-beagle-version/suite/bookworm/debian/beagle-version
@@ -155,11 +155,11 @@ echo "groups:[${USER_GROUPS}]"
 echo "cmdline:[`cat /proc/cmdline`]"
 
 echo "ti-sci:"
-journalctl -b 0 -k -g ti-sci | grep ABI || true
+journalctl -b 0 -k -g ti-sci | grep ABI | awk -F"controller: " '{print $2}' || true
 echo "optee:"
-journalctl -b 0 -k -g optee | grep revision || true
+journalctl -b 0 -k -g optee | grep revision | awk -F"kernel: " '{print $2}' || true
 echo "wlcore:"
-journalctl -b 0 -k -g wlcore: | grep "firmware\|version" || true
+journalctl -b 0 -k -g wlcore: | grep "firmware\|version" | awk -F"kernel: " '{print $2}' || true
 echo "dmesg | grep remote"
 dmesg | grep remote || true
 echo "dmesg | grep pru"
diff --git a/bb-beagle-version/suite/bookworm/debian/changelog b/bb-beagle-version/suite/bookworm/debian/changelog
index 7af2cdcf2a3de017ec003de3f7e1176e4bb6fed7..757eb37e88ae63790fbffa0c68ded3be31c29821 100644
--- a/bb-beagle-version/suite/bookworm/debian/changelog
+++ b/bb-beagle-version/suite/bookworm/debian/changelog
@@ -1,9 +1,9 @@
-bb-beagle-version (1.20240625.0-0~bookworm+20240625) bookworm; urgency=low
+bb-beagle-version (1.20240625.1-0~bookworm+20240625) bookworm; urgency=low
 
   * Dump firmware version of ti-sci 44083000.dmsc
   * grab ti-sci and optee firmware builds from journalctl
   * Add BeagleY-AI eeprom and bootloader detection
   * Dump wlcore firmware version
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:32:31 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:44:17 -0500
 
diff --git a/bb-beagle-version/suite/bullseye/debian/beagle-version b/bb-beagle-version/suite/bullseye/debian/beagle-version
index 3128f0029fc7861a54c397c4db5dfad2395ecd4f..35cd580835f4f180d2a327a7d4041a3f54557e14 100755
--- a/bb-beagle-version/suite/bullseye/debian/beagle-version
+++ b/bb-beagle-version/suite/bullseye/debian/beagle-version
@@ -155,11 +155,11 @@ echo "groups:[${USER_GROUPS}]"
 echo "cmdline:[`cat /proc/cmdline`]"
 
 echo "ti-sci:"
-journalctl -b 0 -k -g ti-sci | grep ABI || true
+journalctl -b 0 -k -g ti-sci | grep ABI | awk -F"controller: " '{print $2}' || true
 echo "optee:"
-journalctl -b 0 -k -g optee | grep revision || true
+journalctl -b 0 -k -g optee | grep revision | awk -F"kernel: " '{print $2}' || true
 echo "wlcore:"
-journalctl -b 0 -k -g wlcore: | grep "firmware\|version" || true
+journalctl -b 0 -k -g wlcore: | grep "firmware\|version" | awk -F"kernel: " '{print $2}' || true
 echo "dmesg | grep remote"
 dmesg | grep remote || true
 echo "dmesg | grep pru"
diff --git a/bb-beagle-version/suite/bullseye/debian/changelog b/bb-beagle-version/suite/bullseye/debian/changelog
index a9112f951f27b5de037b33a3f72e78b8e420835b..b1391cd4d1b40d796fefa47f3e48a03c52d8da47 100644
--- a/bb-beagle-version/suite/bullseye/debian/changelog
+++ b/bb-beagle-version/suite/bullseye/debian/changelog
@@ -1,9 +1,9 @@
-bb-beagle-version (1.20240625.0-0~bullseye+20240625) bullseye; urgency=low
+bb-beagle-version (1.20240625.1-0~bullseye+20240625) bullseye; urgency=low
 
   * Dump firmware version of ti-sci 44083000.dmsc
   * grab ti-sci and optee firmware builds from journalctl
   * Add BeagleY-AI eeprom and bootloader detection
   * Dump wlcore firmware version
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:32:31 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:44:17 -0500
 
diff --git a/bb-beagle-version/suite/jammy/debian/beagle-version b/bb-beagle-version/suite/jammy/debian/beagle-version
index ee3d54f1d3426114be99694261856af2c6b37e1d..35cd580835f4f180d2a327a7d4041a3f54557e14 100755
--- a/bb-beagle-version/suite/jammy/debian/beagle-version
+++ b/bb-beagle-version/suite/jammy/debian/beagle-version
@@ -135,18 +135,19 @@ echo "pkg check: to individually upgrade run: [sudo apt install --only-upgrade <
 case "${soc_family}" in
 AM62X)
 	pkg="bb-u-boot-beagleplay" ; dpkg_check_version
+	pkg="bb-wl18xx-firmware" ; dpkg_check_version
 	;;
 J721E)
 	pkg="bb-u-boot-beagleboneai64" ; dpkg_check_version
 	;;
 J722S)
 	pkg="bb-u-boot-beagley-ai" ; dpkg_check_version
+	pkg="bb-wl18xx-firmware" ; dpkg_check_version
 	;;
 esac
 
 pkg="bb-customizations" ; dpkg_check_version
 pkg="bb-usb-gadgets" ; dpkg_check_version
-pkg="bb-wl18xx-firmware" ; dpkg_check_version
 
 USER_GROUPS=$(groups `id -nu 1000`)
 echo "groups:[${USER_GROUPS}]"
@@ -154,11 +155,11 @@ echo "groups:[${USER_GROUPS}]"
 echo "cmdline:[`cat /proc/cmdline`]"
 
 echo "ti-sci:"
-journalctl -b 0 -k -g ti-sci | grep ABI || true
+journalctl -b 0 -k -g ti-sci | grep ABI | awk -F"controller: " '{print $2}' || true
 echo "optee:"
-journalctl -b 0 -k -g optee | grep revision || true
+journalctl -b 0 -k -g optee | grep revision | awk -F"kernel: " '{print $2}' || true
 echo "wlcore:"
-journalctl -b 0 -k -g wlcore: | grep version || true
+journalctl -b 0 -k -g wlcore: | grep "firmware\|version" | awk -F"kernel: " '{print $2}' || true
 echo "dmesg | grep remote"
 dmesg | grep remote || true
 echo "dmesg | grep pru"
diff --git a/bb-beagle-version/suite/jammy/debian/changelog b/bb-beagle-version/suite/jammy/debian/changelog
index c250e606c61e5b79eb9e39af9132e833f1e6c5d5..3612ccddee628a7dd3b44214160d15da047e733d 100644
--- a/bb-beagle-version/suite/jammy/debian/changelog
+++ b/bb-beagle-version/suite/jammy/debian/changelog
@@ -1,9 +1,9 @@
-bb-beagle-version (1.20240625.0-0~jammy+20240625) jammy; urgency=low
+bb-beagle-version (1.20240625.1-0~jammy+20240625) jammy; urgency=low
 
   * Dump firmware version of ti-sci 44083000.dmsc
   * grab ti-sci and optee firmware builds from journalctl
   * Add BeagleY-AI eeprom and bootloader detection
   * Dump wlcore firmware version
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:32:31 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:44:17 -0500
 
diff --git a/bb-beagle-version/suite/noble/debian/beagle-version b/bb-beagle-version/suite/noble/debian/beagle-version
index 3128f0029fc7861a54c397c4db5dfad2395ecd4f..35cd580835f4f180d2a327a7d4041a3f54557e14 100755
--- a/bb-beagle-version/suite/noble/debian/beagle-version
+++ b/bb-beagle-version/suite/noble/debian/beagle-version
@@ -155,11 +155,11 @@ echo "groups:[${USER_GROUPS}]"
 echo "cmdline:[`cat /proc/cmdline`]"
 
 echo "ti-sci:"
-journalctl -b 0 -k -g ti-sci | grep ABI || true
+journalctl -b 0 -k -g ti-sci | grep ABI | awk -F"controller: " '{print $2}' || true
 echo "optee:"
-journalctl -b 0 -k -g optee | grep revision || true
+journalctl -b 0 -k -g optee | grep revision | awk -F"kernel: " '{print $2}' || true
 echo "wlcore:"
-journalctl -b 0 -k -g wlcore: | grep "firmware\|version" || true
+journalctl -b 0 -k -g wlcore: | grep "firmware\|version" | awk -F"kernel: " '{print $2}' || true
 echo "dmesg | grep remote"
 dmesg | grep remote || true
 echo "dmesg | grep pru"
diff --git a/bb-beagle-version/suite/noble/debian/changelog b/bb-beagle-version/suite/noble/debian/changelog
index ab91bbd0cc4d6608e304014857d87bc6260c7f1d..eaf5e1b570c26a20725d24b84918e21b23eaab73 100644
--- a/bb-beagle-version/suite/noble/debian/changelog
+++ b/bb-beagle-version/suite/noble/debian/changelog
@@ -1,9 +1,9 @@
-bb-beagle-version (1.20240625.0-0~noble+20240625) noble; urgency=low
+bb-beagle-version (1.20240625.1-0~noble+20240625) noble; urgency=low
 
   * Dump firmware version of ti-sci 44083000.dmsc
   * grab ti-sci and optee firmware builds from journalctl
   * Add BeagleY-AI eeprom and bootloader detection
   * Dump wlcore firmware version
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:32:31 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:44:17 -0500
 
diff --git a/bb-beagle-version/suite/trixie/debian/beagle-version b/bb-beagle-version/suite/trixie/debian/beagle-version
index 3128f0029fc7861a54c397c4db5dfad2395ecd4f..35cd580835f4f180d2a327a7d4041a3f54557e14 100755
--- a/bb-beagle-version/suite/trixie/debian/beagle-version
+++ b/bb-beagle-version/suite/trixie/debian/beagle-version
@@ -155,11 +155,11 @@ echo "groups:[${USER_GROUPS}]"
 echo "cmdline:[`cat /proc/cmdline`]"
 
 echo "ti-sci:"
-journalctl -b 0 -k -g ti-sci | grep ABI || true
+journalctl -b 0 -k -g ti-sci | grep ABI | awk -F"controller: " '{print $2}' || true
 echo "optee:"
-journalctl -b 0 -k -g optee | grep revision || true
+journalctl -b 0 -k -g optee | grep revision | awk -F"kernel: " '{print $2}' || true
 echo "wlcore:"
-journalctl -b 0 -k -g wlcore: | grep "firmware\|version" || true
+journalctl -b 0 -k -g wlcore: | grep "firmware\|version" | awk -F"kernel: " '{print $2}' || true
 echo "dmesg | grep remote"
 dmesg | grep remote || true
 echo "dmesg | grep pru"
diff --git a/bb-beagle-version/suite/trixie/debian/changelog b/bb-beagle-version/suite/trixie/debian/changelog
index 513216422f1607cd3da4d071a940be1c55fedf6b..38161fc4c4cf37dae4d1a137a13e3d0f1c7bf341 100644
--- a/bb-beagle-version/suite/trixie/debian/changelog
+++ b/bb-beagle-version/suite/trixie/debian/changelog
@@ -1,9 +1,9 @@
-bb-beagle-version (1.20240625.0-0~trixie+20240625) trixie; urgency=low
+bb-beagle-version (1.20240625.1-0~trixie+20240625) trixie; urgency=low
 
   * Dump firmware version of ti-sci 44083000.dmsc
   * grab ti-sci and optee firmware builds from journalctl
   * Add BeagleY-AI eeprom and bootloader detection
   * Dump wlcore firmware version
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:32:31 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 25 Jun 2024 12:44:17 -0500
 
diff --git a/bb-beagle-version/version.sh b/bb-beagle-version/version.sh
index d9e716f9027292d3858871f1fe89b7d5e8747dab..38e8136b0b22c6a764d7dd1b4e059374d1962f06 100644
--- a/bb-beagle-version/version.sh
+++ b/bb-beagle-version/version.sh
@@ -4,7 +4,7 @@
 
 package_name="bb-beagle-version"
 debian_pkg_name="${package_name}"
-package_version="1.20240625.0"
+package_version="1.20240625.1"
 package_source=""
 src_dir=""