diff --git a/bb-wlan0-defaults/readme.log b/bb-wlan0-defaults/readme.log
index 75338845844e67913c4fa2f4fbe67a46da4e6dc2..6a57a4149d193fd0aa4ebbf2050551a3789e99b3 100644
--- a/bb-wlan0-defaults/readme.log
+++ b/bb-wlan0-defaults/readme.log
@@ -1 +1,2 @@
   * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
diff --git a/bb-wlan0-defaults/suite/bookworm/debian/81-add-SoftAp0-interface.rules b/bb-wlan0-defaults/suite/bookworm/debian/81-add-SoftAp0-interface.rules
index 2c21913ab565030107386d755e5d8cd609cba693..a47d2cbc09757447ca55fce76f46b12d0af8ecb1 100644
--- a/bb-wlan0-defaults/suite/bookworm/debian/81-add-SoftAp0-interface.rules
+++ b/bb-wlan0-defaults/suite/bookworm/debian/81-add-SoftAp0-interface.rules
@@ -2,5 +2,7 @@ SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="iwlwifi" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="wl18xx_driver" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="cc33xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="mlan[0-9]", DRIVERS=="mwifiex_pcie" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
diff --git a/bb-wlan0-defaults/suite/bookworm/debian/82-SoftAp0-start-hostpad.rules b/bb-wlan0-defaults/suite/bookworm/debian/82-SoftAp0-start-hostpad.rules
index 3259e04e8c9c557e20e9e7b8115766e5e2c200d6..293ccb316685bddc4a972a18da661550c07f1499 100644
--- a/bb-wlan0-defaults/suite/bookworm/debian/82-SoftAp0-start-hostpad.rules
+++ b/bb-wlan0-defaults/suite/bookworm/debian/82-SoftAp0-start-hostpad.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="iwlwifi", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="mwifiex_pcie", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="wl18xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="cc33xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
diff --git a/bb-wlan0-defaults/suite/bookworm/debian/changelog b/bb-wlan0-defaults/suite/bookworm/debian/changelog
index f6affabfc9e7b9bac85f125af85dfc335eb89e4f..ff5bf3bd92aca7ad363ef8d3ee97e550e429f3e8 100644
--- a/bb-wlan0-defaults/suite/bookworm/debian/changelog
+++ b/bb-wlan0-defaults/suite/bookworm/debian/changelog
@@ -1,6 +1,7 @@
-bb-wlan0-defaults (1.20240212.0-0~bookworm+20240212) bookworm; urgency=low
+bb-wlan0-defaults (1.20240622.0-0~bookworm+20240622) bookworm; urgency=low
 
   * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 12 Feb 2024 09:59:07 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Sat, 22 Jun 2024 15:13:24 -0500
 
diff --git a/bb-wlan0-defaults/suite/bullseye/debian/81-add-SoftAp0-interface.rules b/bb-wlan0-defaults/suite/bullseye/debian/81-add-SoftAp0-interface.rules
index 2c21913ab565030107386d755e5d8cd609cba693..a47d2cbc09757447ca55fce76f46b12d0af8ecb1 100644
--- a/bb-wlan0-defaults/suite/bullseye/debian/81-add-SoftAp0-interface.rules
+++ b/bb-wlan0-defaults/suite/bullseye/debian/81-add-SoftAp0-interface.rules
@@ -2,5 +2,7 @@ SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="iwlwifi" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="wl18xx_driver" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="cc33xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="mlan[0-9]", DRIVERS=="mwifiex_pcie" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
diff --git a/bb-wlan0-defaults/suite/bullseye/debian/82-SoftAp0-start-hostpad.rules b/bb-wlan0-defaults/suite/bullseye/debian/82-SoftAp0-start-hostpad.rules
index 4fc4ea5fea1b58448b9e62e47467b7e56816ded0..e75bc205c1edf2175e83342a120e7ca67a35a14e 100644
--- a/bb-wlan0-defaults/suite/bullseye/debian/82-SoftAp0-start-hostpad.rules
+++ b/bb-wlan0-defaults/suite/bullseye/debian/82-SoftAp0-start-hostpad.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="iwlwifi", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="mwifiex_pcie", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="wl18xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="cc33xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd.service"
diff --git a/bb-wlan0-defaults/suite/bullseye/debian/changelog b/bb-wlan0-defaults/suite/bullseye/debian/changelog
index 19cc55ba5f216c8febe4e4dd0c62d70d9c17c792..bbe2862ab1acbe7e66f263624937e5c1bccca2a8 100644
--- a/bb-wlan0-defaults/suite/bullseye/debian/changelog
+++ b/bb-wlan0-defaults/suite/bullseye/debian/changelog
@@ -1,6 +1,7 @@
-bb-wlan0-defaults (1.20240212.0-0~bullseye+20240212) bullseye; urgency=low
+bb-wlan0-defaults (1.20240622.0-0~bullseye+20240622) bullseye; urgency=low
 
   * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 12 Feb 2024 09:59:07 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Sat, 22 Jun 2024 15:13:24 -0500
 
diff --git a/bb-wlan0-defaults/suite/jammy/debian/81-add-SoftAp0-interface.rules b/bb-wlan0-defaults/suite/jammy/debian/81-add-SoftAp0-interface.rules
index 2c21913ab565030107386d755e5d8cd609cba693..a47d2cbc09757447ca55fce76f46b12d0af8ecb1 100644
--- a/bb-wlan0-defaults/suite/jammy/debian/81-add-SoftAp0-interface.rules
+++ b/bb-wlan0-defaults/suite/jammy/debian/81-add-SoftAp0-interface.rules
@@ -2,5 +2,7 @@ SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="iwlwifi" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="wl18xx_driver" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="cc33xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="mlan[0-9]", DRIVERS=="mwifiex_pcie" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
diff --git a/bb-wlan0-defaults/suite/jammy/debian/82-SoftAp0-start-hostpad.rules b/bb-wlan0-defaults/suite/jammy/debian/82-SoftAp0-start-hostpad.rules
index 3259e04e8c9c557e20e9e7b8115766e5e2c200d6..293ccb316685bddc4a972a18da661550c07f1499 100644
--- a/bb-wlan0-defaults/suite/jammy/debian/82-SoftAp0-start-hostpad.rules
+++ b/bb-wlan0-defaults/suite/jammy/debian/82-SoftAp0-start-hostpad.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="iwlwifi", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="mwifiex_pcie", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="wl18xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="cc33xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
diff --git a/bb-wlan0-defaults/suite/jammy/debian/changelog b/bb-wlan0-defaults/suite/jammy/debian/changelog
index 267727470b32383f042ddb86a5c191ea194c7e0e..f12245933dacedba753ae7497774a4f5904b480d 100644
--- a/bb-wlan0-defaults/suite/jammy/debian/changelog
+++ b/bb-wlan0-defaults/suite/jammy/debian/changelog
@@ -1,6 +1,7 @@
-bb-wlan0-defaults (1.20240212.0-0~jammy+20240212) jammy; urgency=low
+bb-wlan0-defaults (1.20240622.0-0~jammy+20240622) jammy; urgency=low
 
   * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 12 Feb 2024 09:59:07 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Sat, 22 Jun 2024 15:13:24 -0500
 
diff --git a/bb-wlan0-defaults/suite/noble/debian/81-add-SoftAp0-interface.rules b/bb-wlan0-defaults/suite/noble/debian/81-add-SoftAp0-interface.rules
new file mode 100644
index 0000000000000000000000000000000000000000..a47d2cbc09757447ca55fce76f46b12d0af8ecb1
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/81-add-SoftAp0-interface.rules
@@ -0,0 +1,8 @@
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="iwlwifi" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="wl18xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="cc33xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="mlan[0-9]", DRIVERS=="mwifiex_pcie" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
diff --git a/bb-wlan0-defaults/suite/noble/debian/82-SoftAp0-start-hostpad.rules b/bb-wlan0-defaults/suite/noble/debian/82-SoftAp0-start-hostpad.rules
new file mode 100644
index 0000000000000000000000000000000000000000..293ccb316685bddc4a972a18da661550c07f1499
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/82-SoftAp0-start-hostpad.rules
@@ -0,0 +1,4 @@
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="iwlwifi", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="mwifiex_pcie", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="wl18xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="cc33xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
diff --git a/bb-wlan0-defaults/suite/noble/debian/SoftAp0-DHCPServer.network b/bb-wlan0-defaults/suite/noble/debian/SoftAp0-DHCPServer.network
new file mode 100644
index 0000000000000000000000000000000000000000..0fc9c7029b03dbae70da9a4cdccceca67bb25735
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/SoftAp0-DHCPServer.network
@@ -0,0 +1,10 @@
+[Match]
+Name=SoftAp0
+
+[Link]
+RequiredForOnline=no
+
+[Network]
+DHCP=no
+Address=192.168.8.1/24
+DHCPServer=on
diff --git a/bb-wlan0-defaults/suite/noble/debian/bb-hostapd.conf b/bb-wlan0-defaults/suite/noble/debian/bb-hostapd.conf
new file mode 100644
index 0000000000000000000000000000000000000000..52689d4c6cf37b1add5f586e0bdd56d849fbdfb8
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/bb-hostapd.conf
@@ -0,0 +1,34 @@
+interface=SoftAp0
+
+# a simply means 5GHz
+# g simply means 2.4GHz band
+hw_mode=g
+
+# the channel to use
+channel=1
+
+# limit the frequencies used to those allowed in the country
+#ieee80211d=1
+# the country code
+#country_code=US
+
+# 802.11n support
+ieee80211n=1
+# QoS support, also required for full speed on 802.11n/ac/ax
+wmm_enabled=1
+
+ssid=BeagleBone-WXYZ
+
+# 1=wpa, 2=wep, 3=both
+auth_algs=1
+wpa=2
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=TKIP
+rsn_pairwise=CCMP
+wpa_passphrase=BeagleBone
+
+macaddr_acl=0
+ignore_broadcast_ssid=0
+
+logger_syslog=-1
+logger_syslog_level=2
diff --git a/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.install b/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.install
new file mode 100644
index 0000000000000000000000000000000000000000..5801172ca62c86ccfb8621251fa2db1d582f0786
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.install
@@ -0,0 +1,9 @@
+debian/81-add-SoftAp0-interface.rules /etc/udev/rules.d/
+debian/82-SoftAp0-start-hostpad.rules /etc/udev/rules.d/
+debian/SoftAp0-DHCPServer.network /etc/bbb.io/templates/
+debian/bb-hostapd.conf /etc/bbb.io/templates/
+debian/mlan0-DHCP.network /etc/bbb.io/templates/
+debian/wlan0-DHCP.network /etc/bbb.io/templates/
+debian/wpa_supplicant-mlan0.conf /etc/bbb.io/templates/
+debian/wpa_supplicant-wlan0.conf /etc/bbb.io/templates/
+debian/local-ignore-softap0.conf /etc/bbb.io/templates/
diff --git a/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.postinst b/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.postinst
new file mode 100644
index 0000000000000000000000000000000000000000..a16ffeb960b617eaca4e627b7800832fb75c65df
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/bb-wlan0-defaults.postinst
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ ! -f /etc/systemd/network/mlan0-DHCP.network ] ; then
+	cp -v /etc/bbb.io/templates/mlan0-DHCP.network /etc/systemd/network/mlan0.network
+fi
+
+if [ ! -f /etc/systemd/network/SoftAp0.network ] ; then
+	cp -v /etc/bbb.io/templates/SoftAp0-DHCPServer.network /etc/systemd/network/SoftAp0.network
+fi
+
+if [ ! -f /etc/systemd/network/wlan0.network ] ; then
+	cp -v /etc/bbb.io/templates/wlan0-DHCP.network /etc/systemd/network/wlan0.network
+fi
+
+if [ -d /etc/NetworkManager/conf.d/ ] ; then
+	cp -v /etc/bbb.io/templates/local-ignore-softap0.conf /etc/NetworkManager/conf.d/
+fi
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/bb-wlan0-defaults/suite/noble/debian/changelog b/bb-wlan0-defaults/suite/noble/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..581e7a071f86ea098415aa29251c549c24dd4a2b
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/changelog
@@ -0,0 +1,7 @@
+bb-wlan0-defaults (1.20240622.0-0~noble+20240622) noble; urgency=low
+
+  * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
+
+ -- Robert Nelson <robertcnelson@gmail.com>  Sat, 22 Jun 2024 15:13:24 -0500
+
diff --git a/bb-wlan0-defaults/suite/noble/debian/compat b/bb-wlan0-defaults/suite/noble/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..45a4fb75db864000d01701c0f7a51864bd4daabf
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/bb-wlan0-defaults/suite/noble/debian/control b/bb-wlan0-defaults/suite/noble/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..63ec484ae11c5f328fd8fe0c9d284dfc0ab8d3d4
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/control
@@ -0,0 +1,18 @@
+Source: bb-wlan0-defaults
+Section: misc
+Priority: extra
+Maintainer: Robert Nelson <robertcnelson@gmail.com>
+Build-Depends:
+ debhelper (>= 9)
+Standards-Version: 4.5.1
+
+Package: bb-wlan0-defaults
+Architecture: all
+Pre-Depends:
+ hostapd
+Depends:
+ ${shlibs:Depends}
+ , ${misc:Depends}
+ , iw
+Description: beagleboard.org wlan0 defaults
+ wlan0 defaults
diff --git a/bb-wlan0-defaults/suite/noble/debian/local-ignore-softap0.conf b/bb-wlan0-defaults/suite/noble/debian/local-ignore-softap0.conf
new file mode 100644
index 0000000000000000000000000000000000000000..9266f90ed5a3acc94fa7d3540aef27fee851bf04
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/local-ignore-softap0.conf
@@ -0,0 +1,2 @@
+[keyfile]
+unmanaged-devices=interface-name:SoftAp0
diff --git a/bb-wlan0-defaults/suite/noble/debian/mlan0-DHCP.network b/bb-wlan0-defaults/suite/noble/debian/mlan0-DHCP.network
new file mode 100644
index 0000000000000000000000000000000000000000..f3c69d5c9a43301c4254a61b4b0b9715d28d30a4
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/mlan0-DHCP.network
@@ -0,0 +1,9 @@
+[Match]
+Name=mlan0
+Type=wlan
+
+[Link]
+RequiredForOnline=yes
+
+[Network]
+DHCP=ipv4
diff --git a/bb-wlan0-defaults/suite/noble/debian/rules b/bb-wlan0-defaults/suite/noble/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..0c1c52d593ebbe0fd5f0c34ed0084797ac19c54f
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+%:
+	dh $@
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
diff --git a/bb-wlan0-defaults/suite/noble/debian/wlan0-DHCP.network b/bb-wlan0-defaults/suite/noble/debian/wlan0-DHCP.network
new file mode 100644
index 0000000000000000000000000000000000000000..8c72a7538c9eb78f25b33a49a441a434f3832aed
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/wlan0-DHCP.network
@@ -0,0 +1,9 @@
+[Match]
+Name=wlan0
+Type=wlan
+
+[Link]
+RequiredForOnline=yes
+
+[Network]
+DHCP=ipv4
diff --git a/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-mlan0.conf b/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-mlan0.conf
new file mode 100644
index 0000000000000000000000000000000000000000..5cd7d9e677ea022284e4f41e15b2719c93dd2cd9
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-mlan0.conf
@@ -0,0 +1,9 @@
+ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
+update_config=1
+p2p_disabled=1
+#country=US
+
+network={
+	ssid="BeagleBone-WXYZ"
+	psk="BeagleBone"
+}
diff --git a/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-wlan0.conf b/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-wlan0.conf
new file mode 100644
index 0000000000000000000000000000000000000000..5cd7d9e677ea022284e4f41e15b2719c93dd2cd9
--- /dev/null
+++ b/bb-wlan0-defaults/suite/noble/debian/wpa_supplicant-wlan0.conf
@@ -0,0 +1,9 @@
+ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
+update_config=1
+p2p_disabled=1
+#country=US
+
+network={
+	ssid="BeagleBone-WXYZ"
+	psk="BeagleBone"
+}
diff --git a/bb-wlan0-defaults/suite/trixie/debian/81-add-SoftAp0-interface.rules b/bb-wlan0-defaults/suite/trixie/debian/81-add-SoftAp0-interface.rules
index 2c21913ab565030107386d755e5d8cd609cba693..a47d2cbc09757447ca55fce76f46b12d0af8ecb1 100644
--- a/bb-wlan0-defaults/suite/trixie/debian/81-add-SoftAp0-interface.rules
+++ b/bb-wlan0-defaults/suite/trixie/debian/81-add-SoftAp0-interface.rules
@@ -2,5 +2,7 @@ SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="iwlwifi" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="wl18xx_driver" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type managed"
+SUBSYSTEM=="net", ACTION=="add", KERNEL=="wlan[0-9]", DRIVERS=="cc33xx_driver" \
+	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
 SUBSYSTEM=="net", ACTION=="add", KERNEL=="mlan[0-9]", DRIVERS=="mwifiex_pcie" \
 	RUN+="/sbin/iw dev %k interface add SoftAp0 type __ap"
diff --git a/bb-wlan0-defaults/suite/trixie/debian/82-SoftAp0-start-hostpad.rules b/bb-wlan0-defaults/suite/trixie/debian/82-SoftAp0-start-hostpad.rules
index 3259e04e8c9c557e20e9e7b8115766e5e2c200d6..293ccb316685bddc4a972a18da661550c07f1499 100644
--- a/bb-wlan0-defaults/suite/trixie/debian/82-SoftAp0-start-hostpad.rules
+++ b/bb-wlan0-defaults/suite/trixie/debian/82-SoftAp0-start-hostpad.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="iwlwifi", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="mwifiex_pcie", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
 SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="wl18xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
+SUBSYSTEM=="net", KERNEL=="SoftAp0", DRIVERS=="cc33xx_driver", TAG+="systemd", ENV{SYSTEMD_WANTS}="hostapd@SoftAp0.service"
diff --git a/bb-wlan0-defaults/suite/trixie/debian/changelog b/bb-wlan0-defaults/suite/trixie/debian/changelog
index e155e6e28858f6dee477a92a7ed6dd4bdec0270b..3b51137f052210a5596257c5664883692f8f2201 100644
--- a/bb-wlan0-defaults/suite/trixie/debian/changelog
+++ b/bb-wlan0-defaults/suite/trixie/debian/changelog
@@ -1,6 +1,7 @@
-bb-wlan0-defaults (1.20240212.0-0~trixie+20240212) trixie; urgency=low
+bb-wlan0-defaults (1.20240622.0-0~trixie+20240622) trixie; urgency=low
 
   * udev call hostapd@SoftAp0.service directly
+  * Add BeagleY-AI early cc33xx hostapd support
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 12 Feb 2024 09:59:07 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Sat, 22 Jun 2024 15:13:24 -0500
 
diff --git a/bb-wlan0-defaults/version.sh b/bb-wlan0-defaults/version.sh
index 5551c9b5456fcc80ec35c3ecb8f5a7a44a55da4f..ba88ca4d566ad4d422b346e5ecb8f837b88eac91 100644
--- a/bb-wlan0-defaults/version.sh
+++ b/bb-wlan0-defaults/version.sh
@@ -2,7 +2,7 @@
 
 package_name="bb-wlan0-defaults"
 debian_pkg_name="${package_name}"
-package_version="1.20240212.0"
+package_version="1.20240622.0"
 package_source=""
 src_dir=""
 
@@ -17,7 +17,8 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20240212"
-bookworm_version="~bookworm+20240212"
-trixie_version="~trixie+20240212"
-jammy_version="~jammy+20240212"
+bullseye_version="~bullseye+20240622"
+bookworm_version="~bookworm+20240622"
+trixie_version="~trixie+20240622"
+jammy_version="~jammy+20240622"
+noble_version="~noble+20240622"