diff --git a/conf/machine/qcom-armv8a.conf b/conf/machine/qcom-armv8a.conf
index ebea965c7..f6acd8419 100644
--- a/conf/machine/qcom-armv8a.conf
+++ b/conf/machine/qcom-armv8a.conf
@@ -8,6 +8,10 @@ EXTRA_IMAGECMD:ext4 += " -b 4096 "
 
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-qcom"
 
+UBOOT_CONFIG ??= "qcs6490-rb3gen2 sdm845-db845c"
+UBOOT_CONFIG[qcs6490-rb3gen2] = "qcm6490_defconfig"
+UBOOT_CONFIG[sdm845-db845c] = "qcom_defconfig"
+
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 
 # Support for dragonboard{410, 820, 845}c, rb5