diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
index 78ffbbc..1f8c21e 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
@@ -1,5 +1,6 @@
 KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb"
-UBOOT_MACHINE = "evb-ast2600_defconfig"
+UBOOT_MACHINE = "ast2600_openbmc_defconfig"
+UBOOT_DEVICETREE = "ast2600-rainier"
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"