diff --git a/icwmp/Makefile b/icwmp/Makefile
index 90c85f88e..fd655092d 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2025 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.30
+PKG_VERSION:=9.8.31
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=8cf8920365e40bed907b74d7f1f49d23616129f6
+PKG_SOURCE_VERSION:=07a0518925b94a06ca2f415b1a6741abb9453436
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
index afcfd3e5b..fb78c77bc 100644
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -13,6 +13,7 @@ config acs 'acs'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
 	option skip_dhcp_boot_options '0'
+	option insecure_enable '0'
 
 config cpe 'cpe'
 	option enable '1'
@@ -41,6 +42,7 @@ config cpe 'cpe'
 	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
 	option clock_sync_timeout '128'
+	option disable_datatype_check '0'
 	
 config lwn 'lwn'
 	option enable '0'