diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index b3695cc383..8bde8e6d1c 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -15,12 +15,14 @@ config BOARD_GOOGLE_BASEBOARD_BELTINO
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select SUPERIO_ITE_IT8772F
+	select SYSTEM_TYPE_MINIPC if !SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_MCCLOUD
 	select BOARD_GOOGLE_BASEBOARD_BELTINO
 
 config BOARD_GOOGLE_MONROE
 	select BOARD_GOOGLE_BASEBOARD_BELTINO
+	select SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_PANTHER
 	select BOARD_GOOGLE_BASEBOARD_BELTINO