diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 1f9a7d2eb0..5db9a5061f 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -29,12 +29,13 @@ config BOARD_GOOGLE_BASEBOARD_HATCH
 	select SOC_INTEL_COMETLAKE_1
 	select SOC_INTEL_COMMON_BLOCK_DTT_STATIC_ASL
 	select SPI_TPM
-	select SYSTEM_TYPE_LAPTOP
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE
 	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_AKEMI
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_DRATINI
 	select BOARD_GOOGLE_BASEBOARD_HATCH
@@ -50,17 +51,20 @@ config BOARD_GOOGLE_HELIOS
 	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_RT1011
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_HELIOS_DISKSWAP
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_RT1011
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_JINLON
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select DRIVERS_GFX_GENERIC
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_KINDRED
 	select BOARD_GOOGLE_BASEBOARD_HATCH