diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 24881b57d0..0161fa11cc 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -64,7 +64,8 @@ config MAINBOARD_FAMILY
 
 config FMDFILE
 	string
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS && BOARD_GOOGLE_KAHLEE
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS
 	default ""
 	help
 	  The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
diff --git a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/chromeos.fmd
rename to src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd