diff --git a/tools/topology/topology2/include/components/google-rtc-aec.conf b/tools/topology/topology2/include/components/google-rtc-aec.conf
index e2df7a9db..2d6ed613b 100644
--- a/tools/topology/topology2/include/components/google-rtc-aec.conf
+++ b/tools/topology/topology2/include/components/google-rtc-aec.conf
@@ -87,35 +87,47 @@ Class.Widget."google-rtc-aec" {
 		unique	"instance"
 	}
 
-	num_audio_formats 2
-	num_input_audio_formats 2
-	num_output_audio_formats 1
+	num_input_audio_formats 3
+	num_output_audio_formats 2
 	# pin0 is the data captured by DMIC and pin1 is the ref data from playback stream
-	Object.Base.input_audio_format {
-		1 {
+	Object.Base.input_audio_format [
+		# 2ch 16-bit on Pin 0
+		{
 			input_pin_index		0
 			in_bit_depth            16
 			in_valid_bit_depth      16
-			out_bit_depth           16
-			out_valid_bit_depth     16
 		}
-		2 {
+		# 4ch 16-bit on Pin 0
+		{
+			input_pin_index		0
+			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
+		}
+		# 2ch 16-bit on Pin 1
+		{
 			input_pin_index		1
 			in_bit_depth            16
 			in_valid_bit_depth      16
-			out_bit_depth           16
-			out_valid_bit_depth     16
 		}
-	}
+	]
 
-	Object.Base.output_audio_format {
-		1 {
-			in_bit_depth            16
-			in_valid_bit_depth      16
+	Object.Base.output_audio_format [
+		{
 			out_bit_depth           16
 			out_valid_bit_depth     16
 		}
-	}
+		# 4ch 16-bit
+		{
+			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
+		}
+	]
 
 	# Default attribute values for google-rtc-aec widget
 	# UUID: B780A0A6-269F-466F-B477-23DFA05AF758
diff --git a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf
index 69729fa0c..4680f8efd 100644
--- a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf
+++ b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf
@@ -53,15 +53,38 @@ Class.Pipeline."google-rtc-aec-capture" {
 			period_sink_count 1
 			period_source_count 1
 			num_audio_formats 1
-			num_input_audio_formats 1
-			num_output_audio_formats 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           16
-				out_valid_bit_depth     16
-			}
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth            32
+					in_valid_bit_depth      32
+				}
+				# 4ch 32-bit on Pin 0
+				{
+					input_pin_index		0
+					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
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth           16
+					out_valid_bit_depth     16
+				}
+				{
+					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
+				}
+
+			]
                 }
 
 		google-rtc-aec."1" {
@@ -87,16 +110,37 @@ Class.Pipeline."google-rtc-aec-capture" {
 		module-copier."2" {
 			period_sink_count 1
 			period_source_count 1
-			num_audio_formats 1
-			num_input_audio_formats 1
-			num_output_audio_formats 1
+			num_input_audio_formats 2
+			num_output_audio_formats 2
 
-			Object.Base.audio_format.1 {
-				in_bit_depth            16
-				in_valid_bit_depth      16
-				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            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
+				}
+			]
+			Object.Base.output_audio_format [
+				# 2ch 32-bit
+				{
+					out_bit_depth           32
+					out_valid_bit_depth     32
+				}
+				# 4ch 32-bit
+				{
+					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
+				}
+			]
                 }
 	}
 
diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
index 6a0d7ff4d..7119dd156 100644
--- a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
+++ b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -23,8 +23,8 @@ Object.Pipeline {
 				num_output_audio_formats 1
 				Object.Base.output_audio_format [
 					{
-						out_bit_depth		32
-						out_valid_bit_depth	32
+						out_bit_depth		16
+						out_valid_bit_depth	16
 					}
 				]
 			}