diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index db9d486347..10a941125e 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -4,11 +4,13 @@ config BOARD_GOOGLE_DELBIN
 	bool "-> Delbin"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 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"
@@ -29,6 +31,7 @@ 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"
@@ -51,8 +54,10 @@ config BOARD_GOOGLE_VOLTEER2
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select VARIANT_HAS_MIPI_CAMERA
 	select SOC_INTEL_CSE_LITE_SKU
+	select USE_CAR_NEM_ENHANCED_V2
 
 config BOARD_GOOGLE_VOXEL
 	bool "-> Voxel"
 	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 d92d49691f..a722144fdd 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -25,7 +25,7 @@ config CPU_SPECIFIC_OPTIONS
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
-	select USE_CAR_NEM_ENHANCED_V2
+	select INTEL_CAR_NEM
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select IOAPIC