diff --git a/src/mainboard/google/puff/Kconfig b/src/mainboard/google/puff/Kconfig
index 0abe53a10e..3e64f05388 100644
--- a/src/mainboard/google/puff/Kconfig
+++ b/src/mainboard/google/puff/Kconfig
@@ -35,6 +35,7 @@ config BOARD_GOOGLE_BASEBOARD_PUFF
 	select SPD_CACHE_IN_FMAP
 	select SPD_READ_BY_WORD
 	select SPI_TPM
+	select SYSTEM_TYPE_MINIPC if !SYSTEM_TYPE_ALL_IN_ONE
 	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_AMBASSADOR
@@ -44,6 +45,7 @@ config BOARD_GOOGLE_AMBASSADOR
 config BOARD_GOOGLE_DOOLY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_DUFFY_LEGACY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
@@ -85,6 +87,7 @@ config BOARD_GOOGLE_PUFF
 
 config BOARD_GOOGLE_SCOUT
 	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_WYVERN
 	select BOARD_GOOGLE_BASEBOARD_PUFF