diff --git a/src/mainboard/google/ocelot/Kconfig b/src/mainboard/google/ocelot/Kconfig
index 582084ee83..5e8a60b96f 100644
--- a/src/mainboard/google/ocelot/Kconfig
+++ b/src/mainboard/google/ocelot/Kconfig
@@ -73,6 +73,15 @@ config BOARD_GOOGLE_OCELOTITE
 config BOARD_GOOGLE_OCELOTMCHP
 	select BOARD_GOOGLE_MODEL_OCELOT
 
+config BOARD_GOOGLE_OCELOT4ES
+	select BOARD_GOOGLE_MODEL_OCELOT
+
+config BOARD_GOOGLE_OCELOTITE4ES
+	select BOARD_GOOGLE_MODEL_OCELOT
+
+config BOARD_GOOGLE_OCELOTMCHP4ES
+	select BOARD_GOOGLE_MODEL_OCELOT
+
 if BOARD_GOOGLE_OCELOT_COMMON
 
 config BASEBOARD_DIR
@@ -120,6 +129,9 @@ config MAINBOARD_FAMILY
 
 config MAINBOARD_PART_NUMBER
 	default "Ocelot" if BOARD_GOOGLE_OCELOT
+	default "Ocelot4ES" if BOARD_GOOGLE_OCELOT4ES
+	default "Ocelotite4ES" if BOARD_GOOGLE_OCELOTITE4ES
+	default "Ocelotmchp4ES" if BOARD_GOOGLE_OCELOTMCHP4ES
 	default "Ocelotite" if BOARD_GOOGLE_OCELOTITE
 	default "Ocelotmchp" if BOARD_GOOGLE_OCELOTMCHP
 
@@ -141,10 +153,7 @@ config USE_PM_ACPI_TIMER
 
 config VARIANT_DIR
 	string
-	default "ocelot" if \
-		BOARD_GOOGLE_OCELOT || \
-		BOARD_GOOGLE_OCELOTITE || \
-		BOARD_GOOGLE_OCELOTMCHP
+	default "ocelot" if BOARD_GOOGLE_MODEL_OCELOT
 
 config OVERRIDE_DEVICETREE
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
diff --git a/src/mainboard/google/ocelot/Kconfig.name b/src/mainboard/google/ocelot/Kconfig.name
index 3be6f46017..71a69cb31a 100644
--- a/src/mainboard/google/ocelot/Kconfig.name
+++ b/src/mainboard/google/ocelot/Kconfig.name
@@ -10,3 +10,12 @@ config BOARD_GOOGLE_OCELOTITE
 
 config BOARD_GOOGLE_OCELOTMCHP
 	bool "-> Ocelotmchp"
+
+config BOARD_GOOGLE_OCELOT4ES
+	bool "-> Ocelot4ES"
+
+config BOARD_GOOGLE_OCELOTITE4ES
+	bool "-> Ocelotite4ES"
+
+config BOARD_GOOGLE_OCELOTMCHP4ES
+	bool "-> Ocelotmchp4ES"
diff --git a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
index 6a43d70708..ddc771eed8 100644
--- a/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
+++ b/src/mainboard/google/ocelot/variants/baseboard/ocelot/include/baseboard/gpio.h
@@ -13,9 +13,7 @@
  * GPIO_PCH_WP - WP signal to PCH
  */
 //TODO for Nuvo: #define EC_SYNC_IRQ	GPP_E07_IRQ
-#if CONFIG(BOARD_GOOGLE_OCELOT) || \
-	CONFIG(BOARD_GOOGLE_OCELOTITE) || \
-	CONFIG(BOARD_GOOGLE_OCELOTMCHP)
+#if CONFIG(BOARD_GOOGLE_MODEL_OCELOT)
  #define EC_SYNC_IRQ	0 /* Not Connected */
 #endif
 #define GPIO_PCH_WP	GPP_D02