diff --git a/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
index 1ccddc1..a3eaa84 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
@@ -24,7 +24,6 @@ mmdebstrap:
     - libpam-systemd
     - locales
     - neofetch
-    - network-manager
     - net-tools
     - openssh-server
     - sudo
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3
-    - linux-headers-6.6.44-k3
+    - linux-image-6.6.58-k3
+    - linux-headers-6.6.58-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
@@ -53,15 +52,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
@@ -73,6 +68,11 @@ mmdebstrap:
     - chromium
     - wpasupplicant
     - seatd
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -115,7 +115,6 @@ mmdebstrap:
     - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
     - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
     - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
-    - 'chroot "$1" systemctl disable NetworkManager'
       # Enable seatd service
     - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
index a79f7eb..d745372 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
@@ -24,7 +24,6 @@ mmdebstrap:
     - libpam-systemd
     - locales
     - neofetch
-    - network-manager
     - net-tools
     - openssh-server
     - sudo
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3
-    - linux-headers-6.6.44-k3
+    - linux-image-6.6.58-k3
+    - linux-headers-6.6.58-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +52,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
@@ -73,6 +68,11 @@ mmdebstrap:
     - chromium
     - wpasupplicant
     - seatd
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -115,7 +115,6 @@ mmdebstrap:
     - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
     - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
     - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
-    - 'chroot "$1" systemctl disable NetworkManager'
       # Enable seatd service
     - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
index ea58ebf..9bd72c3 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3
-    - linux-headers-6.6.44-k3
+    - linux-image-6.6.58-k3
+    - linux-headers-6.6.58-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +53,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
index 6ad3ca8..110943b 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3
-    - linux-headers-6.6.44-k3
+    - linux-image-6.6.58-k3
+    - linux-headers-6.6.58-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +53,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
diff --git a/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
index cbf4603..c3a72cb 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
@@ -31,8 +31,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.44-k3
-    - linux-headers-6.6.44-k3
+    - linux-image-6.6.58-k3
+    - linux-headers-6.6.58-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
index 787377c..eba2c19 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
@@ -24,7 +24,6 @@ mmdebstrap:
     - libpam-systemd
     - locales
     - neofetch
-    - network-manager
     - net-tools
     - openssh-server
     - sudo
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3-rt
-    - linux-headers-6.6.44-k3-rt
+    - linux-image-6.6.58-k3-rt
+    - linux-headers-6.6.58-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
@@ -53,15 +52,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
@@ -73,6 +68,11 @@ mmdebstrap:
     - chromium
     - wpasupplicant
     - seatd
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -115,7 +115,6 @@ mmdebstrap:
     - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
     - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
     - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
-    - 'chroot "$1" systemctl disable NetworkManager'
       # Enable seatd service
     - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
index db8685b..76d421f 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
@@ -24,7 +24,6 @@ mmdebstrap:
     - libpam-systemd
     - locales
     - neofetch
-    - network-manager
     - net-tools
     - openssh-server
     - sudo
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3-rt
-    - linux-headers-6.6.44-k3-rt
+    - linux-image-6.6.58-k3-rt
+    - linux-headers-6.6.58-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +52,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
@@ -73,6 +68,11 @@ mmdebstrap:
     - chromium
     - wpasupplicant
     - seatd
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -115,7 +115,6 @@ mmdebstrap:
     - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
     - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
     - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
-    - 'chroot "$1" systemctl disable NetworkManager'
       # Enable seatd service
     - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
index 298f7b2..dc1c418 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3-rt
-    - linux-headers-6.6.44-k3-rt
+    - linux-image-6.6.58-k3-rt
+    - linux-headers-6.6.58-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +53,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
index 22d7361..bff5e9c 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.44-k3-rt
-    - linux-headers-6.6.44-k3-rt
+    - linux-image-6.6.58-k3-rt
+    - linux-headers-6.6.58-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -53,15 +53,11 @@ mmdebstrap:
     - libd3dadapter9-mesa-dev
     - libd3dadapter9-mesa
     - libegl-mesa0
-    - libegl1-mesa
     - libgbm1
     - libgl1-mesa-dri
-    - libgl1-mesa-glx
     - libglapi-mesa
-    - libgles2-mesa
     - libglx-mesa0
     - libosmesa6
-    - libwayland-egl1-mesa
     - mesa-opencl-icd
     - mesa-va-drivers
     - mesa-vdpau-drivers
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
index 486463f..eba10b1 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
@@ -31,8 +31,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.44-k3-rt
-    - linux-headers-6.6.44-k3-rt
+    - linux-image-6.6.58-k3-rt
+    - linux-headers-6.6.58-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64
diff --git a/configs/bsp_sources.toml b/configs/bsp_sources.toml
index 4db1488..03a6141 100644
--- a/configs/bsp_sources.toml
+++ b/configs/bsp_sources.toml
@@ -1,16 +1,16 @@
 # BSP selection based on variant of filesystem
 [trixie]
-    bsp_version = "10.01.08.02"
+    bsp_version = "10.01.09.03"
 
 [bookworm]
     bsp_version = "09.02.00.010"
 
 # BSP Configurations
-[10.01.08.02]
+[10.01.09.03]
     atf_srcrev = "58b25570c9ef91753b14c2103f45f4be9dddb696"
     optee_srcrev = "8f645256efc0dc66bd5c118778b0b50c44469ae1"
-    uboot_srcrev = "10.01.08"
-    linux_fw_srcrev = "10.01.08"
+    uboot_srcrev = "10.01.09"
+    linux_fw_srcrev = "10.01.09"
 
 [09.02.00.010]
     atf_srcrev = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
diff --git a/configs/machines/10.01.08.02.toml b/configs/machines/10.01.09.03.toml
similarity index 100%
rename from configs/machines/10.01.08.02.toml
rename to configs/machines/10.01.09.03.toml