diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
index 207a3e92..fdab6de4 100644
--- a/conf/machine/include/qcom-common.inc
+++ b/conf/machine/include/qcom-common.inc
@@ -37,7 +37,7 @@ IMAGE_FSTYPES ?= "ext4.gz"
 IMAGE_ROOTFS_ALIGNMENT ?= "4096"
 
 # XBL Config selection
-QCOM_XBL_CONFIG ?= "${@bb.utils.contains("MACHINE_FEATURES", "kvm", "xbl_config_kvm.elf", "xbl_config.elf", d)}"
+QCOM_XBL_CONFIG ?= "${@bb.utils.contains("COMBINED_FEATURES", "kvm", "xbl_config_kvm.elf", "xbl_config.elf", d)}"
 
 # Android boot image settings
 QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"