diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index b828a5a004..07ee99b02b 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -17,12 +17,15 @@ config BOARD_GOOGLE_DIRINBOZ
 
 config BOARD_GOOGLE_EZKINIL
 	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_GUMBOZ
 	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_MORPHIUS
 	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_SHUBOZ
 	select BOARD_GOOGLE_BASEBOARD_DALBOZ
@@ -37,6 +40,7 @@ config BOARD_GOOGLE_VILBOZ
 
 config BOARD_GOOGLE_WOOMAX
 	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+	select SYSTEM_TYPE_CONVERTIBLE
 
 if BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
 
@@ -84,7 +88,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_USE_ESPI
 	select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF
 	select SOC_AMD_PICASSO
-	select SYSTEM_TYPE_LAPTOP
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE
 	select TPM_GOOGLE_CR50
 
 config ELOG_BOOT_COUNT_CMOS_OFFSET