diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-tdfb-drc-capture.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-tdfb-drc-capture.conf
index 352ffb2389a3..3f681eba391e 100644
--- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-tdfb-drc-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-tdfb-drc-capture.conf
@@ -23,32 +23,6 @@ Define {
 	TDFB_DMIC_PCM_CHANNELS 2
 }
 
-IncludeByKey.TDFB_DMIC_PCM_CHANNELS {
-	"1" {
-		Define {
-			TDFB_DMIC_CHANNEL_CFG $CHANNEL_CONFIG_MONO
-			TDFB_DMIC_CHANNEL_MAP $CHANNEL_MAP_MONO
-		}
-	}
-	"2" {
-		Define {
-			TDFB_DMIC_CHANNEL_CFG $CHANNEL_CONFIG_STEREO
-			TDFB_DMIC_CHANNEL_MAP $CHANNEL_MAP_STEREO
-		}
-	}
-	"4" {
-		Define {
-			TDFB_DMIC_CHANNEL_CFG $CHANNEL_CONFIG_3_POINT_1
-			TDFB_DMIC_CHANNEL_MAP $CHANNEL_MAP_3_POINT_1
-		}
-	}
-	"8" {
-		Define {
-			TDFB_SDW_DMIC_CHANNEL_CFG $CHANNEL_CONFIG_7_POINT_1
-			TDFB_SDW_DMIC_CHANNEL_MAP $CHANNEL_MAP_7_POINT_1
-		}
-	}
-}
 
 Class.Pipeline."host-gateway-tdfb-drc-capture" {
 
@@ -88,8 +62,20 @@ Class.Pipeline."host-gateway-tdfb-drc-capture" {
                                                         in_bit_depth		32
                                                         in_valid_bit_depth	32
 							in_channels		$TDFB_DMIC_PCM_CHANNELS
-							in_ch_cfg		$TDFB_DMIC_CHANNEL_CFG
-							in_ch_map		$TDFB_DMIC_CHANNEL_MAP
+							IncludeByKey.TDFB_DMIC_PCM_CHANNELS {
+								"1" {
+									in_ch_cfg	$CHANNEL_CONFIG_MONO
+									in_ch_map	$CHANNEL_MAP_MONO
+								}
+								"4" {
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+								"8" {
+									in_ch_cfg	$CHANNEL_CONFIG_7_POINT_1
+									in_ch_map	$CHANNEL_MAP_7_POINT_1
+								}
+							}
                                                 }
                                         ]
                                         Object.Base.output_audio_format [
@@ -97,8 +83,20 @@ Class.Pipeline."host-gateway-tdfb-drc-capture" {
                                                         out_bit_depth		32
                                                         out_valid_bit_depth	32
 							out_channels		$TDFB_DMIC_PCM_CHANNELS
-							out_ch_cfg		$TDFB_DMIC_CHANNEL_CFG
-							out_ch_map		$TDFB_DMIC_CHANNEL_MAP
+							IncludeByKey.TDFB_DMIC_PCM_CHANNELS {
+								"1" {
+									out_ch_cfg	$CHANNEL_CONFIG_MONO
+									out_ch_map	$CHANNEL_MAP_MONO
+								}
+								"4" {
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+								"8" {
+									out_ch_cfg	$CHANNEL_CONFIG_7_POINT_1
+									out_ch_map	$CHANNEL_MAP_7_POINT_1
+								}
+							}
                                                 }
                                         ]
                                 }
@@ -119,8 +117,20 @@ Class.Pipeline."host-gateway-tdfb-drc-capture" {
                                                         in_bit_depth		32
                                                         in_valid_bit_depth	32
 							in_channels		$TDFB_DMIC_PCM_CHANNELS
-							in_ch_cfg		$TDFB_DMIC_CHANNEL_CFG
-							in_ch_map		$TDFB_DMIC_CHANNEL_MAP
+							IncludeByKey.TDFB_DMIC_PCM_CHANNELS {
+								"1" {
+									in_ch_cfg	$CHANNEL_CONFIG_MONO
+									in_ch_map	$CHANNEL_MAP_MONO
+								}
+								"4" {
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+								"8" {
+									in_ch_cfg	$CHANNEL_CONFIG_7_POINT_1
+									in_ch_map	$CHANNEL_MAP_7_POINT_1
+								}
+							}
                                                 }
                                         ]
                                         Object.Base.output_audio_format [
@@ -128,8 +138,20 @@ Class.Pipeline."host-gateway-tdfb-drc-capture" {
                                                         out_bit_depth		32
                                                         out_valid_bit_depth	32
 							out_channels		$TDFB_DMIC_PCM_CHANNELS
-							out_ch_cfg		$TDFB_DMIC_CHANNEL_CFG
-							out_ch_map		$TDFB_DMIC_CHANNEL_MAP
+							IncludeByKey.TDFB_DMIC_PCM_CHANNELS {
+								"1" {
+									out_ch_cfg	$CHANNEL_CONFIG_MONO
+									out_ch_map	$CHANNEL_MAP_MONO
+								}
+								"4" {
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+								"8" {
+									out_ch_cfg	$CHANNEL_CONFIG_7_POINT_1
+									out_ch_map	$CHANNEL_MAP_7_POINT_1
+								}
+							}
                                                 }
                                         ]
                                 }