diff --git a/meta-gbs/conf/machine/gbs.conf b/meta-gbs/conf/machine/gbs.conf
index 32dae06..d5a6e78 100644
--- a/meta-gbs/conf/machine/gbs.conf
+++ b/meta-gbs/conf/machine/gbs.conf
@@ -1,17 +1,19 @@
 KMACHINE = "nuvoton"
 KERNEL_DEVICETREE = "${KMACHINE}-npcm730-gbs.dtb"
 
-UBOOT_MACHINE = "PolegSVB_config"
+UBOOT_MACHINE = "PolegSVB_spinor_minimal_config"
+UBOOT_DEVICETREE = "nuvoton-npcm730-gbs"
 IGPS_MACHINE = "GBS"
 
-FLASH_SIZE = "32768"
-
 MACHINEOVERRIDES .= ":npcm7xx"
 
 require conf/machine/include/npcm7xx.inc
 require conf/machine/include/obmc-bsp-common.inc
 
-SERIAL_CONSOLES = "115200;ttyS0"
+# Overwrite flash offsets
+FLASH_ROFS_OFFSET = "7296"
+FLASH_RWFS_OFFSET = "61440"
+FLASH_SIZE = "65536"
 
 OBMC_MACHINE_FEATURES += "\
         obmc-phosphor-fan-mgmt \