diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
index 20b3a046c..f2c9b4186 100644
--- a/conf/machine/include/qcom-common.inc
+++ b/conf/machine/include/qcom-common.inc
@@ -1,6 +1,9 @@
 SOC_FAMILY:prepend = "qcom:"
 require conf/machine/include/soc-family.inc
 
+# Set a default set of MACHINE_FEATURES, indivudual MACHINEs can append it
+MACHINE_FEATURES = "usbhost usbgadget"
+
 XSERVER_OPENGL ?= " \
     xf86-video-modesetting \
     xserver-xorg-extension-glx \
diff --git a/conf/machine/qcm6490-idp.conf b/conf/machine/qcm6490-idp.conf
index 68cfbb81a..d4cad7a5b 100644
--- a/conf/machine/qcm6490-idp.conf
+++ b/conf/machine/qcm6490-idp.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/qcom-qcs6490.inc
 
-MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth"
+MACHINE_FEATURES += "efi alsa wifi bluetooth"
 
 KERNEL_DEVICETREE ?= " \
                       qcom/qcm6490-idp.dtb \
diff --git a/conf/machine/qcom-armv7a.conf b/conf/machine/qcom-armv7a.conf
index 89132e911..7353e9d84 100644
--- a/conf/machine/qcom-armv7a.conf
+++ b/conf/machine/qcom-armv7a.conf
@@ -17,7 +17,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 # Android boot image settings
 QCOM_BOOTIMG_PAGE_SIZE = "2048"
 
-MACHINE_FEATURES = "alsa screen alsa bluetooth ext2 ext3 opengl usb usbhost usbgadget"
+MACHINE_FEATURES += "alsa screen alsa bluetooth ext2 ext3 opengl usb "
 
 KERNEL_IMAGETYPE ?= "zImage"
 KERNEL_DEVICETREE ?= " \
diff --git a/conf/machine/qcom-armv8a.conf b/conf/machine/qcom-armv8a.conf
index 27d03a1d6..9d4fd4c81 100644
--- a/conf/machine/qcom-armv8a.conf
+++ b/conf/machine/qcom-armv8a.conf
@@ -1,7 +1,7 @@
 require conf/machine/include/qcom-common.inc
 require conf/machine/include/arm/arch-armv8a.inc
 
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
+MACHINE_FEATURES += "alsa screen wifi bluetooth ext2"
 
 # UFS partitions in 820/845/RB5 setup with 4096 logical sector size
 EXTRA_IMAGECMD:ext4 += " -b 4096 "
diff --git a/conf/machine/qcs6490-rb3gen2-core-kit.conf b/conf/machine/qcs6490-rb3gen2-core-kit.conf
index b82692c16..7ae3ec57a 100644
--- a/conf/machine/qcs6490-rb3gen2-core-kit.conf
+++ b/conf/machine/qcs6490-rb3gen2-core-kit.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/qcom-qcs6490.inc
 
-MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth"
+MACHINE_FEATURES += "efi alsa wifi bluetooth"
 
 KERNEL_DEVICETREE ?= " \
                       qcom/qcs6490-rb3gen2.dtb \
diff --git a/conf/machine/qcs9100-ride-sx.conf b/conf/machine/qcs9100-ride-sx.conf
index 4a3a1ceb6..05d625c4a 100644
--- a/conf/machine/qcs9100-ride-sx.conf
+++ b/conf/machine/qcs9100-ride-sx.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/qcom-qcs9100.inc
 
-MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi"
+MACHINE_FEATURES += "efi alsa wifi"
 
 KERNEL_DEVICETREE ?= " \
                       qcom/qcs9100-ride.dtb \