diff --git a/src/mainboard/google/ocelot/Kconfig b/src/mainboard/google/ocelot/Kconfig
index 1576db3671..f83e19aa6a 100644
--- a/src/mainboard/google/ocelot/Kconfig
+++ b/src/mainboard/google/ocelot/Kconfig
@@ -98,8 +98,6 @@ config BOARD_GOOGLE_MODEL_OJAL
 config BOARD_GOOGLE_MODEL_OCICAT
 	def_bool n
 	select BOARD_GOOGLE_BASEBOARD_OCELOT
-	select DRIVERS_GENERIC_BAYHUB_LV2
-	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_INTEL_TOUCH
 	select FSP_UGOP_EARLY_SIGN_OF_LIFE
 	select SPD_CACHE_ENABLE
@@ -137,6 +135,7 @@ config BOARD_GOOGLE_OJAL
 
 config BOARD_GOOGLE_OCICAT
 	select BOARD_GOOGLE_MODEL_OCICAT
+	select EC_GOOGLE_CHROMEEC_FW_CONFIG_FROM_UFSC
 
 if BOARD_GOOGLE_OCELOT_COMMON
 
diff --git a/src/mainboard/google/ocelot/variants/ocicat/overridetree.cb b/src/mainboard/google/ocelot/variants/ocicat/overridetree.cb
index 03f782fad3..52ada4b77c 100644
--- a/src/mainboard/google/ocelot/variants/ocicat/overridetree.cb
+++ b/src/mainboard/google/ocelot/variants/ocicat/overridetree.cb
@@ -1,18 +1,26 @@
 fw_config
+	field AUDIO_CODEC 0 2
+		option AUDIO_CODEC_UNKNOWN	0
+		option AUDIO_CODEC_ALC3247	1
+	end
 	field STORAGE_TYPE 12 14
-		option STORAGE_TYPE_UNKNOWN		0
-		option STORAGE_TYPE_NVME_GEN4		1
-		option STORAGE_UFS			2
+		option STORAGE_TYPE_UNKNOWN	0
+		option STORAGE_TYPE_NVME_GEN4	1
+		option STORAGE_UFS		2
 	end
 	field TOUCHSCREEN 17 18
 		option TOUCHSCREEN_UNKNOWN	0
-		option TOUCH_ELAN_TOP	1
-		option TOUCH_ELAN_DBTS	2
+		option TOUCH_ELAN_TOP		1
+		option TOUCH_ELAN_DBTS		2
+	end
+	field SENSOR_HUB 23 23
+		option ISH_ABSENT		0
+		option ISH_PRESENT		1
 	end
 	field WIFI_INTERFACE 26 27
-		option WIFI_INTERFACE_UNKNOWN		0
-		option WIFI_INTERFACE_CNVI_7		1
-		option WIFI_INTERFACE_PCIE_7		2
+		option WIFI_INTERFACE_UNKNOWN	0
+		option WIFI_INTERFACE_CNVI_7	1
+		option WIFI_INTERFACE_PCIE_7	2
 	end
 end
 
@@ -464,11 +472,14 @@ chip soc/intel/pantherlake
 
 		device ref smbus on end
 		device ref hda on
+			probe AUDIO_CODEC AUDIO_CODEC_ALC3247
 			chip drivers/sof
 				register "spkr_tplg" = "max98360a"
 				register "jack_tplg" = "rt5682"
 				register "mic_tplg" = "_2ch_pdm0"
-				device generic 0 on end
+				device generic 0 on
+					probe AUDIO_CODEC AUDIO_CODEC_ALC3247
+				end
 			end
 		end
 	end