diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index f4be0c53ae..586180b30e 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -135,17 +135,19 @@ config VARIANT_SPECIFIC_OPTIONS_ATLAS
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EXCLUDE_NATIVE_SD_INTERFACE
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SYSTEM_TYPE_LAPTOP
 	select VARIANT_HAS_CAMERA_ACPI
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 
 config VARIANT_SPECIFIC_OPTIONS_POPPY
 	def_bool n
 	select DRIVERS_I2C_MAX98927
-	select NO_FADT_8042
-	select VARIANT_HAS_CAMERA_ACPI
 	select MAINBOARD_HAS_I2C_TPM_CR50
+	select NO_FADT_8042
+	select SYSTEM_TYPE_LAPTOP
+	select VARIANT_HAS_CAMERA_ACPI
 
 config VARIANT_SPECIFIC_OPTIONS_NAMI
 	def_bool n
@@ -155,14 +157,16 @@ config VARIANT_SPECIFIC_OPTIONS_NAMI
 	select DRIVERS_SPI_ACPI
 	select EXCLUDE_NATIVE_SD_INTERFACE
 	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SYSTEM_TYPE_LAPTOP
 
 config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
 	def_bool n
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_DA7219
-	select VARIANT_HAS_CAMERA_ACPI
 	select MAINBOARD_HAS_I2C_TPM_CR50
+	select SYSTEM_TYPE_CONVERTIBLE
+	select VARIANT_HAS_CAMERA_ACPI
 
 config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
 	def_bool n
@@ -173,11 +177,11 @@ config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EXCLUDE_NATIVE_SD_INTERFACE
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select MAINBOARD_HAS_SPI_TPM_CR50
 	select NO_FADT_8042
 	select SYSTEM_TYPE_DETACHABLE
 	select VARIANT_HAS_CAMERA_ACPI
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 
 config VARIANT_SPECIFIC_OPTIONS_RAMMUS
 	def_bool n
@@ -188,14 +192,15 @@ config VARIANT_SPECIFIC_OPTIONS_RAMMUS
 	select DRIVERS_USB_ACPI
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SYSTEM_TYPE_LAPTOP
 
 config VARIANT_SPECIFIC_OPTIONS_SORAKA
 	def_bool n
 	select DRIVERS_I2C_MAX98927
+	select MAINBOARD_HAS_I2C_TPM_CR50
 	select NO_FADT_8042
 	select SYSTEM_TYPE_DETACHABLE
 	select VARIANT_HAS_CAMERA_ACPI
-	select MAINBOARD_HAS_I2C_TPM_CR50
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES