diff --git a/tools/topology/topology2/cavs-nocodec-multicore.conf b/tools/topology/topology2/cavs-nocodec-multicore.conf
index 9c7e9c833b59..36c20c6b682d 100644
--- a/tools/topology/topology2/cavs-nocodec-multicore.conf
+++ b/tools/topology/topology2/cavs-nocodec-multicore.conf
@@ -315,46 +315,62 @@ IncludeByKey.PASSTHROUGH {
 							stream_name 'Gain Capture 19'
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 						}
 						Object.Widget.gain.1 {
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 							Object.Control.mixer.1 {
 								name 'Pre Demux $DMIC0_PCM_0_NAME Capture Volume'
 							}
@@ -376,46 +392,62 @@ IncludeByKey.PASSTHROUGH {
 							pcm_id	$DMIC0_PCM_0_PCM_ID
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 						}
 						Object.Widget.gain.1 {
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 							Object.Control.mixer.1 {
 								name 'Post Demux $DMIC0_PCM_0_NAME Capture Volume'
 							}
@@ -434,46 +466,62 @@ IncludeByKey.PASSTHROUGH {
 							pcm_id	$DMIC0_PCM_1_PCM_ID
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 						}
 						Object.Widget.gain.1 {
 							num_input_audio_formats 2
 							num_output_audio_formats 2
-							Object.Base.audio_format.1 {
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-							Object.Base.audio_format.2 {
-								in_channels		4
-								in_bit_depth		32
-								in_valid_bit_depth	32
-								out_channels		4
-								out_bit_depth		32
-								out_valid_bit_depth	32
-								in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								in_ch_map	$CHANNEL_MAP_3_POINT_1
-								out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-								out_ch_map	$CHANNEL_MAP_3_POINT_1
-							}
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth		32
+									in_valid_bit_depth	32
+								}
+								{
+									in_channels		4
+									in_bit_depth		32
+									in_valid_bit_depth	32
+									in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									in_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth		32
+									out_valid_bit_depth	32
+								}
+								{
+									out_channels		4
+									out_bit_depth		32
+									out_valid_bit_depth	32
+									out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+									out_ch_map	$CHANNEL_MAP_3_POINT_1
+								}
+							]
 							Object.Control.mixer.1 {
 								name 'Post Demux $DMIC0_PCM_1_NAME Capture Volume'
 							}
diff --git a/tools/topology/topology2/development/cavs-nocodec-crossover.conf b/tools/topology/topology2/development/cavs-nocodec-crossover.conf
index cc49e9c3ef84..710e9125d567 100644
--- a/tools/topology/topology2/development/cavs-nocodec-crossover.conf
+++ b/tools/topology/topology2/development/cavs-nocodec-crossover.conf
@@ -315,12 +315,6 @@ Object.Pipeline.io-gateway-capture [
 			copier_type	"SSP"
 			stream_name	"NoCodec-2"
 			node_type	$I2S_LINK_INPUT_CLASS
-			Object.Base.audio_format.1 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
 		}
 	}
 ]
diff --git a/tools/topology/topology2/include/bench/one_input_output_format_s16.conf b/tools/topology/topology2/include/bench/one_input_output_format_s16.conf
index 2f23335b7c6d..a309ceed07b4 100644
--- a/tools/topology/topology2/include/bench/one_input_output_format_s16.conf
+++ b/tools/topology/topology2/include/bench/one_input_output_format_s16.conf
@@ -1,11 +1,15 @@
                         num_input_audio_formats 1
                         num_output_audio_formats 1
 
-                        # 32-bit 48KHz 2ch
-                        Object.Base.audio_format [
+                        # 16-bit 48KHz 2ch
+                        Object.Base.input_audio_format [
                                 {
                                         in_bit_depth		16
                                         in_valid_bit_depth	16
+				}
+			]
+			Object.Base.output_audio_format [
+				{
                                         out_bit_depth		16
                                         out_valid_bit_depth	16
                                 }
diff --git a/tools/topology/topology2/include/bench/one_input_output_format_s24.conf b/tools/topology/topology2/include/bench/one_input_output_format_s24.conf
index 4d83f5426dc1..081373a4b405 100644
--- a/tools/topology/topology2/include/bench/one_input_output_format_s24.conf
+++ b/tools/topology/topology2/include/bench/one_input_output_format_s24.conf
@@ -1,11 +1,15 @@
                         num_input_audio_formats 1
                         num_output_audio_formats 1
 
-                        # 32-bit 48KHz 2ch
-                        Object.Base.audio_format [
+                        # 24-bit 48KHz 2ch
+                        Object.Base.input_audio_format [
                                 {
                                         in_bit_depth		32
                                         in_valid_bit_depth	24
+				}
+			]
+			Object.Base.output_audio_format [
+				{
                                         out_bit_depth		32
                                         out_valid_bit_depth	24
                                 }
diff --git a/tools/topology/topology2/include/bench/one_input_output_format_s32.conf b/tools/topology/topology2/include/bench/one_input_output_format_s32.conf
index 5ef867327013..adc4d2f47d40 100644
--- a/tools/topology/topology2/include/bench/one_input_output_format_s32.conf
+++ b/tools/topology/topology2/include/bench/one_input_output_format_s32.conf
@@ -2,10 +2,14 @@
                         num_output_audio_formats 1
 
                         # 32-bit 48KHz 2ch
-                        Object.Base.audio_format [
+			Object.Base.input_audio_format [
                                 {
                                         in_bit_depth		32
                                         in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
                                         out_bit_depth		32
                                         out_valid_bit_depth	32
                                 }
diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf
index c8e8699f1294..4a597637ce50 100644
--- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/pipeline.conf>
 
@@ -39,46 +40,59 @@ Class.Pipeline."dai-copier-be" {
 			num_output_audio_formats 3
 			num_output_pins 1
 
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 32-bit 48KHz 4ch
-			Object.Base.audio_format.2 {
-				in_channels		4
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_channels		4
-				out_bit_depth		32
-				out_valid_bit_depth	32
-				in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-				in_ch_map	$CHANNEL_MAP_3_POINT_1
-				out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-				out_ch_map	$CHANNEL_MAP_3_POINT_1
-			}
-			# 24-bit 48KHz 2ch
-			Object.Base.audio_format.3 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	24
-				out_sample_type		$SAMPLE_TYPE_MSB_INTEGER
-				out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					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_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+					out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
+				}
+			]
 		}
 
 		module-copier."2" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+                                        out_bit_depth		32
+                                        out_valid_bit_depth	32
+                                }
+                        ]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf
index 7f7a85d4724e..9e8d4c8b0f8a 100644
--- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/mixin.conf>
@@ -51,12 +52,18 @@ Class.Pipeline."dai-copier-gain-mixin-capture" {
 			num_output_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		mixin."1" {}
@@ -64,12 +71,18 @@ Class.Pipeline."dai-copier-gain-mixin-capture" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf
index 2e38db9f0719..146ab0dcf044 100644
--- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/pipeline.conf>
@@ -50,35 +51,53 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
 			num_output_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		module-copier."2" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 		gain."1" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
index 28d2f8c47d74..71ed5dff6039 100644
--- a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
@@ -46,70 +46,78 @@ Class.Pipeline."dai-kpb-be" {
 			num_output_audio_formats 3
 			num_output_pins 1
 
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.3 {
-				in_bit_depth            32
-				in_valid_bit_depth      24
-				out_bit_depth           32
-				out_valid_bit_depth     24
-				out_sample_type		$SAMPLE_TYPE_MSB_INTEGER
-				out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
-			}
-
-			Object.Base.audio_format.1 {
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 32-bit 48KHz 4ch
-			Object.Base.audio_format.2 {
-				in_channels		4
-				in_bit_depth		32
-				in_valid_bit_depth	32
-				out_channels		4
-				out_bit_depth		32
-				out_valid_bit_depth	32
-				in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-				in_ch_map	$CHANNEL_MAP_3_POINT_1
-				out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-				out_ch_map	$CHANNEL_MAP_3_POINT_1
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg		$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map		$CHANNEL_MAP_3_POINT_1
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					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_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+					out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
+				}
+			]
 		}
 
 		kpb."1" {
 			num_input_audio_formats 2
 			num_output_audio_formats 2
-			Object.Base.audio_format.1 {
-				in_rate			16000
-				out_rate		16000
-				obs			128
-				in_ch_cfg	$CHANNEL_CONFIG_STEREO
-				in_ch_map	$CHANNEL_MAP_STEREO
-				out_ch_cfg	$CHANNEL_CONFIG_STEREO
-				out_ch_map	$CHANNEL_MAP_STEREO
-				in_channels	2
-				out_channels	2
-				out_bit_depth	32
-				in_bit_depth	32
-				in_valid_bit_depth	32
-				out_valid_bit_depth	32
-			}
-			Object.Base.audio_format.2 {
-				in_rate			16000
-				out_rate		16000
-				obs			128
-				in_ch_cfg	$CHANNEL_CONFIG_4_POINT_0
-				in_ch_map	$CHANNEL_MAP_3_POINT_1
-				out_ch_cfg	$CHANNEL_CONFIG_4_POINT_0
-				out_ch_map	$CHANNEL_MAP_3_POINT_1
-				in_channels	4
-				out_channels	4
-				out_bit_depth	32
-				in_bit_depth	32
-				in_valid_bit_depth	32
-				out_valid_bit_depth	32
-			}
+			Object.Base.input_audio_format [
+				{
+					in_rate			16000
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_rate			16000
+					in_channels		4
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					in_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
+
+			Object.Base.output_audio_format [
+				{
+					out_rate		16000
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+				{
+					out_rate		16000
+					out_channels		4
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+					out_ch_map	$CHANNEL_MAP_3_POINT_1
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
index f63f77ad13be..b787551b58bf 100644
--- a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf
@@ -51,7 +51,6 @@ Class.Pipeline."deepbuffer-playback" {
 			num_output_audio_formats 1
 			num_output_pins 1
 			deep_buffer_dma_ms	$DEEPBUFFER_FW_DMA_MS
-			# 16-bit 48KHz 2ch
 			Object.Base.input_audio_format [
 				{
 					in_bit_depth		16
@@ -66,7 +65,6 @@ Class.Pipeline."deepbuffer-playback" {
 					in_valid_bit_depth	32
 				}
 			]
-			# 24-bit 48KHz 2ch
 			Object.Base.output_audio_format [
 				{
 					out_bit_depth		32
@@ -79,11 +77,14 @@ Class.Pipeline."deepbuffer-playback" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf
index ff9ef84b6d51..b452c42eb1f0 100644
--- a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/pipeline.conf>
@@ -47,26 +48,51 @@ Class.Pipeline."gain-module-copier" {
 			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
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 		module-copier."1" {
 			num_input_audio_formats 2
 			num_output_audio_formats 2
 
-			Object.Base.audio_format.1 {
-				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		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf
index e5e5bc41d9a7..84f8927fafaa 100644
--- a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/host-copier.conf>
 <include/components/gain.conf>
 <include/components/pipeline.conf>
@@ -45,42 +46,54 @@ Class.Pipeline."gain-playback" {
 		host-copier."1" {
 			type	"aif_in"
 			num_input_audio_formats 3
-			num_output_audio_formats 3
+			num_output_audio_formats 1
 			num_output_pins 1
-			# 16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 24-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 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		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 			node_type $HDA_HOST_OUTPUT_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
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		16
+					out_valid_bit_depth	16
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf
index 7d43f08f1a61..f80a43acb0a3 100644
--- a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf
@@ -17,7 +17,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/pipeline.conf>
 <include/controls/bytes.conf>
@@ -42,24 +43,36 @@ Class.Pipeline."highpass-capture-be" {
 			num_output_audio_formats 1
 			num_output_pins 1
 
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		eqiir."1" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 
 			Object.Control.bytes."1" {
 				<include/components/eqiir/highpass_40hz_0db_48khz.conf>
diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf
index 02f47b204a3b..8a2665c20bce 100644
--- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/host-copier.conf>
 <include/components/mixin.conf>
 <include/components/pipeline.conf>
@@ -47,27 +48,28 @@ Class.Pipeline."host-copier-gain-mixin-playback" {
 			type	"aif_in"
 			node_type $HDA_HOST_OUTPUT_CLASS
 			num_input_audio_formats 3
-			num_output_audio_formats 3
+			num_output_audio_formats 1
 			num_output_pins 1
-			# 16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 24-bit 48KHz 2ch
-			Object.Base.audio_format.2 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	32
-			}
-			# 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		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		gain."1" {
@@ -75,10 +77,14 @@ Class.Pipeline."host-copier-gain-mixin-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf
index a50b8ed0dd3c..8216a07a0878 100644
--- a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf
@@ -17,7 +17,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/pipeline.conf>
 
@@ -40,12 +41,18 @@ Class.Pipeline."io-gateway-capture" {
 			num_output_audio_formats 1
 			num_output_pins 1
 
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf
index 682b3c47ebe3..5bb171977c56 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/mixin.conf>
 <include/components/gain.conf>
 <include/components/mixout.conf>
@@ -51,10 +52,14 @@ Class.Pipeline."mixout-aria-gain-mixin-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf
index ba7997a55006..a125bbf6fc8f 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/mixout.conf>
 <include/components/pipeline.conf>
@@ -50,10 +51,14 @@ Class.Pipeline."mixout-dai-copier-playback" {
 			num_input_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
index 66b7b9c8b1a5..c8f443c4c497 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/mixout.conf>
@@ -56,10 +57,14 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 			num_input_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -70,10 +75,14 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -84,10 +93,14 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -104,10 +117,14 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -124,10 +141,14 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf
index 87f3e1e34809..70167085bad3 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/mixout.conf>
@@ -56,10 +57,14 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 			num_input_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -70,10 +75,14 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -84,10 +93,14 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -104,10 +117,14 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -123,12 +140,18 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
 
-			Object.Base.audio_format.1 {
-				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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 
 			Object.Control.bytes."1" {
 				IncludeByKey.EFX_MBDRC_PARAMS {
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
index 1c9801d89520..3126311e93a7 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
@@ -48,56 +48,58 @@ Class.Pipeline."mixout-gain-host-copier-capture" {
 		host-copier."1" {
 			type	"aif_out"
 			node_type $HDA_HOST_INPUT_CLASS
-			num_input_audio_formats 4
-			num_output_audio_formats 4
+			num_input_audio_formats 2
+			num_output_audio_formats 3
 			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
-			}
-
-			Object.Base.audio_format.3 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	24
-			}
-
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.4 {
-				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	24
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					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
+				}
+			]
 		}
 
 		gain."1"{
 			num_input_audio_formats 2
 			num_output_audio_formats 2
-
-			# 32-bit 48KHz 2ch
-			Object.Base.audio_format.1 {
-				in_bit_depth		32
-				in_valid_bit_depth	24
-				out_bit_depth		32
-				out_valid_bit_depth	24
-			}
-
-			Object.Base.audio_format.2 {
-				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	24
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	24
+				}
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf
index 2272c815d1e2..f0ca0fbf6b14 100644
--- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf
@@ -16,7 +16,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/gain.conf>
 <include/components/mixout.conf>
@@ -52,10 +53,14 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" {
 			num_input_pins 1
 
 			# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -66,10 +71,14 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" {
 			num_output_audio_formats 1
 
 			# 32-bit 48KHz 2ch
-			Object.Base.audio_format [
+			Object.Base.input_audio_format [
 				{
 					in_bit_depth		32
 					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
 					out_bit_depth		32
 					out_valid_bit_depth	32
 				}
@@ -80,23 +89,25 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" {
 			num_input_audio_formats 2
 			num_output_audio_formats 1
 			# 32-bit 48KHz 2ch
-			Object.Base.input_audio_format {
-				1 {
+			Object.Base.input_audio_format [
+				{
 					input_pin_index	0
 					in_bit_depth		32
 					in_valid_bit_depth	32
 				}
-				2 {
+				{
 					input_pin_index	1
 					in_bit_depth		32
 					in_valid_bit_depth	32
 				}
-			}
-			Object.Base.output_audio_format.1 {
+			]
+			Object.Base.output_audio_format [
+				{
 				output_pin_index 0
 				out_bit_depth		32
 				out_valid_bit_depth	32
-			}
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf
index 46d1a6dfc8b9..1394c45d411a 100644
--- a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf
@@ -59,22 +59,35 @@ Class.Pipeline."src-gain-mixin-playback" {
 		gain."1" {
 			num_input_audio_formats 3
 			num_output_audio_formats 3
-			#16-bit 48KHz 2ch
-			Object.Base.audio_format.1 {}
-
-                        Object.Base.audio_format.2 {
-                                in_bit_depth            32
-                                in_valid_bit_depth      24
-                                out_bit_depth           32
-                                out_valid_bit_depth     24
-                        }
-
-			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		16
+					in_valid_bit_depth	16
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	24
+				}
+			]
+			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		32
+					out_valid_bit_depth	24
+				}
+			]
+
 		}
 
 		mixin."1" { }
diff --git a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf
index dc7805bd0f3e..b4d0466ea7be 100644
--- a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf
@@ -17,7 +17,8 @@
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
 
-<include/common/audio_format.conf>
+<include/common/input_audio_format.conf>
+<include/common/output_audio_format.conf>
 <include/components/dai-copier.conf>
 <include/components/micsel.conf>
 <include/components/wov.conf>
@@ -59,39 +60,49 @@ Class.Pipeline."wov-detect" {
 		}
 
 		micsel."1" {
-			Object.Base.audio_format.1 {
-				in_rate		16000
-				out_rate	16000
-				in_channels	2
-				out_channels	1
-				in_ch_map	$CHANNEL_MAP_STEREO
-				in_ch_cfg	1
-				out_ch_map	$CHANNEL_MAP_MONO
-				out_ch_cfg	0
-				out_bit_depth	32
-				in_bit_depth	32
-				in_valid_bit_depth	32
-				out_valid_bit_depth	32
-			}
+			Object.Base.input_audio_format [
+				{
+					in_rate		16000
+					in_channels	2
+					in_ch_map	$CHANNEL_MAP_STEREO
+					in_ch_cfg	1
+					in_bit_depth	32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_rate	16000
+					out_channels	1
+					out_ch_map	$CHANNEL_MAP_MONO
+					out_ch_cfg	0
+					out_bit_depth	32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		wov."1" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
-			Object.Base.audio_format.1 {
-				in_rate		16000
-				out_rate	16000
-				in_channels	1
-				out_channels	1
-				in_ch_cfg	0
-				in_ch_map	$CHANNEL_MAP_MONO
-				out_bit_depth	32
-				in_bit_depth	32
-				in_valid_bit_depth	32
-				out_valid_bit_depth	32
-				ibs			0x80
-				obs			0x80
-			}
+			Object.Base.input_audio_format [
+				{
+					in_rate		16000
+					in_channels	1
+					in_ch_cfg	0
+					in_ch_map	$CHANNEL_MAP_MONO
+					in_bit_depth	32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_rate	16000
+					out_channels	1
+					out_bit_depth	32
+					out_valid_bit_depth	32
+				}
+			]
 		}
 
 		pipeline."1" {
diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf
index 57965f36b562..85c121a01026 100644
--- a/tools/topology/topology2/platform/intel/bt-generic.conf
+++ b/tools/topology/topology2/platform/intel/bt-generic.conf
@@ -26,34 +26,38 @@ Object.Pipeline {
 				num_output_audio_formats 3
 				num_input_pins 1
 
-				Object.Base.audio_format.0 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		2
-					out_channels		2
-				}
-				Object.Base.audio_format.2 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		8000
-					out_rate		8000
-				}
-				Object.Base.audio_format.3 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		16000
-					out_rate		16000
-				}
+				CombineArrays.Object.Base.output_audio_format [
+					# array of 2ch format with range of rates
+					{
+						out_rate [
+							8000
+							16000
+						]
+						out_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						out_bit_depth		[ 16 ]
+						out_valid_bit_depth	[ 16 ]
+						out_channels		[ 2 ]
+					}
+				]
+				CombineArrays.Object.Base.input_audio_format [
+					# array of 2ch format with range of rates
+					{
+						in_rate [
+							8000
+							16000
+						]
+						in_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						in_bit_depth		[ 16 ]
+						in_valid_bit_depth	[ 16 ]
+						in_channels		[ 2 ]
+					}
+				]
 			}
 		}
 	]
@@ -69,34 +73,38 @@ Object.Pipeline {
 				pcm_id $BT_PCM_ID
 				num_input_audio_formats 3
 				num_output_audio_formats 3
-				Object.Base.audio_format.0 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		2
-					out_channels		2
-				}
-				Object.Base.audio_format.2 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		8000
-					out_rate		8000
-				}
-				Object.Base.audio_format.3 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		16000
-					out_rate		16000
-				}
+				CombineArrays.Object.Base.output_audio_format [
+					# array of 2ch format with range of rates
+					{
+						out_rate [
+							8000
+							16000
+						]
+						out_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						out_bit_depth		[ 16 ]
+						out_valid_bit_depth	[ 16 ]
+						out_channels		[ 2 ]
+					}
+				]
+				CombineArrays.Object.Base.input_audio_format [
+					# array of 2ch format with range of rates
+					{
+						in_rate [
+							8000
+							16000
+						]
+						in_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						in_bit_depth		[ 16 ]
+						in_valid_bit_depth	[ 16 ]
+						in_channels		[ 2 ]
+					}
+				]
 			}
 		}
 	]
@@ -113,34 +121,38 @@ Object.Pipeline {
 				pcm_id	$BT_PCM_ID
 				num_input_audio_formats 3
 				num_output_audio_formats 3
-				Object.Base.audio_format.0 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		2
-					out_channels		2
-				}
-				Object.Base.audio_format.2 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		8000
-					out_rate		8000
-				}
-				Object.Base.audio_format.3 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		16000
-					out_rate		16000
-				}
+				CombineArrays.Object.Base.output_audio_format [
+					# array of 2ch format with range of rates
+					{
+						out_rate [
+							8000
+							16000
+						]
+						out_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						out_bit_depth		[ 16 ]
+						out_valid_bit_depth	[ 16 ]
+						out_channels		[ 2 ]
+					}
+				]
+				CombineArrays.Object.Base.input_audio_format [
+					# array of 2ch format with range of rates
+					{
+						in_rate [
+							8000
+							16000
+						]
+						in_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						in_bit_depth		[ 16 ]
+						in_valid_bit_depth	[ 16 ]
+						in_channels		[ 2 ]
+					}
+				]
 			}
 		}
 	]
@@ -160,36 +172,40 @@ Object.Pipeline {
 				copier_type	"SSP"
 				stream_name	$BT_NAME
 				node_type	$I2S_LINK_INPUT_CLASS
-				num_input_audio_formats 4
-				num_output_audio_formats 4
-				Object.Base.audio_format.0 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		2
-					out_channels		2
-				}
-				Object.Base.audio_format.1 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		8000
-					out_rate		8000
-				}
-				Object.Base.audio_format.2 {
-					in_bit_depth		16
-					in_valid_bit_depth	16
-					out_bit_depth		16
-					out_valid_bit_depth	16
-					in_channels		1
-					out_channels		1
-					in_rate		16000
-					out_rate		16000
-				}
+				num_input_audio_formats 3
+				num_output_audio_formats 3
+				CombineArrays.Object.Base.output_audio_format [
+					# array of 2ch format with range of rates
+					{
+						out_rate [
+							8000
+							16000
+						]
+						out_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						out_bit_depth		[ 16 ]
+						out_valid_bit_depth	[ 16 ]
+						out_channels		[ 2 ]
+					}
+				]
+				CombineArrays.Object.Base.input_audio_format [
+					# array of 2ch format with range of rates
+					{
+						in_rate [
+							8000
+							16000
+						]
+						in_channels [ 1 ]
+					}
+					# 2ch 16-bit 48k
+					{
+						in_bit_depth		[ 16 ]
+						in_valid_bit_depth	[ 16 ]
+						in_channels		[ 2 ]
+					}
+				]
 			}
 		}
 	]
diff --git a/tools/topology/topology2/platform/intel/dmic-wov.conf b/tools/topology/topology2/platform/intel/dmic-wov.conf
index 6dc4a2619b8b..0094941e0c74 100644
--- a/tools/topology/topology2/platform/intel/dmic-wov.conf
+++ b/tools/topology/topology2/platform/intel/dmic-wov.conf
@@ -10,28 +10,22 @@ Object.Pipeline {
 			Object.Widget.host-copier.1 {
 				stream_name $DMIC1_PCM_CAPS
 				pcm_id 11
-				Object.Base.audio_format.1 {
-					in_rate			16000
-					in_bit_depth		32
-					in_valid_bit_depth	32
-					out_rate		16000
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
-				Object.Base.audio_format.2 {
-					in_rate			16000
-					in_channels		4
-					in_bit_depth		32
-					in_valid_bit_depth	32
-					out_rate		16000
-					out_channels		4
-					out_bit_depth		32
-					out_valid_bit_depth	32
-					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-					in_ch_map	$CHANNEL_MAP_3_POINT_1
-					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-					out_ch_map	$CHANNEL_MAP_3_POINT_1
-				}
+				num_output_audio_formats 2
+				Object.Base.output_audio_format [
+					{
+						out_rate		16000
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+					{
+						out_rate		16000
+						out_channels		4
+						out_bit_depth		32
+						out_valid_bit_depth	32
+						out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+						out_ch_map	$CHANNEL_MAP_3_POINT_1
+					}
+				]
 			}
 		}
 	]
@@ -55,28 +49,37 @@ Object.Pipeline {
 				node_type $DMIC_LINK_INPUT_CLASS
 				num_input_audio_formats 2
 				num_output_audio_formats 2
-				Object.Base.audio_format.1 {
-					in_rate			16000
-					in_bit_depth		32
-					in_valid_bit_depth	32
-					out_rate		16000
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
-				Object.Base.audio_format.2 {
-					in_rate			16000
-					in_channels		4
-					in_bit_depth		32
-					in_valid_bit_depth	32
-					out_rate		16000
-					out_channels		4
-					out_bit_depth		32
-					out_valid_bit_depth	32
-					in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-					in_ch_map	$CHANNEL_MAP_3_POINT_1
-					out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
-					out_ch_map	$CHANNEL_MAP_3_POINT_1
-				}
+				Object.Base.input_audio_format [
+					{
+						in_rate			16000
+						in_bit_depth		32
+						in_valid_bit_depth	32
+					}
+					{
+						in_rate			16000
+						in_channels		4
+						in_bit_depth		32
+						in_valid_bit_depth	32
+						in_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+						in_ch_map	$CHANNEL_MAP_3_POINT_1
+					}
+				]
+
+				Object.Base.output_audio_format [
+					{
+						out_rate		16000
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+					{
+						out_rate		16000
+						out_channels		4
+						out_bit_depth		32
+						out_valid_bit_depth	32
+						out_ch_cfg	$CHANNEL_CONFIG_3_POINT_1
+						out_ch_map	$CHANNEL_MAP_3_POINT_1
+					}
+				]
 			}
 
 			Object.Widget.kpb.1 {