diff --git a/feeds/wifi-ax/hostapd/files/hostapd.sh b/feeds/wifi-ax/hostapd/files/hostapd.sh
index df1aec0b4..bc34c3358 100644
--- a/feeds/wifi-ax/hostapd/files/hostapd.sh
+++ b/feeds/wifi-ax/hostapd/files/hostapd.sh
@@ -154,6 +154,8 @@ hostapd_prepare_device_config() {
 	set_default ema 0
 	set_default acs_exclude_dfs 0
 
+	[ "$band" = "6g" ] && multiple_bssid=1
+
 	[ -n "$country" ] && {
 		append base_cfg "country_code=$country" "$N"
 		[ -n "$country3" ] && append base_cfg "country3=$country3" "$N"
diff --git a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
index d5a390fc7..19975b1d7 100644
--- a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -84,6 +84,8 @@ drv_mac80211_init_iface_config() {
 	config_add_int dtim_period
 	config_add_int start_disabled
 
+	config_add_int fils_discovery_max_interval
+
 	# mesh
 	config_add_string mesh_id
 	config_add_int $MP_CONFIG_INT
@@ -488,9 +490,11 @@ mac80211_hostapd_setup_bss() {
 
 	hostapd_set_bss_options hostapd_cfg "$phy" "$vif" || return 1
 	json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled
+        json_get_vars fils_discovery_max_interval
 
 	set_default wds 0
 	set_default start_disabled 0
+	set_default fils_discovery_max_interval 0
 
 	[ "$wds" -gt 0 ] && {
 		append hostapd_cfg "wds_sta=1" "$N"
@@ -498,6 +502,14 @@ mac80211_hostapd_setup_bss() {
 	}
 	[ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
 
+	[ "$band" = "6g" ] && {
+		if [ "$fils_discovery_max_interval" -gt 0 ] && [ "$fils_discovery_max_interval" -le 20 ]; then
+			append hostapd_cfg "fils_discovery_max_interval=$fils_discovery_max_interval" "$N"
+		else
+			append hostapd_cfg "fils_discovery_max_interval=20" "$N"
+		fi
+	}
+
 	cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
 bssid=$macaddr
@@ -1049,6 +1061,8 @@ drv_mac80211_setup() {
 		wireless_set_retry 0
 		return 1
 	}
+	
+	[ "$band" = "6g" ] && multiple_bssid=1
 
 	wireless_set_data phy="$phy"
 	[ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy