diff --git a/tools/topology/topology1/sof-cml-rt700.m4 b/tools/topology/topology1/sof-cml-rt700.m4
index 0787dc98d..f114648c4 100644
--- a/tools/topology/topology1/sof-cml-rt700.m4
+++ b/tools/topology/topology1/sof-cml-rt700.m4
@@ -124,12 +124,16 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 # Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
 # Set 1000us deadline on core 0 with priority 0.
 # TODO: Modify pipeline deadline to account for deep buffering
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 	31, 31, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000,
 	SCHEDULE_TIME_DOMAIN_TIMER,
 	PIPELINE_PLAYBACK_SCHED_COMP_1)
+'
+)
 
 SectionGraph."mixer-host" {
 	index "0"
@@ -137,7 +141,11 @@ SectionGraph."mixer-host" {
 	lines [
 		# connect mixer dai pipelines to PCM pipelines
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31)
+'
+)
 	]
 }
 
@@ -165,7 +173,11 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 # PCM Low Latency, id 0
 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
 PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PCM_PLAYBACK_ADD(Jack Out DeepBuffer, 31, PIPELINE_PCM_31)
+'
+)
 PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2)
 PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6)
 PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7)
diff --git a/tools/topology/topology1/sof-icl-rt700.m4 b/tools/topology/topology1/sof-icl-rt700.m4
index 571a9f062..bce8e9bee 100644
--- a/tools/topology/topology1/sof-icl-rt700.m4
+++ b/tools/topology/topology1/sof-icl-rt700.m4
@@ -124,12 +124,16 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 # Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
 # Set 1000us deadline on core 0 with priority 0.
 # TODO: Modify pipeline deadline to account for deep buffering
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 	31, 31, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000,
 	SCHEDULE_TIME_DOMAIN_TIMER,
 	PIPELINE_PLAYBACK_SCHED_COMP_1)
+'
+)
 
 SectionGraph."mixer-host" {
 	index "0"
@@ -137,7 +141,11 @@ SectionGraph."mixer-host" {
 	lines [
 		# connect mixer dai pipelines to PCM pipelines
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31)
+'
+)
 	]
 }
 
@@ -165,7 +173,11 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 # PCM Low Latency, id 0
 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
 PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PCM_PLAYBACK_ADD(Jack Out DeepBuffer, 31, PIPELINE_PCM_31)
+'
+)
 PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2)
 PCM_PLAYBACK_ADD(HDMI 1, 5, PIPELINE_PCM_6)
 PCM_PLAYBACK_ADD(HDMI 2, 6, PIPELINE_PCM_7)
diff --git a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4
index 1b1e121be..10460f678 100644
--- a/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4
+++ b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4
@@ -231,12 +231,16 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 # Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
 # Set 1000us deadline on core 0 with priority 0.
 # TODO: Modify pipeline deadline to account for deep buffering
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 	31, 31, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000,
 	SCHEDULE_TIME_DOMAIN_TIMER,
 	PIPELINE_PLAYBACK_SCHED_COMP_1)
+'
+)
 
 SectionGraph."mixer-host" {
 	index "0"
@@ -244,7 +248,11 @@ SectionGraph."mixer-host" {
 	lines [
 		# connect mixer dai pipelines to PCM pipelines
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31)
+'
+)
 	]
 }
 
@@ -316,7 +324,11 @@ dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
 ifdef(`NOJACK', `',
 `
 PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PCM_PLAYBACK_ADD(Jack Out DeepBuffer, 31, PIPELINE_PCM_31)
+'
+)
 PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2)
 ')
 ifdef(`NOAMP', `',
diff --git a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4
index 1d9ba307f..702b171e3 100644
--- a/tools/topology/topology1/sof-tgl-rt711-rt1308.m4
+++ b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4
@@ -191,12 +191,16 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 # Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
 # Set 1000us deadline on core 0 with priority 0.
 # TODO: Modify pipeline deadline to account for deep buffering
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
 	31, 31, 2, s32le,
 	1000, 0, 0,
 	48000, 48000, 48000,
 	SCHEDULE_TIME_DOMAIN_TIMER,
 	PIPELINE_PLAYBACK_SCHED_COMP_1)
+'
+)
 
 SectionGraph."mixer-host" {
 	index "0"
@@ -204,7 +208,12 @@ SectionGraph."mixer-host" {
 	lines [
 		# connect mixer dai pipelines to PCM pipelines
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
+
 		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31)
+'
+)
 	]
 }
 
@@ -249,7 +258,11 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 # PCM Low Latency, id 0
 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
 PCM_PLAYBACK_ADD(Jack Out, 0, PIPELINE_PCM_30)
+ifdef(`HEADSET_DEEP_BUFFER',
+`
 PCM_PLAYBACK_ADD(Jack Out DeepBuffer, 31, PIPELINE_PCM_31)
+'
+)
 PCM_CAPTURE_ADD(Jack In, 1, PIPELINE_PCM_2)
 ifdef(`EXT_AMP',
 `