diff --git a/iopsys-brcm63xx-arm/base-files/lib/netifd/hostapd.sh b/iopsys-brcm63xx-arm/base-files/lib/netifd/hostapd.sh
index cad451b85dafcc867c9a30525704aeec53045532..b8772aa3db3544cfbde6838c8e88e1bc5577828b 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/netifd/hostapd.sh
+++ b/iopsys-brcm63xx-arm/base-files/lib/netifd/hostapd.sh
@@ -222,6 +222,7 @@ hostapd_common_add_bss_config() {
 	config_add_int wps_ap_setup_locked wps_independent
 	config_add_int wps_cred_add_sae
 	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin uuid
+	config_add_string wps_model_name wps_model_number wps_serial_number wps_os_version
 	config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
 
 	config_add_boolean ieee80211v wnm_sleep_mode bss_transition
@@ -273,7 +274,7 @@ hostapd_set_bss_options() {
 		acct_server acct_secret acct_port acct_interval \
 		bss_load_update_period chan_util_avg_period sae_require_mfp \
 		multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key multi_ap_primary_vlan_id \
-		mbo wps_cred_add_sae
+		mbo wps_cred_add_sae wps_model_name wps_model_number wps_serial_number wps_os_version
 
 	set_default isolate 0
 	set_default maxassoc 0
@@ -466,6 +467,10 @@ hostapd_set_bss_options() {
 		append bss_conf "manufacturer=$wps_manufacturer" "$N"
 		append bss_conf "config_methods=$config_methods" "$N"
 		append bss_conf "wps_independent=$wps_independent" "$N"
+		[ -n "$wps_model_name" ] && append bss_conf "model_name=$wps_model_name" "$N"
+		[ -n "$wps_model_number" ] && append bss_conf "model_number=$wps_model_number" "$N"
+		[ -n "$wps_serial_number" ] && append bss_conf "serial_number=$wps_serial_numer" "$N"
+		[ -n "$wps_os_version" ] && append bss_conf "os_version=$wps_os_version" "$N"
 		[ -n "$wps_ap_setup_locked" ] && append bss_conf "ap_setup_locked=$wps_ap_setup_locked" "$N"
 		[ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
 		[ "$multi_ap" -gt 0 ] && [ -n "$multi_ap_backhaul_ssid" ] && {