diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config
index af8dac2..c7a95f8 100644
--- a/models/darp5/coreboot.config
+++ b/models/darp5/coreboot.config
@@ -107,7 +107,7 @@ CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xe00
 CONFIG_CBFS_SIZE=0xA00000
 # CONFIG_POST_IO is not set
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_UART_FOR_CONSOLE=2
 # CONFIG_VBOOT is not set
@@ -158,9 +158,9 @@ CONFIG_CONSOLE_POST=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 CONFIG_BOARD_SYSTEM76_DARP5=y
-CONFIG_FSP_M_XIP=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0x1325
+CONFIG_FSP_M_XIP=y
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config
index 6113a0f..c33095c 100644
--- a/models/darp6/coreboot.config
+++ b/models/darp6/coreboot.config
@@ -107,7 +107,7 @@ CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xe00
 CONFIG_CBFS_SIZE=0xA00000
 # CONFIG_POST_IO is not set
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_UART_FOR_CONSOLE=2
 # CONFIG_VBOOT is not set
@@ -158,9 +158,9 @@ CONFIG_BOARD_SYSTEM76_DARP6=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_FSP_M_XIP=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0x1404
+CONFIG_FSP_M_XIP=y
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index fc63df0..1cee984 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -107,7 +107,7 @@ CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xe00
 CONFIG_CBFS_SIZE=0xA00000
 # CONFIG_POST_IO is not set
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_UART_FOR_CONSOLE=2
 # CONFIG_VBOOT is not set
@@ -158,9 +158,9 @@ CONFIG_CONSOLE_POST=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 CONFIG_BOARD_SYSTEM76_GALP3_C=y
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_FSP_M_XIP=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0x1323
+CONFIG_FSP_M_XIP=y
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config
index 2108c3b..9d48a65 100644
--- a/models/galp4/coreboot.config
+++ b/models/galp4/coreboot.config
@@ -107,7 +107,7 @@ CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xe00
 CONFIG_CBFS_SIZE=0xA00000
 # CONFIG_POST_IO is not set
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_UART_FOR_CONSOLE=2
 # CONFIG_VBOOT is not set
@@ -158,9 +158,9 @@ CONFIG_BOARD_SYSTEM76_GALP4=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_FSP_M_XIP=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0x1403
+CONFIG_FSP_M_XIP=y
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set