diff --git a/recipes-wifi/hostapd/files/hostapd-2G-EHT.conf b/recipes-wifi/hostapd/files/hostapd-2G-EHT.conf
new file mode 100644
index 0000000..16c5b2a
--- /dev/null
+++ b/recipes-wifi/hostapd/files/hostapd-2G-EHT.conf
@@ -0,0 +1,87 @@
+driver=nl80211
+logger_syslog=127
+logger_syslog_level=2
+logger_stdout=127
+logger_stdout_level=2
+hw_mode=g
+supported_rates=60 90 120 180 240 360 480 540
+basic_rates=60 120 240
+beacon_int=100
+dtim_period=2
+
+country_code=US
+ieee80211d=1
+channel=1
+
+tx_queue_data2_burst=5.9
+ieee80211n=1
+ht_coex=0
+ht_capab=[HT40+][LDPC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935]
+
+ieee80211ax=1
+he_su_beamformer=1
+he_su_beamformee=1
+he_mu_beamformer=1
+he_bss_color=128
+he_spr_sr_control=3
+he_default_pe_duration=4
+he_rts_threshold=1023
+he_mu_edca_qos_info_param_count=0
+he_mu_edca_qos_info_q_ack=0
+he_mu_edca_qos_info_queue_request=0
+he_mu_edca_qos_info_txop_request=0
+he_mu_edca_ac_be_aifsn=8
+he_mu_edca_ac_be_aci=0
+he_mu_edca_ac_be_ecwmin=9
+he_mu_edca_ac_be_ecwmax=10
+he_mu_edca_ac_be_timer=255
+he_mu_edca_ac_bk_aifsn=15
+he_mu_edca_ac_bk_aci=1
+he_mu_edca_ac_bk_ecwmin=9
+he_mu_edca_ac_bk_ecwmax=10
+he_mu_edca_ac_bk_timer=255
+he_mu_edca_ac_vi_ecwmin=5
+he_mu_edca_ac_vi_ecwmax=7
+he_mu_edca_ac_vi_aifsn=5
+he_mu_edca_ac_vi_aci=2
+he_mu_edca_ac_vi_timer=255
+he_mu_edca_ac_vo_aifsn=5
+he_mu_edca_ac_vo_aci=3
+he_mu_edca_ac_vo_ecwmin=5
+he_mu_edca_ac_vo_ecwmax=7
+he_mu_edca_ac_vo_timer=255
+ieee80211be=1
+
+interface=wifi0
+ctrl_interface=/var/run/hostapd
+ap_isolate=0
+bss_load_update_period=60
+chan_util_avg_period=600
+disassoc_low_ack=1
+skip_inactivity_poll=0
+preamble=1
+wmm_enabled=1
+ignore_broadcast_ssid=0
+uapsd_advertisement_enabled=1
+utf8_ssid=1
+multi_ap=0
+auth_algs=1
+ssid=Filogic_2g
+bridge=brlan0
+wds_bridge=
+snoop_iface=brlan0
+qos_map_set=0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+bssid=
+
+#Security parameters
+wpa=2
+wpa_pairwise=CCMP
+wpa_key_mgmt=WPA-PSK
+wpa_passphrase=12345678
+#WPS configuration lines, but WPS disabled by default
+wps_state=0
+ap_setup_locked=1
+config_methods=virtual_push_button keypad
+wps_pin_requests=/var/run/hostapd_wps_pin_requests.log
+eap_server=1
+
diff --git a/recipes-wifi/hostapd/files/hostapd-5G-EHT.conf b/recipes-wifi/hostapd/files/hostapd-5G-EHT.conf
new file mode 100644
index 0000000..9f5df75
--- /dev/null
+++ b/recipes-wifi/hostapd/files/hostapd-5G-EHT.conf
@@ -0,0 +1,94 @@
+driver=nl80211
+logger_syslog=127
+logger_syslog_level=2
+logger_stdout=127
+logger_stdout_level=2
+hw_mode=a
+beacon_int=100
+dtim_period=2
+
+country_code=US
+ieee80211d=1
+ieee80211h=1
+channel=36
+
+tx_queue_data2_burst=5.9
+ieee80211n=1
+ht_coex=0
+ht_capab=[HT40+][LDPC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935]
+ieee80211ac=1
+vht_oper_chwidth=1
+vht_oper_centr_freq_seg0_idx=42
+vht_capab=[RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][SU-BEAMFORMER][SU-BEAMFORMEE][MU-BEAMFORMER][MU-BEAMFORMEE][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN][RX-STBC-1][SOUNDING-DIMENSION-4][BF-ANTENNA-4][VHT160][MAX-MPDU-11454][MAX-A-MPDU-LEN-EXP7]
+
+ieee80211ax=1
+he_oper_chwidth=1
+he_oper_centr_freq_seg0_idx=42
+he_su_beamformer=1
+he_su_beamformee=1
+he_mu_beamformer=1
+he_bss_color=128
+he_spr_sr_control=3
+he_default_pe_duration=4
+he_rts_threshold=1023
+he_mu_edca_qos_info_param_count=0
+he_mu_edca_qos_info_q_ack=0
+he_mu_edca_qos_info_queue_request=0
+he_mu_edca_qos_info_txop_request=0
+he_mu_edca_ac_be_aifsn=8
+he_mu_edca_ac_be_aci=0
+he_mu_edca_ac_be_ecwmin=9
+he_mu_edca_ac_be_ecwmax=10
+he_mu_edca_ac_be_timer=255
+he_mu_edca_ac_bk_aifsn=15
+he_mu_edca_ac_bk_aci=1
+he_mu_edca_ac_bk_ecwmin=9
+he_mu_edca_ac_bk_ecwmax=10
+he_mu_edca_ac_bk_timer=255
+he_mu_edca_ac_vi_ecwmin=5
+he_mu_edca_ac_vi_ecwmax=7
+he_mu_edca_ac_vi_aifsn=5
+he_mu_edca_ac_vi_aci=2
+he_mu_edca_ac_vi_timer=255
+he_mu_edca_ac_vo_aifsn=5
+he_mu_edca_ac_vo_aci=3
+he_mu_edca_ac_vo_ecwmin=5
+he_mu_edca_ac_vo_ecwmax=7
+he_mu_edca_ac_vo_timer=255
+ieee80211be=1
+eht_oper_chwidth=1
+eht_oper_centr_freq_seg0_idx=42
+
+interface=wifi1
+ctrl_interface=/var/run/hostapd
+ap_isolate=0
+bss_load_update_period=60
+chan_util_avg_period=600
+disassoc_low_ack=1
+skip_inactivity_poll=0
+preamble=1
+wmm_enabled=1
+ignore_broadcast_ssid=0
+uapsd_advertisement_enabled=1
+utf8_ssid=1
+multi_ap=0
+auth_algs=1
+ssid=Filogic_5g
+bridge=brlan0
+wds_bridge=
+snoop_iface=brlan0
+qos_map_set=0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+bssid=
+
+#Security parameters
+wpa=2
+wpa_pairwise=CCMP
+wpa_key_mgmt=WPA-PSK
+wpa_passphrase=12345678
+#WPS configuration lines, but WPS disabled by default
+wps_state=0
+ap_setup_locked=1
+config_methods=virtual_push_button keypad
+wps_pin_requests=/var/run/hostapd_wps_pin_requests.log
+eap_server=1
+
diff --git a/recipes-wifi/hostapd/files/hostapd-6G-EHT.conf b/recipes-wifi/hostapd/files/hostapd-6G-EHT.conf
new file mode 100644
index 0000000..22162c3
--- /dev/null
+++ b/recipes-wifi/hostapd/files/hostapd-6G-EHT.conf
@@ -0,0 +1,95 @@
+driver=nl80211
+logger_syslog=127
+logger_syslog_level=2
+logger_stdout=127
+logger_stdout_level=2
+hw_mode=a
+beacon_int=100
+dtim_period=2
+
+country_code=US
+ieee80211d=1
+ieee80211h=1
+channel=37
+
+tx_queue_data2_burst=5.9
+ieee80211n=1
+ht_coex=0
+ht_capab=[HT40-]
+op_class=133
+ieee80211ac=1
+vht_oper_chwidth=1
+vht_oper_centr_freq_seg0_idx=39
+vht_capab=[MAX-A-MPDU-LEN-EXP0]
+ieee80211ax=1
+he_oper_chwidth=1
+he_oper_centr_freq_seg0_idx=39
+he_su_beamformer=1
+he_su_beamformee=1
+he_mu_beamformer=1
+he_bss_color=128
+he_spr_sr_control=3
+he_default_pe_duration=4
+he_rts_threshold=1023
+he_mu_edca_qos_info_param_count=0
+he_mu_edca_qos_info_q_ack=0
+he_mu_edca_qos_info_queue_request=0
+he_mu_edca_qos_info_txop_request=0
+he_mu_edca_ac_be_aifsn=8
+he_mu_edca_ac_be_aci=0
+he_mu_edca_ac_be_ecwmin=9
+he_mu_edca_ac_be_ecwmax=10
+he_mu_edca_ac_be_timer=255
+he_mu_edca_ac_bk_aifsn=15
+he_mu_edca_ac_bk_aci=1
+he_mu_edca_ac_bk_ecwmin=9
+he_mu_edca_ac_bk_ecwmax=10
+he_mu_edca_ac_bk_timer=255
+he_mu_edca_ac_vi_ecwmin=5
+he_mu_edca_ac_vi_ecwmax=7
+he_mu_edca_ac_vi_aifsn=5
+he_mu_edca_ac_vi_aci=2
+he_mu_edca_ac_vi_timer=255
+he_mu_edca_ac_vo_aifsn=5
+he_mu_edca_ac_vo_aci=3
+he_mu_edca_ac_vo_ecwmin=5
+he_mu_edca_ac_vo_ecwmax=7
+he_mu_edca_ac_vo_timer=255
+ieee80211be=1
+eht_oper_chwidth=1
+eht_oper_centr_freq_seg0_idx=39
+
+interface=wifi2
+ctrl_interface=/var/run/hostapd
+ap_isolate=0
+bss_load_update_period=60
+chan_util_avg_period=600
+disassoc_low_ack=1
+skip_inactivity_poll=0
+preamble=1
+wmm_enabled=1
+ignore_broadcast_ssid=0
+uapsd_advertisement_enabled=1
+utf8_ssid=1
+multi_ap=0
+auth_algs=1
+ssid=Filogic_6g
+bridge=brlan0
+wds_bridge=
+snoop_iface=brlan0
+qos_map_set=0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+bssid=
+wpa=2
+wpa_pairwise=CCMP
+wpa_key_mgmt=SAE
+wpa_passphrase=12345678
+sae_require_mfp=1
+sae_pwe=2
+
+wpa_disable_eapol_key_retries=0
+
+okc=1
+ieee80211w=2
+group_mgmt_cipher=AES-128-CMAC
+
+
diff --git a/recipes-wifi/hostapd/hostapd_2.10.3.bb b/recipes-wifi/hostapd/hostapd_2.10.3.bb
index 0f5ac38..df99b78 100644
--- a/recipes-wifi/hostapd/hostapd_2.10.3.bb
+++ b/recipes-wifi/hostapd/hostapd_2.10.3.bb
@@ -16,9 +16,9 @@
 SRC_URI = " \
     git://w1.fi/hostap.git;protocol=https;branch=main \
     file://hostapd-full.config \
-    file://hostapd-2G.conf \
-    file://hostapd-5G.conf \
-    file://hostapd-6G.conf \
+    file://hostapd-2G-EHT.conf \
+    file://hostapd-5G-EHT.conf \
+    file://hostapd-6G-EHT.conf \
     file://hostapd-5G-7915.conf \
     file://hostapd-5G-7916.conf \
     file://hostapd.service \
@@ -90,9 +90,9 @@
          install -d ${D}${sbindir} ${D}${sysconfdir} ${D}${systemd_unitdir}/system/ ${D}${base_libdir}/rdk
          install -m 0755 ${B}/hostapd ${D}${sbindir}
          install -m 0755 ${B}/hostapd_cli ${D}${sbindir}
-         install -m 0644 ${WORKDIR}/hostapd-2G.conf ${D}${sysconfdir}
-         install -m 0644 ${WORKDIR}/hostapd-5G.conf ${D}${sysconfdir}
-         install -m 0644 ${WORKDIR}/hostapd-6G.conf ${D}${sysconfdir}
+         install -m 0644 ${WORKDIR}/hostapd-2G-EHT.conf ${D}${sysconfdir}/hostapd-2G.conf
+         install -m 0644 ${WORKDIR}/hostapd-5G-EHT.conf ${D}${sysconfdir}/hostapd-5G.conf
+         install -m 0644 ${WORKDIR}/hostapd-6G-EHT.conf ${D}${sysconfdir}/hostapd-6G.conf
          install -m 0644 ${WORKDIR}/hostapd-5G-7915.conf ${D}${sysconfdir}
          install -m 0644 ${WORKDIR}/hostapd-5G-7916.conf ${D}${sysconfdir}
          install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system
@@ -103,9 +103,9 @@
 
 FILES_${PN} += " \
                 ${systemd_unitdir}/system/hostapd.service \
-                ${sysconfdir}/hostapd-2G.conf \
-                ${sysconfdir}/hostapd-5G.conf \
-                ${sysconfdir}/hostapd-6G.conf \
+                ${sysconfdir}/hostapd-2G-EHT.conf \
+                ${sysconfdir}/hostapd-5G-EHT.conf \
+                ${sysconfdir}/hostapd-6G-EHT.conf \
                 ${sysconfdir}/hostapd-5G-7915.conf \
                 ${sysconfdir}/hostapd-5G-7916.conf \
                 ${base_libdir}/rdk/hostapd-init.sh \