diff --git a/ponmngr/files/airoha/lib/xpon/airoha.sh b/ponmngr/files/airoha/lib/xpon/airoha.sh
index f7b67be53..923a996bf 100644
--- a/ponmngr/files/airoha/lib/xpon/airoha.sh
+++ b/ponmngr/files/airoha/lib/xpon/airoha.sh
@@ -34,9 +34,18 @@ set_loid_authentication() {
 	fi
 }
 
+set_onu_version() {
+	local onu_version="$1"
+
+	[ -z "${onu_version}" ] && return
+
+	/userfs/bin/omcicfgCmd set onuVersion "${onu_version}"
+}
+
 apply_xpon_uci_config() {
 	configure_loid_authentication
 	configure_equipment_id
+	configure_onu_version
 }
 
 init_xpon() {
diff --git a/ponmngr/files/broadcom/lib/xpon/broadcom.sh b/ponmngr/files/broadcom/lib/xpon/broadcom.sh
index 17dd26b67..c69477613 100644
--- a/ponmngr/files/broadcom/lib/xpon/broadcom.sh
+++ b/ponmngr/files/broadcom/lib/xpon/broadcom.sh
@@ -29,6 +29,13 @@ set_loid_authentication() {
 	json_add_string "loid_password" "$loid_password"
 }
 
+set_onu_version() {
+	local onu_version="$1"
+	[ -z "${onu_version}" ] && return
+
+	json_add_string "onu_version" "${onu_version}"
+}
+
 apply_xpon_uci_config() {
 	local sn
 
@@ -38,6 +45,7 @@ apply_xpon_uci_config() {
 	json_add_string "serial_number" "$sn"
 	configure_loid_authentication
 	configure_equipment_id
+	configure_onu_version
 	json_close_object
 	json_dump > /tmp/xpon.json
 }
diff --git a/ponmngr/files/common/lib/xpon/get_uci_config.sh b/ponmngr/files/common/lib/xpon/get_uci_config.sh
index b71e3b7a6..647eb2c66 100644
--- a/ponmngr/files/common/lib/xpon/get_uci_config.sh
+++ b/ponmngr/files/common/lib/xpon/get_uci_config.sh
@@ -13,3 +13,8 @@ configure_loid_authentication() {
 	set_loid_authentication "${loid}" "${loid_pwd}"
 }
 
+configure_onu_version() {
+	local onu_version="$(uci -q get xpon.ani.onu_version)"
+
+	set_onu_version "${onu_version}"
+}