diff --git a/src/arch/xtensa/configs/override/jasperlake_chrome_waves.config b/src/arch/xtensa/configs/override/jasperlake_chrome_waves.config
index 938810851a3d..b450d43ea2c8 100644
--- a/src/arch/xtensa/configs/override/jasperlake_chrome_waves.config
+++ b/src/arch/xtensa/configs/override/jasperlake_chrome_waves.config
@@ -1,5 +1,5 @@
 CONFIG_CAVS_LPS=y
-CONFIG_COMP_CODEC_ADAPTER=y
+CONFIG_COMP_MODULE_ADAPTER=y
 CONFIG_WAVES_CODEC=y
 CONFIG_COMP_SRC=n
 CONFIG_COMP_FIR=n
diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt
index 9215526789d1..235baf78774d 100644
--- a/tools/topology/topology1/CMakeLists.txt
+++ b/tools/topology/topology1/CMakeLists.txt
@@ -196,6 +196,7 @@ set(TPLGS
 	"sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede"
 	"sof-smart-amplifier-nocodec\;sof-smart-amplifier-nocodec"
 	"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DPLATFORM=jsl-rt1015"
+	"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-waves\;-DPLATFORM=jsl-rt1015\;-DWAVES=1"
 	"sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1"
 	"sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede"
 	"sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DPLATFORM=jsl-dedede"