diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index fea906f98741..52d603c0eb3c 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -698,9 +698,9 @@ IncludeByKey.PASSTHROUGH {
 					IncludeByKey.SRC_DOMAIN {
 						"DP" {
 						core_id $DP_SRC_CORE_ID
-						domain_id 123
-						stack_bytes_requirement 4096
-						heap_bytes_requirement 8192
+						domain_id 0
+						stack_bytes_requirement		2048
+						heap_bytes_requirement	"$[(24 * 1024)]"
 						}
 					}
 				}
@@ -1382,9 +1382,9 @@ IncludeByKey.PASSTHROUGH {
 					IncludeByKey.SRC_DOMAIN {
 						"DP" {
 						core_id $DP_SRC_CORE_ID
-						domain_id 123
-						stack_bytes_requirement 4096
-						heap_bytes_requirement 8192
+						domain_id 0
+						stack_bytes_requirement		2048
+						heap_bytes_requirement	"$[(24 * 1024)]"
 						}
 					}
 
diff --git a/tools/topology/topology2/include/common/tokens.conf b/tools/topology/topology2/include/common/tokens.conf
index 48b498280130..d03092360591 100644
--- a/tools/topology/topology2/include/common/tokens.conf
+++ b/tools/topology/topology2/include/common/tokens.conf
@@ -28,9 +28,7 @@ Object.Base.VendorToken {
 		scheduler_domain	418
 		domain_id		419
 		stack_bytes_requirement	420
-		interim_heap_bytes_requirement	421
-		lifetime_heap_bytes_requirement 422
-		shared_bytes_requirement 423
+		heap_bytes_requirement	421
 	}
 
 	"2" {
diff --git a/tools/topology/topology2/include/components/widget-common.conf b/tools/topology/topology2/include/components/widget-common.conf
index 43ac5691c778..14ccd8fcf86a 100644
--- a/tools/topology/topology2/include/components/widget-common.conf
+++ b/tools/topology/topology2/include/components/widget-common.conf
@@ -149,33 +149,12 @@ DefineAttribute."stack_bytes_requirement" {
 	token_ref	"comp.word"
 }
 
-## Interim Heap size requirement in bytes for this component.
-## Used for resources that may change in size or be freed during the lifetime of the component.
-## In practice this means anything allocated outside module's init() call-back.
-DefineAttribute."interim_heap_bytes_requirement" {
-	# Token set reference name and type
-	token_ref	"comp.word"
-}
-
-## Lifetime heap memory allocation requirement in bytes for this component.
-## This token's value indicates the amount of allocated memory needed at component init phase
-## and used over the lifetime of the component until the component is destroyed.
-## In practice this means anything allocated in init() call-back.
-DefineAttribute."lifetime_heap_bytes_requirement" {
-	# Token set reference name and type
-	token_ref	"comp.word"
-}
-
-## Shared memory allocation requirement in bytes for this component.
-## This token's value indicates the amount of shared memory the component may need to allocated.
-## Shared memory may be shared to other components.
-DefineAttribute."shared_bytes_requirement" {
+## Heap size requirement in bytes for this component.
+DefineAttribute."heap_bytes_requirement" {
 	# Token set reference name and type
 	token_ref	"comp.word"
 }
 
 # These default values are here until we have measured module specific numbers
 stack_bytes_requirement		8192
-interim_heap_bytes_requirement	4096
-lifetime_heap_bytes_requirement	16384
-shared_bytes_requirement	4096
\ No newline at end of file
+heap_bytes_requirement		24576