diff --git a/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf b/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf
index 4653ce5..c8e8257 100644
--- a/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf
+++ b/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf
@@ -1,11 +1,26 @@
 KMACHINE = "nuvoton"
-KERNEL_DEVICETREE = "${KMACHINE}-npcm750-runbmc.dtb"
+KERNEL_DEVICETREE = "${KMACHINE}-npcm750-runbmc-olympus.dtb"
 
-UBOOT_MACHINE = "PolegSVB_config"
-
-FLASH_SIZE = "32768"
 require conf/machine/include/npcm7xx.inc
 require conf/machine/include/obmc-bsp-common.inc
 
+FLASH_SIZE = "32768"
+FLASH_UBOOT_OFFSET = "0"
+FLASH_KERNEL_OFFSET = "2048"
+FLASH_ROFS_OFFSET = "8192"
+FLASH_RWFS_OFFSET = "29696"
+
+UBOOT_MACHINE = "PolegRunBMC_defconfig"
+
 IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot"
 IMAGE_FSTYPES += " mtd-ubi-tar"
+
+OBMC_MACHINE_FEATURES += "\
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-flash-mgmt \
+        obmc-host-ipmi \
+        obmc-host-state-mgmt \
+        obmc-chassis-state-mgmt \
+        obmc-bmc-state-mgmt \
+        "