diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 6a3fd7d0e..0a84fd155 100644
--- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -7,36 +7,19 @@ INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 80 0 6 1 ."
 
 inherit systemd
 
+WIFI_VIRTWLANS_FILES = " \
+    file://interfaces.wlan1.static \
+    file://interfaces.wlan1.dhcp \
+    file://virtwlans \
+"
+
 SRC_URI_append = " \
     file://ifupdown.service \
     file://interfaces.br0.example \
     file://interfaces.p2p \
     file://p2plink \
     file://resolv \
-"
-
-SRC_URI_append_ccimx6qpsbc = "\
-    file://interfaces.wlan1.static \
-    file://interfaces.wlan1.dhcp \
-    file://virtwlans \
-"
-
-SRC_URI_append_ccimx6ul = "\
-    file://interfaces.wlan1.static \
-    file://interfaces.wlan1.dhcp \
-    file://virtwlans \
-"
-
-SRC_URI_append_ccimx8x = "\
-    file://interfaces.wlan1.static \
-    file://interfaces.wlan1.dhcp \
-    file://virtwlans \
-"
-
-SRC_URI_append_ccimx8mn = "\
-    file://interfaces.wlan1.static \
-    file://interfaces.wlan1.dhcp \
-    file://virtwlans \
+    ${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', '${WIFI_VIRTWLANS_FILES}', '', d)} \
 "
 
 SYSTEMD_SERVICE_${PN} = "ifupdown.service"
@@ -75,6 +58,12 @@ do_install_append() {
 	sed -i -e "s,##WPA_DRIVER##,${WPA_DRIVER},g" ${D}${sysconfdir}/network/interfaces
 
 	cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces
+
+	# Install virtual wlans files
+	if ${HAS_WIFI_VIRTWLANS}; then
+		install_virtwlans
+		install_wlan1
+	fi
 }
 
 install_virtwlans() {
@@ -107,26 +96,6 @@ install_wlan1() {
 	sed -i -e "s,##WLAN1_PRE_DOWN_ACTION##,${WLAN1_PRE_DOWN_ACTION},g" ${D}${sysconfdir}/network/interfaces
 }
 
-do_install_append_ccimx6qpsbc() {
-	install_virtwlans
-	install_wlan1
-}
-
-do_install_append_ccimx6ul() {
-	install_virtwlans
-	install_wlan1
-}
-
-do_install_append_ccimx8x() {
-	install_virtwlans
-	install_wlan1
-}
-
-do_install_append_ccimx8mn() {
-	install_virtwlans
-	install_wlan1
-}
-
 # Disable wireless interfaces on first boot for non-wireless variants
 pkg_postinst_ontarget_${PN}() {
 	if [ ! -d "/proc/device-tree/wireless" ]; then