diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index f3901470f3..59bcaf2480 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -4,6 +4,13 @@
 config BOARD_GOOGLE_KUKUI_COMMON
 	def_bool n
 
+config BOARD_GOOGLE_JACUZZI_COMMON
+	def_bool n
+	select BOARD_GOOGLE_KUKUI_COMMON
+	select DRIVER_PARADE_PS8640 if BOARD_GOOGLE_JACUZZI
+	# All Jacuzzi followers are using ANX7625 except the reference board.
+	select DRIVER_ANALOGIX_ANX7625 if !BOARD_GOOGLE_JACUZZI
+
 if BOARD_GOOGLE_KUKUI_COMMON
 
 config VBOOT
@@ -28,8 +35,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
-	select DRIVER_PARADE_PS8640 if BOARD_GOOGLE_JACUZZI
-	select DRIVER_ANALOGIX_ANX7625 if BOARD_GOOGLE_JUNIPER || BOARD_GOOGLE_DAMU || BOARD_GOOGLE_KAPPA || BOARD_GOOGLE_CERISE || BOARD_GOOGLE_STERN || BOARD_GOOGLE_WILLOW
 	select MT8183_DRAM_EMCP if BOARD_GOOGLE_KRANE
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/google/kukui/Kconfig.name b/src/mainboard/google/kukui/Kconfig.name
index 55e0101ca0..d84e77c954 100644
--- a/src/mainboard/google/kukui/Kconfig.name
+++ b/src/mainboard/google/kukui/Kconfig.name
@@ -20,30 +20,32 @@ config BOARD_GOOGLE_FLAPJACK
 	bool "->  Flapjack"
 	select BOARD_GOOGLE_KUKUI_COMMON
 
+comment "Jacuzzi"
+
 config BOARD_GOOGLE_JACUZZI
 	bool "->  Jacuzzi"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_JUNIPER
 	bool "->  Juniper"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_KAPPA
 	bool "->  Kappa"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_DAMU
 	bool "->  Damu"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_CERISE
 	bool "->  Cerise"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_STERN
 	bool "->  Stern"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_WILLOW
 	bool "->  Willow"
-	select BOARD_GOOGLE_KUKUI_COMMON
+	select BOARD_GOOGLE_JACUZZI_COMMON