diff --git a/boards/kgpe-d16/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config
similarity index 100%
rename from boards/kgpe-d16/kgpe-d16_server.config
rename to boards/kgpe-d16_server/kgpe-d16_server.config
diff --git a/boards/kgpe-d16/kgpe-d16_workstation.conf b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
similarity index 100%
rename from boards/kgpe-d16/kgpe-d16_workstation.conf
rename to boards/kgpe-d16_workstation/kgpe-d16_workstation.config
diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config
index c54cd6cb7..f9749d883 100644
--- a/config/coreboot-kgpe-d16_server.config
+++ b/config/coreboot-kgpe-d16_server.config
@@ -10,6 +10,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_server/bzImage"
 CONFIG_LINUX_COMMAND_LINE="nohz=on console=ttyS1,115200n8 earlyprintk=ttyS1,115200 "
-CONFIG_LINUX_INITRD="../../build/kgpe-d16/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/kgpe-d16_server/initrd.cpio.xz"
diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config
index 4a7e4886f..04ed3162f 100644
--- a/config/coreboot-kgpe-d16_workstation.config
+++ b/config/coreboot-kgpe-d16_workstation.config
@@ -1,4 +1,5 @@
 CONFIG_LOCALVERSION="heads"
+CONFIG_ANY_TOOLCHAIN=y
 CONFIG_USE_OPTION_TABLE=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 CONFIG_VENDOR_ASUS=y
@@ -9,6 +10,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/kgpe-d16/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation/bzImage"
 CONFIG_LINUX_COMMAND_LINE="nohz=on "
-CONFIG_LINUX_INITRD="../../build/kgpe-d16/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation/initrd.cpio.xz"