diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 66f4311939..11f7ac005b 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -5,7 +5,6 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
 	select DRIVERS_GENERIC_BH720
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
-	select DRIVERS_INTEL_ISH if BOARD_GOOGLE_ARCADA
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EC_GOOGLE_WILCO
@@ -17,22 +16,23 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
 	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
-	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_GOOGLE_SARIEN
 	select SAR_ENABLE
 	select SMBIOS_SERIAL_FROM_VPD if VPD
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE
 	select SOC_INTEL_WHISKEYLAKE
 	select SPD_READ_BY_WORD
-	select SYSTEM_TYPE_CONVERTIBLE if BOARD_GOOGLE_ARCADA
-	select SYSTEM_TYPE_LAPTOP if BOARD_GOOGLE_SARIEN
 	select USE_SAR
 
 config BOARD_GOOGLE_ARCADA
 	select BOARD_GOOGLE_BASEBOARD_SARIEN
+	select DRIVERS_INTEL_ISH
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_SARIEN
 	select BOARD_GOOGLE_BASEBOARD_SARIEN
+	select MAINBOARD_USES_IFD_GBE_REGION
+	select SYSTEM_TYPE_LAPTOP
 
 if BOARD_GOOGLE_BASEBOARD_SARIEN