diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
index 57e65070b6db..7919e2032b79 100644
--- a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
@@ -47,58 +47,173 @@ Class.Pipeline."gain-capture" {
 	Object.Widget {
 		host-copier."1" {
 			type	"aif_out"
-			num_input_audio_formats 3
-			num_output_audio_formats 3
+			num_input_audio_formats 2
 			num_input_pins 1
-			# 16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-			}
-			# 24-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	24
-			}
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.3 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			num_output_audio_formats 6
+			num_output_pins 1
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	24
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	24
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
 			node_type $HDA_HOST_INPUT_CLASS
 		}
 
 		gain."1" {
-			num_input_audio_formats 2
-			num_output_audio_formats 2
-
-			#16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {}
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
+			num_input_audio_formats 4
+			num_input_pins 1
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			num_output_audio_formats 4
+			num_output_pins 1
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
 		}
 
 		module-copier."2" {
-			num_input_audio_formats 2
-			num_output_audio_formats 2
-			#16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {}
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
+			num_input_audio_formats 4
+			num_input_pins 1
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_channels		4
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			num_output_audio_formats 4
+			num_output_pins 1
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_channels		4
+					out_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+			]
 		}
 
 		pipeline."1" {