diff --git a/conf/machine/cubieboard4.conf b/conf/machine/cubieboard4.conf
index c0958b6..ceb6168 100644
--- a/conf/machine/cubieboard4.conf
+++ b/conf/machine/cubieboard4.conf
@@ -5,8 +5,6 @@
 require conf/machine/include/sun9i.inc
 require conf/machine/include/hardware/ap6330.inc
 
-MACHINE_FEATURES:append = " bluetooth wifi"
-
 KERNEL_IMAGETYPE = "zImage"
 
 KERNEL_DEVICETREE = "sun9i-a80-cubieboard4.dtb"
diff --git a/conf/machine/include/hardware/ap6212a.inc b/conf/machine/include/hardware/ap6212a.inc
index 4543f38..e8f4dcd 100644
--- a/conf/machine/include/hardware/ap6212a.inc
+++ b/conf/machine/include/hardware/ap6212a.inc
@@ -3,3 +3,5 @@
 
 MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
 MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430"
+
+MACHINE_FEATURES:append = " bluetooth wifi"
diff --git a/conf/machine/include/hardware/ap6330.inc b/conf/machine/include/hardware/ap6330.inc
index 7ef7e28..1245764 100644
--- a/conf/machine/include/hardware/ap6330.inc
+++ b/conf/machine/include/hardware/ap6330.inc
@@ -3,3 +3,5 @@
 
 MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
 MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm4330"
+
+MACHINE_FEATURES:append = " bluetooth wifi"
diff --git a/conf/machine/merrii-a80-optimus.conf b/conf/machine/merrii-a80-optimus.conf
index e8317da..48ae08e 100644
--- a/conf/machine/merrii-a80-optimus.conf
+++ b/conf/machine/merrii-a80-optimus.conf
@@ -5,8 +5,6 @@
 require conf/machine/include/sun9i.inc
 require conf/machine/include/hardware/ap6330.inc
 
-MACHINE_FEATURES:append = " bluetooth wifi"
-
 KERNEL_IMAGETYPE = "zImage"
 
 KERNEL_DEVICETREE = "sun9i-a80-optimus.dtb"
diff --git a/conf/machine/orange-pi-prime.conf b/conf/machine/orange-pi-prime.conf
index 6c26c38..4dff13e 100644
--- a/conf/machine/orange-pi-prime.conf
+++ b/conf/machine/orange-pi-prime.conf
@@ -8,5 +8,4 @@ require conf/machine/include/hardware/ap6212a.inc
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-prime.dtb"
 UBOOT_MACHINE = "orangepi_prime_defconfig"
 
-MACHINE_FEATURES:append = " bluetooth wifi"
 MACHINE_EXTRA_RRECOMMENDS:append = " linux-firmware-rtl8723"