diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 8723820f14..47503b4364 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -27,17 +27,19 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select SOC_ESPI
 	select SOC_INTEL_GEMINILAKE
 	select SPI_TPM
-	select SYSTEM_TYPE_LAPTOP
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE
 	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_AMPTON
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_BLOOG
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_BOBBA
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
@@ -74,6 +76,7 @@ config BOARD_GOOGLE_MEEP
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_OCTOPUS
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS