diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
index 82107e5e8..e79beed5b 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
@@ -8,7 +8,7 @@ rc-manager=file
 managed=false
 
 [keyfile]
-unmanaged-devices=interface-name:p2p*;interface-name:wlan1
+unmanaged-devices=##UNMANAGED_DEVICES##
 
 [device]
 wifi.scan-rand-mac-address=no
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
index 8c594c368..8614945d7 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019, Digi International Inc.
+# Copyright (C) 2017-2023, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -41,6 +41,9 @@ ETH0_STATIC_CIDR = "${@ipaddr_to_cidr('eth0', d)}"
 ETH1_STATIC_CIDR = "${@ipaddr_to_cidr('eth1', d)}"
 WLAN0_STATIC_CIDR = "${@ipaddr_to_cidr('wlan0', d)}"
 
+UNMANAGED_DEVICES = "interface-name:p2p*;interface-name:wlan1"
+UNMANAGED_DEVICES:ccimx93 = "interface-name:p2p-wfd0-0;interface-name:wfd0;interface-name:uap0"
+
 inherit update-rc.d
 
 do_install:append() {
@@ -48,6 +51,11 @@ do_install:append() {
 	install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
 	install -m 0755 ${WORKDIR}/networkmanager-init ${D}${sysconfdir}/init.d/networkmanager
 
+	#
+	# Customize NetworkManager
+	#
+	sed -i -e "s,##UNMANAGED_DEVICES##,${UNMANAGED_DEVICES},g" ${D}${sysconfdir}/NetworkManager/NetworkManager.conf
+
 	#
 	# Connections config files
 	#