diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index bf067c3..db60b24 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -5,10 +5,10 @@
 # than in the other systems. Otherwise the device driver would truncate the data
 # on that eeprom on a bonnell system.
 KERNEL_DEVICETREE = \
-    "aspeed-bmc-ibm-bonnell.dtb \
-     aspeed-bmc-ibm-rainier.dtb \
-     aspeed-bmc-ibm-rainier-4u.dtb \
-     aspeed-bmc-ibm-everest.dtb"
+    "aspeed/aspeed-bmc-ibm-bonnell.dtb \
+     aspeed/aspeed-bmc-ibm-rainier.dtb \
+     aspeed/aspeed-bmc-ibm-rainier-4u.dtb \
+     aspeed/aspeed-bmc-ibm-everest.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-p10bmc"
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -79,7 +79,7 @@
 
 QB_ROOTFS_OPT:p10bmc="-drive file=@ROOTFS@,if=sd,format=qcow2,index=2"
 QB_MACHINE:p10bmc="-machine rainier-bmc"
-QB_DTB:p10bmc="aspeed-bmc-ibm-rainier.dtb"
+QB_DTB:p10bmc="aspeed/aspeed-bmc-ibm-rainier.dtb"
 QB_MEM:p10bmc="-m 1024"
 QB_DEFAULT_FSTYPE:p10bmc="wic.qcow2"
 QB_FSINFO = "wic:no-kernel-in-fs"
diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
index 8a7e24b..8290a44 100644
--- a/meta-ibm/conf/machine/swift.conf
+++ b/meta-ibm/conf/machine/swift.conf
@@ -2,7 +2,7 @@
 
 IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
 
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
index 4d80afb..4153e51 100644
--- a/meta-ibm/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -1,4 +1,4 @@
-KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-opp-tacoma.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-tacoma"
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index 9b8e3f1..5a7c4cb 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot = "u-boot-aspeed"
diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index d34ed5a..71a67d9 100644
--- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
index 46e42b6..bc2802c 100644
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -1,5 +1,5 @@
 KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
 UBOOT_MACHINE = "evb-ast2500_defconfig"
 UBOOT_DEVICETREE = "ast2500-romulus"