diff --git a/rimage b/rimage
index 3863e94fa5d3..7bc3cfc946a0 160000
--- a/rimage
+++ b/rimage
@@ -1 +1 @@
-Subproject commit 3863e94fa5d361e434f404655dac17541dbf20c6
+Subproject commit 7bc3cfc946a04cbceebf7d0202a6d490c85dca72
diff --git a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt
index 815406b5e49c..0c1ca2eba6cb 100644
--- a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt
+++ b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt
@@ -12,7 +12,7 @@ set(TPLGS
 HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
 NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,DEEPBUFFER_FW_DMA_MS=100"
 "sof-hda-generic\;sof-hda-generic-2ch\;PLATFORM=mtl,\
-HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,\
+HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,INCLUDE_WOV=true,\
 DEEPBUFFER_FW_DMA_MS=100"
 
 # SDW + DMIC topology with passthrough pipelines
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
index 9e11513728c3..282093820a67 100644
--- a/tools/topology/topology2/sof-hda-generic.conf
+++ b/tools/topology/topology2/sof-hda-generic.conf
@@ -19,6 +19,8 @@
 <gain-capture.conf>
 <deepbuffer-playback.conf>
 <passthrough-be.conf>
+<dai-kpb-be.conf>
+<wov-detect.conf>
 <passthrough-capture-be.conf>
 <data.conf>
 <pcm.conf>
@@ -30,6 +32,10 @@
 <hw_config.conf>
 <manifest.conf>
 <route.conf>
+<output_pin_binding.conf>
+<kpb.conf>
+<input_audio_format.conf>
+<output_audio_format.conf>
 <common_definitions.conf>
 <dmic-default.conf>
 <hdmi-default.conf>
@@ -45,6 +51,18 @@ Define {
 	DMIC0_DAI_COPIER 'copier.DMIC.12.1'
 	DMIC0_DAI_GAIN 'gain.12.1'
 	DMIC0_PCM_CAPS 'Gain Capture 11'
+	DMIC1_PCM_CAPS	'DMIC1 WOV Capture'
+	DMIC1_HOST_PIPELINE_ID		16
+	DMIC1_DAI_PIPELINE_ID		17
+	WOV_PIPELINE_ID			18
+	DMIC1_HOST_PIPELINE_SINK	'copier.host.16.1'
+	DMIC_WOV_DAI_PIPELINE_SRC	'copier.DMIC.17.1'
+	DMIC_WOV_DAI_PIPELINE_KPB	'kpb.17.1'
+	WOV_PIPELINE_SINK		'micsel.18.1'
+	WOV_PIPELINE_VIRTUAL		'virtual.detect_sink'
+	WOV_CPC				'360000'
+	DMIC1_PCM_CAPS			'DMIC1 WOV Capture'
+	DMIC1_PIPELINE_STREAM_NAME	'copier.DMIC.17.1'
 }
 
 # override defaults with platform-specific config