diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
index 52c2fede5..7e67eaeb0 100644
--- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
@@ -24,7 +24,7 @@ MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
 HAS_WIFI_VIRTWLANS = "true"
-WLAN_P2P_INTERFACE = "p2p0"
+WLAN_P2P_INTERFACE = "wfd0"
 MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 # XBee
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 2286991e0..f5766db3d 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -25,7 +25,7 @@ MACHINE_FIRMWARE:append = " ethos-u-firmware"
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
 HAS_WIFI_VIRTWLANS = "true"
-WLAN_P2P_INTERFACE = "p2p0"
+WLAN_P2P_INTERFACE = "wfd0"
 MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
 
 # XBee
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
index 6b14c4378..7c0ccf10d 100644
--- a/meta-digi-arm/conf/machine/include/ccimx9.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -34,7 +34,6 @@ MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"
 SDK_MACHINE_FEATURES:append = " optee"
 
 STORAGE_MEDIA = "mmc"
-WLAN_P2P_INTERFACE = "wfd0"
 
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx9_defconfig"