diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 7aaaea77a2..b651430ddd 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -4,58 +4,60 @@ config BOARD_GOOGLE_DELBIN
 	bool "-> Delbin"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 	select DRIVERS_GENESYSLOGIC_GL9755
 
 config BOARD_GOOGLE_ELDRID
 	bool "-> Eldrid"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_HALVOR
 	bool "-> Halvor"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_LINDAR
 	bool "-> Lindar"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_MALEFOR
 	bool "-> Malefor"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_TERRADOR
 	bool "-> Terrador"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_TODOR
 	bool "-> Todor"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_TRONDO
 	bool "-> Trondo"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_VOLTEER
 	bool "-> Volteer"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select VARIANT_HAS_MIPI_CAMERA
 	select SOC_INTEL_CSE_LITE_SKU
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_VOLTEER2
 	bool "-> Volteer2"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select VARIANT_HAS_MIPI_CAMERA
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 	select DRIVERS_GENESYSLOGIC_GL9755
 
 # Reworked Volteer2 prototype, Haven chip replaced with Dauntless demo board
@@ -64,27 +66,24 @@ config BOARD_GOOGLE_VOLTEER2_TI50
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select VARIANT_HAS_MIPI_CAMERA
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 	select DRIVERS_GENESYSLOGIC_GL9755
 
 config BOARD_GOOGLE_VOXEL
 	bool "-> Voxel"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_BOLDAR
 	bool "-> Boldar"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_ELEMI
 	bool "-> Elemi"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_VOEMA
 	bool "-> Voema"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
-	select USE_CAR_NEM_ENHANCED_V2
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 79a4c6495b..b276fb905f 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -23,7 +23,7 @@ config CPU_SPECIFIC_OPTIONS
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
-	select INTEL_CAR_NEM
+	select USE_CAR_NEM_ENHANCED_V2 if !INTEL_CAR_NEM
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select IOAPIC