diff --git a/SM8550-QRD.m4 b/SM8550-QRD.m4
index 4c91869..a082a7d 100644
--- a/SM8550-QRD.m4
+++ b/SM8550-QRD.m4
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright, Linaro Ltd, 2023
 include(`audioreach/audioreach.m4')
 include(`audioreach/stream-subgraph.m4')
 include(`audioreach/device-subgraph.m4')
diff --git a/audioreach/subgraph-stream-playback.m4 b/audioreach/subgraph-stream-playback.m4
index fee3561..8538b53 100644
--- a/audioreach/subgraph-stream-playback.m4
+++ b/audioreach/subgraph-stream-playback.m4
@@ -59,7 +59,7 @@ AR_PCM_PLAYBACK(PCM_DAI_ID, PCM_FORMAT, PCM_MIN_RATE, PCM_MAX_RATE, PCM_MIN_CHAN
 
 AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CONT_SENARIO_ID)
 
-AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
+AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
 AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID,PCMDEC_MODULE_IID)
 AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED, PCMCNV_MODULE_IID)
diff --git a/audioreach/subgraph-stream-vol-playback.m4 b/audioreach/subgraph-stream-vol-playback.m4
index 16e896a..fdc8f3a 100644
--- a/audioreach/subgraph-stream-vol-playback.m4
+++ b/audioreach/subgraph-stream-vol-playback.m4
@@ -65,7 +65,7 @@ AR_PCM_PLAYBACK(PCM_DAI_ID, PCM_FORMAT, PCM_MIN_RATE, PCM_MAX_RATE, PCM_MIN_CHAN
 
 AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CONT_SENARIO_ID)
 
-AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  CONT_CAP, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
+AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
 AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 1, 2, PCM_DAI_ID, PCMDEC_MODULE_IID)
 AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID)