diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
index a95ac06..45f296c 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -1,6 +1,33 @@
 config BOARD_GOOGLE_HEROBRINE_COMMON  # Umbrella option to be selected by variants
 	def_bool n
 
+config BOARD_GOOGLE_HEROBRINE
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_HEROBRINE_REV0
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_SENOR
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_PIGLIN
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_HOGLIN
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_VILLAGER
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_EVOKER
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_ZOGLIN
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
+config BOARD_GOOGLE_ZOMBIE
+	select BOARD_GOOGLE_HEROBRINE_COMMON
+
 if BOARD_GOOGLE_HEROBRINE_COMMON
 
 config HEROBRINE_HAS_FINGERPRINT
diff --git a/src/mainboard/google/herobrine/Kconfig.name b/src/mainboard/google/herobrine/Kconfig.name
index e779c91..4c49373 100644
--- a/src/mainboard/google/herobrine/Kconfig.name
+++ b/src/mainboard/google/herobrine/Kconfig.name
@@ -2,36 +2,27 @@
 
 config BOARD_GOOGLE_HEROBRINE
 	bool "->  Herobrine"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_HEROBRINE_REV0
 	bool "->  Herobrine_Rev0"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_SENOR
 	bool "->  Senor"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_PIGLIN
 	bool "->  Piglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_HOGLIN
 	bool "-> Hoglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_VILLAGER
 	bool "-> Villager"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_EVOKER
 	bool "-> Evoker"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_ZOGLIN
 	bool "-> Zoglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_ZOMBIE
 	bool "->  Zombie"
-	select BOARD_GOOGLE_HEROBRINE_COMMON