diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
index 5341d14e4ddd..6c33d91626cd 100644
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -52,6 +52,7 @@ CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
 CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_LIBRARY_BUILD_LIB=y
 
 # SOF / logging
 CONFIG_SOF_LOG_LEVEL_INF=y
diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf
index d7c1979b63a4..62106d05e02e 100644
--- a/app/boards/intel_adsp_ace30_ptl.conf
+++ b/app/boards/intel_adsp_ace30_ptl.conf
@@ -36,6 +36,9 @@ CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 # SOF / loadable modules
 CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_LIBRARY_BUILD_LIB=y
+CONFIG_LIBRARY_DEFAULT_MODULAR=n
 
 # SOF / logging
 CONFIG_SOF_LOG_LEVEL_INF=y
@@ -44,6 +47,9 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_COUNTER=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_L3_HEAP=y
+CONFIG_LLEXT=y
+CONFIG_LLEXT_STORAGE_WRITABLE=y
+CONFIG_MODULES=y
 
 # Zephyr / device drivers
 CONFIG_CLOCK_CONTROL=y
diff --git a/scripts/llext_offset_calc.py b/scripts/llext_offset_calc.py
index cef0662449bf..0f302a8cbe12 100755
--- a/scripts/llext_offset_calc.py
+++ b/scripts/llext_offset_calc.py
@@ -6,6 +6,8 @@
 import argparse
 import pathlib
 import os
+from elftools.elf.elffile import ELFFile
+from elftools.elf.constants import SH_FLAGS
 
 args = None
 
@@ -21,6 +23,34 @@ def parse_args():
 
 	args = parser.parse_args()
 
+def get_elf_size(elf_name):
+	start = 0xffffffff
+	# SOF_MODULE_DRAM_LINK_END
+	min_start = 0x08000000
+	end = 0
+	with open(elf_name, 'rb') as f_elf:
+		elf = ELFFile(f_elf)
+
+		for section in elf.iter_sections():
+			s_flags = section.header['sh_flags']
+
+			if not s_flags & SH_FLAGS.SHF_ALLOC:
+				continue
+
+			# Ignore detached sections, to be used in DRAM, their addresses
+			# are below min_start
+			if section.header['sh_addr'] < min_start:
+				continue
+
+			if section.header['sh_addr'] < start:
+				start = section.header['sh_addr']
+			if section.header['sh_addr'] + section.header['sh_size'] > end:
+				end = section.header['sh_addr'] + section.header['sh_size']
+
+		size = end - start
+
+	return size
+
 def main():
 	global args
 
@@ -34,13 +64,12 @@ def main():
 	except OSError:
 		size = 0
 
-	# Failure will raise an exception
-	f_size = open(f_output, "w")
-
+	size += get_elf_size(args.input) + 0xfff
 	# align to a page border
-	size += os.path.getsize(args.input) + 0xfff
 	size &= ~0xfff
 
+	# Failure will raise an exception
+	f_size = open(f_output, "w")
 	f_size.write(f'0x{size:x}\n')
 
 if __name__ == "__main__":
diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 5ce0c633ae7c..a31a93c96d7e 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -926,19 +926,26 @@ def build_platforms():
 			symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
 
 
-def install_lib(sof_lib_dir, abs_build_dir, platform_wconfig):
+def install_lib(platform, sof_output_dir, abs_build_dir, platform_wconfig):
 	"""[summary] Sign loadable llext modules, if any, copy them to the
 	deployment tree and create UUID links for the kernel to find and load
 	them."""
 
 	global signing_key
 
-	with os.scandir(str(abs_build_dir)) as iter:
-		if args.key_type_subdir != "none":
-			sof_lib_dir = sof_lib_dir / args.key_type_subdir
+	libs = dict()
+	lib_uuids = dict()
+	rimage_cmd = shlex.split(platform_wconfig.get('rimage.path'))[0]
+	_ws_args = platform_wconfig.get("rimage.extra-args")
+
+	sof_lib_dir = sof_output_dir / '..' / 'sof-ipc4-lib' / platform
 
-		sof_lib_dir.mkdir(parents=True, exist_ok=True)
+	if args.key_type_subdir != "none":
+		sof_lib_dir = sof_lib_dir / args.key_type_subdir
+
+	sof_lib_dir.mkdir(parents=True, exist_ok=True)
 
+	with os.scandir(str(abs_build_dir)) as iter:
 		for entry in iter:
 			if (not entry.is_dir or
 			    not entry.name.endswith('_llext')):
@@ -955,45 +962,87 @@ def install_lib(sof_lib_dir, abs_build_dir, platform_wconfig):
 			# eq_iir_llext/eq_iir.llext
 			llext_base = entry.name[:-6]
 			llext_file = llext_base + '.llext'
-
-			dst = sof_lib_dir / llext_file
-
-			rimage_cfg = entry_path / 'rimage_config.toml'
-			llext_input = entry_path / (llext_base + '.llext')
-			llext_output = entry_path / (llext_file + '.ri')
-
-			# See why the shlex() parsing step is required at
-			# https://docs.zephyrproject.org/latest/develop/west/sign.html#rimage
-			# and in Zephyr commit 030b740bd1ec
-			rimage_cmd = shlex.split(platform_wconfig.get('rimage.path'))[0]
-			sign_cmd = [rimage_cmd, "-o", str(llext_output),
-				    "-e", "-c", str(rimage_cfg),
-				    "-k", str(signing_key), "-l", "-r"]
-			_ws_args = platform_wconfig.get("rimage.extra-args")
-			if _ws_args is not None:
-				sign_cmd.extend(shlex.split(_ws_args))
-			sign_cmd.append(str(llext_input))
-			execute_command(sign_cmd, cwd=west_top)
-
-			# An intuitive way to make this multiline would be
-			# with (open(dst, 'wb') as fdst, open(llext_output, 'rb') as fllext,
-			#	open(llext_output.with_suffix('.llext.xman'), 'rb') as fman):
-			# but a Python version, used on Windows errored out on this.
-			# Thus we're left with a choice between a 150-character
-			# long line and an illogical split like this
-			with open(dst, 'wb') as fdst, open(llext_output, 'rb') as fllext, open(
-				  llext_output.with_suffix('.ri.xman'), 'rb') as fman:
-				# Concatenate the manifest and the llext
-				shutil.copyfileobj(fman, fdst)
-				shutil.copyfileobj(fllext, fdst)
+			lib_name = ''
+
+			lib_fname = entry_path / 'lib_name.txt'
+			if os.path.exists(lib_fname):
+				with open(lib_fname, 'r') as libs_f:
+					lib_name = libs_f.read()
+					if lib_name not in libs.keys():
+						libs[lib_name] = []
+					libs[lib_name].append(str(entry_path / llext_file))
+			else:
+				dst = sof_lib_dir / llext_file
+
+				rimage_cfg = entry_path / 'rimage_config.toml'
+				llext_input = entry_path / (llext_base + '.llext')
+				llext_output = entry_path / (llext_file + '.ri')
+
+				# See why the shlex() parsing step is required at
+				# https://docs.zephyrproject.org/latest/develop/west/sign.html#rimage
+				# and in Zephyr commit 030b740bd1ec
+				sign_cmd = [rimage_cmd, "-o", str(llext_output),
+					    "-e", "-c", str(rimage_cfg),
+					    "-k", str(signing_key), "-l", "-r"]
+				if _ws_args is not None:
+					sign_cmd.extend(shlex.split(_ws_args))
+				sign_cmd.append(str(llext_input))
+				execute_command(sign_cmd, cwd=west_top)
+
+				# An intuitive way to make this multiline would be
+				# with (open(dst, 'wb') as fdst, open(llext_output, 'rb') as fllext,
+				#	open(llext_output.with_suffix('.llext.xman'), 'rb') as fman):
+				# but a Python version, used on Windows errored out on this.
+				# Thus we're left with a choice between a 150-character
+				# long line and an illogical split like this
+				with open(dst, 'wb') as fdst, open(llext_output, 'rb') as fllext, open(
+					  llext_output.with_suffix('.ri.xman'), 'rb') as fman:
+					# Concatenate the manifest and the llext
+					shutil.copyfileobj(fman, fdst)
+					shutil.copyfileobj(fllext, fdst)
 
 			# Create symbolic links for all UUIDs
 			with open(uuids, 'r') as uuids_f:
 				for uuid in uuids_f:
-					linkname = uuid.strip() + '.bin'
-					symlink_or_copy(sof_lib_dir, llext_file,
-							sof_lib_dir, linkname)
+					if os.path.exists(lib_fname):
+						if lib_name not in lib_uuids.keys():
+							lib_uuids[lib_name] = []
+						lib_uuids[lib_name].append(uuid.strip())
+					else:
+						linkname = uuid.strip() + '.bin'
+						symlink_or_copy(sof_lib_dir, llext_file,
+								sof_lib_dir, linkname)
+
+	lib_install_dir = sof_output_dir / platform
+	if args.key_type_subdir != "none":
+		lib_install_dir = lib_install_dir / args.key_type_subdir
+
+	for key in libs.keys():
+		lib_path = abs_build_dir / ''.join(['lib', key, '.ri'])
+		sign_cmd = [rimage_cmd, "-o", str(lib_path), "-e",
+			    "-c", str(abs_build_dir / 'misc' / 'generated' / 'rimage_config_full.toml'),
+			    "-k", str(signing_key), "-l", "-r"]
+		if _ws_args is not None:
+			sign_cmd.extend(shlex.split(_ws_args))
+		sign_cmd.extend(libs[key])
+		execute_command(sign_cmd, cwd=west_top)
+		lib_name = ''.join(['sof-', platform, '-', key, '.ri'])
+		dst = lib_install_dir / lib_name
+		with open(dst, 'wb') as fdst, open(lib_path, 'rb') as fllext, open(
+			  lib_path.with_suffix('.ri.xman'), 'rb') as fman:
+			# Concatenate the manifest and the llext
+			shutil.copyfileobj(fman, fdst)
+			shutil.copyfileobj(fllext, fdst)
+
+			for p_alias in platform_configs[platform].aliases:
+				lib_dir = sof_output_dir / p_alias
 
+				if args.key_type_subdir != "none":
+					lib_dir = lib_dir / args.key_type_subdir
+				lib_dir.mkdir(parents=True, exist_ok=True)
+				alias_libname = ''.join(['sof-', p_alias, '-', key, '.ri'])
+				symlink_or_copy(lib_install_dir, lib_name,
+						lib_dir, alias_libname)
 
 def install_platform(platform, sof_output_dir, platf_build_environ, platform_wconfig):
 
@@ -1042,8 +1091,7 @@ def install_platform(platform, sof_output_dir, platf_build_environ, platform_wco
 				symlink_or_copy(install_key_dir, output_fwname, install_key_dir, f"sof-{p_alias}.ri")
 
 	if args.deployable_build and platform_configs[platform].ipc4:
-		install_lib(sof_output_dir / '..' / 'sof-ipc4-lib' / platform, abs_build_dir,
-			    platform_wconfig)
+		install_lib(platform, sof_output_dir, abs_build_dir, platform_wconfig)
 
 
 	# sof-info/ directory
diff --git a/src/audio/aria/llext/CMakeLists.txt b/src/audio/aria/llext/CMakeLists.txt
index 080581dbcdb6..d6a6e0411fc1 100644
--- a/src/audio/aria/llext/CMakeLists.txt
+++ b/src/audio/aria/llext/CMakeLists.txt
@@ -6,4 +6,5 @@ sof_llext_build("aria"
 		../aria_hifi5.c
 		../aria_hifi3.c
 		../aria_generic.c
+	LIB openmodules
 )
diff --git a/src/audio/asrc/llext/CMakeLists.txt b/src/audio/asrc/llext/CMakeLists.txt
index 93f26a228913..8ef1d2e26fa6 100644
--- a/src/audio/asrc/llext/CMakeLists.txt
+++ b/src/audio/asrc/llext/CMakeLists.txt
@@ -7,4 +7,5 @@ sof_llext_build("asrc"
 		../asrc_farrow.c
 		../asrc_farrow_generic.c
 		../asrc_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/codec/dts/llext/CMakeLists.txt b/src/audio/codec/dts/llext/CMakeLists.txt
index f73dc4d3123b..23ace9bd95ac 100644
--- a/src/audio/codec/dts/llext/CMakeLists.txt
+++ b/src/audio/codec/dts/llext/CMakeLists.txt
@@ -5,6 +5,7 @@ if(CONFIG_DTS_CODEC_STUB)
 sof_llext_build("dts"
 	SOURCES ../dts.c
 		../dts_stub.c
+	LIB openmodules
 )
 target_include_directories(dts_llext_lib PRIVATE
 	"../../../../../third_party/include"
diff --git a/src/audio/crossover/llext/CMakeLists.txt b/src/audio/crossover/llext/CMakeLists.txt
index 0adb2631e60f..b4b6e9def9b1 100644
--- a/src/audio/crossover/llext/CMakeLists.txt
+++ b/src/audio/crossover/llext/CMakeLists.txt
@@ -5,4 +5,5 @@ sof_llext_build("crossover"
 	SOURCES ../crossover.c
 		../crossover_generic.c
 		../crossover_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/dcblock/llext/CMakeLists.txt b/src/audio/dcblock/llext/CMakeLists.txt
index 9aa677d05be4..63a95013ab5f 100644
--- a/src/audio/dcblock/llext/CMakeLists.txt
+++ b/src/audio/dcblock/llext/CMakeLists.txt
@@ -7,4 +7,5 @@ sof_llext_build("dcblock"
 		../dcblock_hifi3.c
 		../dcblock_hifi4.c
 		../dcblock_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/drc/llext/CMakeLists.txt b/src/audio/drc/llext/CMakeLists.txt
index e658c3acfe0b..d12e94790597 100644
--- a/src/audio/drc/llext/CMakeLists.txt
+++ b/src/audio/drc/llext/CMakeLists.txt
@@ -8,4 +8,5 @@ sof_llext_build("drc"
 		../drc_hifi3.c
 		../drc_hifi4.c
 		../drc_math_hifi3.c
+	LIB openmodules
 )
diff --git a/src/audio/eq_fir/llext/CMakeLists.txt b/src/audio/eq_fir/llext/CMakeLists.txt
index 9b4f47308c49..df4b3a16c89e 100644
--- a/src/audio/eq_fir/llext/CMakeLists.txt
+++ b/src/audio/eq_fir/llext/CMakeLists.txt
@@ -3,8 +3,9 @@
 
 sof_llext_build("eq_fir"
 	SOURCES ../eq_fir_hifi3.c
-	../eq_fir_hifi2ep.c
-	../eq_fir_generic.c
-	../eq_fir.c
-	../eq_fir_ipc4.c
+		../eq_fir_hifi2ep.c
+		../eq_fir_generic.c
+		../eq_fir.c
+		../eq_fir_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/eq_iir/llext/CMakeLists.txt b/src/audio/eq_iir/llext/CMakeLists.txt
index 535455105515..9b5d956e82b0 100644
--- a/src/audio/eq_iir/llext/CMakeLists.txt
+++ b/src/audio/eq_iir/llext/CMakeLists.txt
@@ -5,4 +5,5 @@ sof_llext_build("eq_iir"
 	SOURCES ../eq_iir.c
 		../eq_iir_ipc4.c
 		../eq_iir_generic.c
+	LIB openmodules
 )
diff --git a/src/audio/google/llext_ctc/CMakeLists.txt b/src/audio/google/llext_ctc/CMakeLists.txt
index 440e0fbe6ad2..c04c9765bf1d 100644
--- a/src/audio/google/llext_ctc/CMakeLists.txt
+++ b/src/audio/google/llext_ctc/CMakeLists.txt
@@ -6,6 +6,7 @@ sof_llext_build("google_ctc_audio_processing"
 	SOURCES ../google_ctc_audio_processing.c
 		../google_ctc_audio_processing_ipc4.c
 		../google_ctc_audio_processing_mock.c
+	LIB openmodules
 )
 target_include_directories(google_ctc_audio_processing_llext_lib PRIVATE
 	"${sof_top_dir}/third_party/include"
diff --git a/src/audio/google/llext_rtc/CMakeLists.txt b/src/audio/google/llext_rtc/CMakeLists.txt
index 0847fbc8bc57..7cf47276d62e 100644
--- a/src/audio/google/llext_rtc/CMakeLists.txt
+++ b/src/audio/google/llext_rtc/CMakeLists.txt
@@ -2,6 +2,7 @@ if(CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK)
 sof_llext_build("google_rtc_audio_processing"
 	SOURCES ../google_rtc_audio_processing.c
 		../google_rtc_audio_processing_mock.c
+	LIB openmodules
 )
 target_include_directories(google_rtc_audio_processing_llext_lib PRIVATE
 	"${sof_top_dir}/third_party/include"
diff --git a/src/audio/igo_nr/llext/CMakeLists.txt b/src/audio/igo_nr/llext/CMakeLists.txt
index 2e974cae7945..3f336184fb7c 100644
--- a/src/audio/igo_nr/llext/CMakeLists.txt
+++ b/src/audio/igo_nr/llext/CMakeLists.txt
@@ -5,6 +5,7 @@ if(CONFIG_DTS_CODEC_STUB)
 sof_llext_build("igo_nr"
 	SOURCES ../igo_nr.c
 		../igo_nr_stub.c
+	LIB openmodules
 )
 target_include_directories(igo_nr_llext_lib PRIVATE
 	"../../../../third_party/include"
diff --git a/src/audio/mfcc/llext/CMakeLists.txt b/src/audio/mfcc/llext/CMakeLists.txt
index a3184ecbc150..688342751d75 100644
--- a/src/audio/mfcc/llext/CMakeLists.txt
+++ b/src/audio/mfcc/llext/CMakeLists.txt
@@ -8,4 +8,5 @@ sof_llext_build("mfcc"
 		../mfcc_generic.c
 		../mfcc_hifi3.c
 		../mfcc_hifi4.c
+	LIB openmodules
 )
diff --git a/src/audio/mixin_mixout/llext/CMakeLists.txt b/src/audio/mixin_mixout/llext/CMakeLists.txt
index fc5278dc47b0..300130fbe82e 100644
--- a/src/audio/mixin_mixout/llext/CMakeLists.txt
+++ b/src/audio/mixin_mixout/llext/CMakeLists.txt
@@ -6,4 +6,5 @@ sof_llext_build("mixin_mixout"
 		../mixin_mixout_hifi3.c
 		../mixin_mixout_hifi5.c
 		../mixin_mixout_generic.c
+	LIB openmodules
 )
diff --git a/src/audio/multiband_drc/llext/CMakeLists.txt b/src/audio/multiband_drc/llext/CMakeLists.txt
index 73c0c4136c30..dbafe5164220 100644
--- a/src/audio/multiband_drc/llext/CMakeLists.txt
+++ b/src/audio/multiband_drc/llext/CMakeLists.txt
@@ -5,4 +5,5 @@ sof_llext_build("multiband_drc"
 	SOURCES ../multiband_drc.c
 		../multiband_drc_generic.c
 		../multiband_drc_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/mux/llext/CMakeLists.txt b/src/audio/mux/llext/CMakeLists.txt
index c17801d9af67..d23b29f5588d 100644
--- a/src/audio/mux/llext/CMakeLists.txt
+++ b/src/audio/mux/llext/CMakeLists.txt
@@ -5,4 +5,5 @@ sof_llext_build("mux"
 	SOURCES ../mux.c
 		../mux_generic.c
 		../mux_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/rtnr/llext/CMakeLists.txt b/src/audio/rtnr/llext/CMakeLists.txt
index 3d028ace0adf..1abba6c3befc 100644
--- a/src/audio/rtnr/llext/CMakeLists.txt
+++ b/src/audio/rtnr/llext/CMakeLists.txt
@@ -5,6 +5,7 @@ if(CONFIG_COMP_RTNR_STUB)
 sof_llext_build("rtnr"
 	SOURCES ../rtnr.c
 		../rtnr_stub.c
+	LIB openmodules
 )
 else()
 message(FATAL_ERROR "Add library linking support in src/audio/rtnr/llext/CMakeFiles.txt")
diff --git a/src/audio/selector/llext/CMakeLists.txt b/src/audio/selector/llext/CMakeLists.txt
index e8c3fbc911a4..460b547e64c6 100644
--- a/src/audio/selector/llext/CMakeLists.txt
+++ b/src/audio/selector/llext/CMakeLists.txt
@@ -4,4 +4,5 @@
 sof_llext_build("selector"
 	SOURCES ../selector.c
 		../selector_generic.c
+	LIB openmodules
 )
diff --git a/src/audio/src/llext/CMakeLists.txt b/src/audio/src/llext/CMakeLists.txt
index 84a0bc4465df..dfb9782ee941 100644
--- a/src/audio/src/llext/CMakeLists.txt
+++ b/src/audio/src/llext/CMakeLists.txt
@@ -11,6 +11,7 @@ sof_llext_build("src"
 		../src_common.c
 		../src_ipc4.c
 		../src_lite.c
+	LIB openmodules
 )
 else()
 sof_llext_build("src"
@@ -21,5 +22,6 @@ sof_llext_build("src"
 		../src.c
 		../src_common.c
 		../src_ipc4.c
+	LIB openmodules
 )
 endif()
diff --git a/src/audio/tdfb/llext/CMakeLists.txt b/src/audio/tdfb/llext/CMakeLists.txt
index 3f9e301947dd..3a12afea12ca 100644
--- a/src/audio/tdfb/llext/CMakeLists.txt
+++ b/src/audio/tdfb/llext/CMakeLists.txt
@@ -8,4 +8,5 @@ sof_llext_build("tdfb"
 		../tdfb_hifiep.c
 		../tdfb_hifi3.c
 		../tdfb_ipc4.c
+	LIB openmodules
 )
diff --git a/src/audio/volume/llext/CMakeLists.txt b/src/audio/volume/llext/CMakeLists.txt
index 74a78873eba6..ca33117f0a67 100644
--- a/src/audio/volume/llext/CMakeLists.txt
+++ b/src/audio/volume/llext/CMakeLists.txt
@@ -10,4 +10,5 @@ sof_llext_build("volume"
 		../volume_hifi4_with_peakvol.c
 		../volume.c
 		../volume_ipc4.c
+	LIB openmodules
 )
diff --git a/src/library_manager/Kconfig b/src/library_manager/Kconfig
index 7791e8839ac2..598551a6c650 100644
--- a/src/library_manager/Kconfig
+++ b/src/library_manager/Kconfig
@@ -41,6 +41,14 @@ config LIBRARY_DEFAULT_MODULAR
 	  code has tristate Kconfig entries, they will default to "m" if this
 	  option is selected.
 
+config LIBRARY_BUILD_LIB
+	bool "Pack LLEXT modules into a library"
+	depends on LLEXT
+	help
+	  The first option to build LLEXT modules is to pack one module per
+	  file. This option enables packing of all enabled modules into a single
+	  module library.
+
 config LIBRARY_BASE_ADDRESS
 	hex "Base address for memory, dedicated to loadable modules"
 	default 0
diff --git a/src/samples/audio/smart_amp_test_llext/CMakeLists.txt b/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
index 2218f41423b5..804ab497d4e7 100644
--- a/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
+++ b/src/samples/audio/smart_amp_test_llext/CMakeLists.txt
@@ -3,4 +3,5 @@
 
 sof_llext_build("smart_amp_test"
 	SOURCES ../smart_amp_test_ipc4.c
+	LIB openmodules
 )
diff --git a/tools/rimage/config/lnl.toml.h b/tools/rimage/config/lnl.toml.h
index 247a4975f9c8..3209b93d7ac9 100644
--- a/tools/rimage/config/lnl.toml.h
+++ b/tools/rimage/config/lnl.toml.h
@@ -24,31 +24,31 @@
 
 	index = __COUNTER__
 
-#ifdef CONFIG_COMP_MIXIN_MIXOUT
+#if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
 
-#ifdef CONFIG_COMP_COPIER
+#if defined(CONFIG_COMP_COPIER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_VOLUME
+#if defined(CONFIG_COMP_VOLUME) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/volume/volume.toml>
 #endif
 
-#ifdef CONFIG_COMP_ASRC
+#if defined(CONFIG_COMP_ASRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/asrc/asrc.toml>
 #endif
 
-#ifdef CONFIG_COMP_SRC
+#if defined(CONFIG_COMP_SRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/src/src.toml>
 #endif
 
-#ifdef CONFIG_COMP_SEL
+#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/selector/selector.toml>
 #endif
 
-#ifdef CONFIG_COMP_UP_DOWN_MIXER
+#if defined(CONFIG_COMP_UP_DOWN_MIXER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/up_down_mixer/up_down_mixer.toml>
 #endif
 
@@ -56,7 +56,7 @@
 #include <probe/probe.toml>
 #endif
 
-#ifdef CONFIG_COMP_MUX
+#if defined(CONFIG_COMP_MUX) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mux/mux.toml>
 #endif
 
@@ -64,59 +64,59 @@
 #include <samples/audio/detect_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_KPB
+#if defined(CONFIG_COMP_KPB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/kpb.toml>
 #endif
 
-#ifdef CONFIG_SAMPLE_SMART_AMP
+#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <samples/audio/smart_amp_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_IIR
+#if defined(CONFIG_COMP_IIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_iir/eq_iir.toml>
 #endif
 
-#ifdef CONFIG_COMP_FIR
+#if defined(CONFIG_COMP_FIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_fir/eq_fir.toml>
 #endif
 
-#ifdef CONFIG_COMP_ARIA
+#if defined(CONFIG_COMP_ARIA) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/aria/aria.toml>
 #endif
 
-#ifdef CONFIG_COMP_DRC
+#if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/drc/drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_CROSSOVER
+#if defined(CONFIG_COMP_CROSSOVER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/crossover/crossover.toml>
 #endif
 
-#ifdef CONFIG_COMP_MULTIBAND_DRC
+#if defined(CONFIG_COMP_MULTIBAND_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/multiband_drc/multiband_drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_DCBLOCK
+#if defined(CONFIG_COMP_DCBLOCK) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/dcblock/dcblock.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/google/google_rtc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_TDFB
+#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/tdfb/tdfb.toml>
 #endif
 
-#ifdef CONFIG_COMP_RTNR
+#if defined(CONFIG_COMP_RTNR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/rtnr/rtnr.toml>
 #endif
 
-#ifdef CONFIG_COMP_IGO_NR
+#if defined(CONFIG_COMP_IGO_NR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/igo_nr/igo_nr.toml>
 #endif
 
-#ifdef CONFIG_COMP_MFCC
+#if defined(CONFIG_COMP_MFCC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mfcc/mfcc.toml>
 #endif
 
diff --git a/tools/rimage/config/mtl.toml.h b/tools/rimage/config/mtl.toml.h
index b549c76c3658..a902a351790c 100644
--- a/tools/rimage/config/mtl.toml.h
+++ b/tools/rimage/config/mtl.toml.h
@@ -24,31 +24,31 @@
 
 	index = __COUNTER__
 
-#ifdef CONFIG_COMP_MIXIN_MIXOUT
+#if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
 
-#ifdef CONFIG_COMP_COPIER
+#if defined(CONFIG_COMP_COPIER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_VOLUME
+#if defined(CONFIG_COMP_VOLUME) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/volume/volume.toml>
 #endif
 
-#ifdef CONFIG_COMP_ASRC
+#if defined(CONFIG_COMP_ASRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/asrc/asrc.toml>
 #endif
 
-#ifdef CONFIG_COMP_SRC
+#if defined(CONFIG_COMP_SRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/src/src.toml>
 #endif
 
-#ifdef CONFIG_COMP_SEL
+#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/selector/selector.toml>
 #endif
 
-#ifdef CONFIG_COMP_UP_DOWN_MIXER
+#if defined(CONFIG_COMP_UP_DOWN_MIXER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/up_down_mixer/up_down_mixer.toml>
 #endif
 
@@ -56,7 +56,7 @@
 #include <probe/probe.toml>
 #endif
 
-#ifdef CONFIG_COMP_MUX
+#if defined(CONFIG_COMP_MUX) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mux/mux.toml>
 #endif
 
@@ -64,55 +64,55 @@
 #include <samples/audio/detect_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_KPB
+#if defined(CONFIG_COMP_KPB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/kpb.toml>
 #endif
 
-#ifdef CONFIG_SAMPLE_SMART_AMP
+#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <samples/audio/smart_amp_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_IIR
+#if defined(CONFIG_COMP_IIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_iir/eq_iir.toml>
 #endif
 
-#ifdef CONFIG_COMP_FIR
+#if defined(CONFIG_COMP_FIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_fir/eq_fir.toml>
 #endif
 
-#ifdef CONFIG_COMP_ARIA
+#if defined(CONFIG_COMP_ARIA) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/aria/aria.toml>
 #endif
 
-#ifdef CONFIG_COMP_DRC
+#if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/drc/drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_CROSSOVER
+#if defined(CONFIG_COMP_CROSSOVER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/crossover/crossover.toml>
 #endif
 
-#ifdef CONFIG_COMP_MULTIBAND_DRC
+#if defined(CONFIG_COMP_MULTIBAND_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/multiband_drc/multiband_drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_DCBLOCK
+#if defined(CONFIG_COMP_DCBLOCK) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/dcblock/dcblock.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/google/google_rtc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/google/google_ctc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_TDFB
+#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/tdfb/tdfb.toml>
 #endif
 
-#ifdef CONFIG_DTS_CODEC
+#if defined(CONFIG_DTS_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/codec/dts/dts.toml>
 #endif
 
@@ -120,15 +120,15 @@
 #include <audio/module_adapter/module/cadence.toml>
 #endif
 
-#ifdef CONFIG_COMP_RTNR
+#if defined(CONFIG_COMP_RTNR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/rtnr/rtnr.toml>
 #endif
 
-#ifdef CONFIG_COMP_IGO_NR
+#if defined(CONFIG_COMP_IGO_NR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/igo_nr/igo_nr.toml>
 #endif
 
-#ifdef CONFIG_COMP_MFCC
+#if defined(CONFIG_COMP_MFCC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mfcc/mfcc.toml>
 #endif
 
diff --git a/tools/rimage/config/ptl.toml.h b/tools/rimage/config/ptl.toml.h
index e83045b4ecee..c4d60f6112b2 100644
--- a/tools/rimage/config/ptl.toml.h
+++ b/tools/rimage/config/ptl.toml.h
@@ -24,31 +24,31 @@ auto_start = "0"
 
 index = __COUNTER__
 
-#ifdef CONFIG_COMP_MIXIN_MIXOUT
+#if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
 
-#ifdef CONFIG_COMP_COPIER
+#if defined(CONFIG_COMP_COPIER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_VOLUME
+#if defined(CONFIG_COMP_VOLUME) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/volume/volume.toml>
 #endif
 
-#ifdef CONFIG_COMP_ASRC
+#if defined(CONFIG_COMP_ASRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/asrc/asrc.toml>
 #endif
 
-#ifdef CONFIG_COMP_SRC
+#if defined(CONFIG_COMP_SRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/src/src.toml>
 #endif
 
-#ifdef CONFIG_COMP_SEL
+#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/selector/selector.toml>
 #endif
 
-#ifdef CONFIG_COMP_UP_DOWN_MIXER
+#if defined(CONFIG_COMP_UP_DOWN_MIXER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/up_down_mixer/up_down_mixer.toml>
 #endif
 
@@ -56,7 +56,7 @@ index = __COUNTER__
 #include <probe/probe.toml>
 #endif
 
-#ifdef CONFIG_COMP_MUX
+#if defined(CONFIG_COMP_MUX) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mux/mux.toml>
 #endif
 
@@ -64,59 +64,59 @@ index = __COUNTER__
 #include <samples/audio/detect_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_KPB
+#if defined(CONFIG_COMP_KPB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/kpb.toml>
 #endif
 
-#ifdef CONFIG_SAMPLE_SMART_AMP
+#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <samples/audio/smart_amp_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_IIR
+#if defined(CONFIG_COMP_IIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_iir/eq_iir.toml>
 #endif
 
-#ifdef CONFIG_COMP_FIR
+#if defined(CONFIG_COMP_FIR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/eq_fir/eq_fir.toml>
 #endif
 
-#ifdef CONFIG_COMP_ARIA
+#if defined(CONFIG_COMP_ARIA) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/aria/aria.toml>
 #endif
 
-#ifdef CONFIG_COMP_DRC
+#if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/drc/drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_CROSSOVER
+#if defined(CONFIG_COMP_CROSSOVER) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/crossover/crossover.toml>
 #endif
 
-#ifdef CONFIG_COMP_MULTIBAND_DRC
+#if defined(CONFIG_COMP_MULTIBAND_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/multiband_drc/multiband_drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_DCBLOCK
+#if defined(CONFIG_COMP_DCBLOCK) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/dcblock/dcblock.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/google/google_rtc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_TDFB
+#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/tdfb/tdfb.toml>
 #endif
 
-#ifdef CONFIG_COMP_RTNR
+#if defined(CONFIG_COMP_RTNR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/rtnr/rtnr.toml>
 #endif
 
-#ifdef CONFIG_COMP_IGO_NR
+#if defined(CONFIG_COMP_IGO_NR) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/igo_nr/igo_nr.toml>
 #endif
 
-#ifdef CONFIG_COMP_MFCC
+#if defined(CONFIG_COMP_MFCC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/mfcc/mfcc.toml>
 #endif
 
diff --git a/tools/rimage/src/adsp_config.c b/tools/rimage/src/adsp_config.c
index ed5162bae4d9..7dd30864ff54 100644
--- a/tools/rimage/src/adsp_config.c
+++ b/tools/rimage/src/adsp_config.c
@@ -1680,7 +1680,7 @@ static int parse_scheduling(const toml_table_t *mod_entry, struct parse_ctx *ctx
 	ext_mod_config->sched_caps.multiples_supported.ul = val;
 
 	ext_mod_config->header.num_scheduling_capabilities = 1;
-	*ext_length = sizeof(const struct mod_scheduling_caps);
+	*ext_length = sizeof(struct mod_scheduling_caps);
 
 	return 0;
 }
@@ -1707,8 +1707,9 @@ static int parse_pin(const toml_table_t *mod_entry, struct parse_ctx *ctx,
 
 	ctx->array_cnt++;
 
+	/* Pin definitions contain 6 elements */
 	ext_mod_config->header.num_pin_entries = toml_array_nelem(arr) / 6;
-	ext_mod_config->pin_desc = calloc(sizeof(const struct fw_pin_description),
+	ext_mod_config->pin_desc = calloc(sizeof(struct fw_pin_description),
 					  toml_array_nelem(arr) / 6);
 
 	if(!ext_mod_config->pin_desc)
@@ -1756,8 +1757,7 @@ static int parse_pin(const toml_table_t *mod_entry, struct parse_ctx *ctx,
 		ext_mod_config->pin_desc[j].ch_cfg.ul = (uint32_t)val;
 	}
 
-	*ext_length = ext_mod_config->header.num_pin_entries *
-			sizeof(const struct fw_pin_description);
+	*ext_length = ext_mod_config->header.num_pin_entries * sizeof(struct fw_pin_description);
 
 	return 0;
 }
@@ -1768,12 +1768,12 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 {
 	toml_array_t *arr;
 	toml_raw_t raw;
-	int *pin_data;
+	int *cfg_data;
 	int64_t val;
 	int ret;
 	int i;
 
-	/* check "pin" key */
+	/* check "mod_cfg" key */
 	arr = toml_array_in(mod_entry, "mod_cfg");
 	if (!arr) {
 		mod_man->cfg_count = 0;
@@ -1785,12 +1785,13 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 
 	ctx->array_cnt++;
 
-	pin_data = (int *)(modules->mod_cfg + modules->mod_cfg_count);
+	cfg_data = (int *)(modules->mod_cfg + modules->mod_cfg_count);
 	mod_man->cfg_offset = modules->mod_cfg_count;
-	modules->mod_cfg_count += toml_array_nelem(arr) / 11;
+	/* 11 integers per configuration entry */
 	mod_man->cfg_count = toml_array_nelem(arr) / 11;
+	modules->mod_cfg_count += mod_man->cfg_count;
 
-	/* parse "pin" array elements */
+	/* parse "mod_cfg" array elements: the loop runs 11 * modules->mod_cfg_count times */
 	for (i = 0; ; ++i) {
 		raw = toml_raw_at(arr, i);
 		if (raw == 0)
@@ -1799,9 +1800,14 @@ static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx
 		ret = toml_rtoi(raw, &val);
 		if (ret < 0)
 			return err_key_parse("mod_cfg", "can't convert element to integer");
-		pin_data[i] = val;
+		cfg_data[i] = val;
 	}
 
+	if (i != 11 * mod_man->cfg_count)
+		return err_key_parse("mod_cfg",
+				     "can't parse configuration, only %u parsed for %u cfgs",
+				     i, modules->mod_cfg_count);
+
 	return 0;
 }
 
@@ -1866,17 +1872,17 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		return err_key_parse("entry", "wrong array type or length != %d", entry_count);
 
 	modules->mod_ext.mod_conf_count = entry_count;
-	modules->mod_man = calloc(sizeof(const struct sof_man_module), entry_count);
+	modules->mod_man = calloc(sizeof(struct sof_man_module), entry_count);
 	if (!modules->mod_man)
 		return -ENOMEM;
 
-	modules->mod_man_count = toml_array_nelem(mod_entry_array);
+	modules->mod_man_count = entry_count;
 
-	tmp_cfg_count = entry_count * 32;
-	modules->mod_cfg = calloc(sizeof(const struct sof_man_mod_config), tmp_cfg_count);
+	tmp_cfg_count = entry_count * MAX_MODULES;
+	modules->mod_cfg = calloc(sizeof(struct sof_man_mod_config), tmp_cfg_count);
 
 	/* parse entry array elements */
-	for (i = 0; i < toml_array_nelem(mod_entry_array); ++i) {
+	for (i = 0; i < entry_count; ++i) {
 		struct fw_ext_mod_config_header *header;
 		struct sof_man_module *mod_man;
 		struct parse_ctx ctx_entry;
diff --git a/tools/rimage/src/include/rimage/module.h b/tools/rimage/src/include/rimage/module.h
index 5df4f469b57f..1fd3f6c020b7 100644
--- a/tools/rimage/src/include/rimage/module.h
+++ b/tools/rimage/src/include/rimage/module.h
@@ -76,6 +76,9 @@ struct module_sections_info {
 struct module {
 	struct elf_file elf;
 
+	unsigned short first_module_idx;
+	unsigned short n_modules;
+
 	/* Array of valid sections */
 	struct module_section *sections;
 
diff --git a/tools/rimage/src/include/rimage/rimage.h b/tools/rimage/src/include/rimage/rimage.h
index 61bc77bfca42..20eafb8dfd95 100644
--- a/tools/rimage/src/include/rimage/rimage.h
+++ b/tools/rimage/src/include/rimage/rimage.h
@@ -104,6 +104,7 @@ struct fw_image_manifest_module {
 	struct sof_man_mod_config *mod_cfg;
 	uint32_t mod_man_count;
 	struct sof_man_module *mod_man;
+	unsigned int output_mod_cfg_count;
 };
 
 /*
diff --git a/tools/rimage/src/manifest.c b/tools/rimage/src/manifest.c
index b641c177d124..d7a1fbe58e4e 100644
--- a/tools/rimage/src/manifest.c
+++ b/tools/rimage/src/manifest.c
@@ -483,10 +483,32 @@ static void man_module_fill_reloc(const struct manifest_module *module,
 	man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length = 0;
 }
 
+/* Look for a name among module TOML manifests */
+static int man_module_find_cfg(const struct fw_image_manifest_module *modules,
+			       const struct sof_man_module *module)
+{
+	unsigned int i;
+	char name[SOF_MAN_MOD_NAME_LEN + 1];
+
+	strncpy(name, (const char *)module->name, SOF_MAN_MOD_NAME_LEN);
+	/* Ensure null termination */
+	name[SOF_MAN_MOD_NAME_LEN] = '\0';
+
+	for (i = 0; i < modules->mod_man_count; i++) {
+		if (!strncmp(name, (const char *)modules->mod_man[i].name, SOF_MAN_MOD_NAME_LEN))
+			return i;
+	}
+
+	fprintf(stderr, "error: Module %s not found in TOML.\n", name);
+
+	return -ENOEXEC;
+}
+
 static int man_module_create_reloc(struct image *image, struct manifest_module *module,
 				   struct sof_man_module **man_module)
 {
 	/* create module and segments */
+	struct fw_image_manifest_module *modules = image->adsp->modules;
 	const struct sof_man_module_manifest *sof_mod;
 	struct elf_section section;
 	int err;
@@ -498,6 +520,11 @@ static int man_module_create_reloc(struct image *image, struct manifest_module *
 		return err;
 	}
 
+	/*
+	 * number of manifests in .module, one module can contain several manifests
+	 * e.g. when a module defines multiple Module Adapter interfaces like
+	 * volume for PEAKVOL and GAIN, mixin_mixout for MIXIN and MIXOUT etc.
+	 */
 	unsigned int n_mod = section.header.data.size / sizeof(*sof_mod);
 
 	if (!n_mod || n_mod * sizeof(*sof_mod) != section.header.data.size) {
@@ -509,35 +536,26 @@ static int man_module_create_reloc(struct image *image, struct manifest_module *
 	unsigned int i;
 
 	for (i = 0, sof_mod = section.data; i < n_mod; i++, sof_mod++) {
-		char name[SOF_MAN_MOD_NAME_LEN + 1];
-		unsigned int j;
-
-		strncpy(name, (char *)sof_mod->module.name, SOF_MAN_MOD_NAME_LEN);
-		/* Ensure null termination */
-		name[SOF_MAN_MOD_NAME_LEN] = '\0';
-
-		for (j = 0; j < image->adsp->modules->mod_man_count; j++) {
-			if (!strncmp(name, (char *)image->adsp->modules->mod_man[j].name,
-				     SOF_MAN_MOD_NAME_LEN)) {
-				/* Found a TOML manifest, matching ELF */
-				if (i)
-					(*man_module)++;
-				/* Use manifest created using toml files as template */
-				**man_module = image->adsp->modules->mod_man[j];
-				/* Use .manifest to update individual fields */
-				man_get_section_manifest(image, sof_mod, *man_module);
-				man_module_fill_reloc(module, *man_module);
-				break;
-			}
-		}
+		int j = man_module_find_cfg(modules, &sof_mod->module);
 
-		if (j == image->adsp->modules->mod_man_count) {
-			fprintf(stderr, "error: cannot find %s in manifest.\n", name);
+		if (j < 0) {
 			elf_section_free(&section);
-			return -ENOEXEC;
+			return j;
 		}
+
+		/* Found a TOML manifest, matching ELF */
+		if (i)
+			(*man_module)++;
+		/* Use manifest created using toml files as template */
+		**man_module = modules->mod_man[j];
+		/* Use .manifest to update individual fields */
+		man_get_section_manifest(image, sof_mod, *man_module);
+		man_module_fill_reloc(module, *man_module);
 	}
 
+	module->file.n_modules = n_mod;
+	modules->output_mod_cfg_count += n_mod;
+
 	elf_section_free(&section);
 
 	module_print_zones(&module->file);
@@ -641,6 +659,7 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 	}
 
 	image->image_end = 0;
+	unsigned int n_mod = 0;
 
 	for (man_module = (struct sof_man_module *)((uint8_t *)desc + SOF_MAN_MODULE_OFFSET(i - offset));
 	     i < image->num_modules;
@@ -653,7 +672,9 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 			module->foffset = image->image_end;
 
 		if (image->reloc) {
+			module->file.first_module_idx = n_mod;
 			err = man_module_create_reloc(image, module, &man_module);
+			n_mod += module->file.n_modules;
 		} else {
 			/* Some platforms don't have modules configuration in toml file */
 			if (image->adsp->modules) {
@@ -673,42 +694,94 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 	return 0;
 }
 
-static void man_create_modules_in_config(struct image *image, struct sof_man_fw_desc *desc)
+/* Copy module "mod_cfg" entries from TOML to manifest */
+static int man_create_modules_in_config(struct image *image, struct sof_man_fw_desc *desc)
 {
 	struct fw_image_manifest_module *modules;
 	struct sof_man_module *man_module;
-	void *cfg_start;
+	uint8_t *cfg_start;
 	int i;
 
 	modules = image->adsp->modules;
 	if (!modules)
-		return;
-
-	if (!image->loadable_module)
-		/* skip modules passed as parameters. Their manifests have
-		 * already been copied by the man_create_modules function. */
-		for (i = image->num_modules; i < modules->mod_man_count; i++) {
-			man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
-			memcpy(man_module, &modules->mod_man[i], sizeof(*man_module));
+		return 0;
+
+	if (image->reloc) {
+		/* Number of struct sof_man_mod_config entries for the current module */
+		unsigned int offset = 0;
+
+		cfg_start = (uint8_t *)desc + SOF_MAN_MODULE_OFFSET(modules->output_mod_cfg_count);
+
+		/*
+		 * Modules in the output file don't have to follow in the same order
+		 * as in TOML. Moreover, the TOML configuration is global, it contains
+		 * all the modules, enabled for this platform, whereas when building
+		 * libraries we need to select only configurations for included modules.
+		 * This loop finds and copies each such configuration individually.
+		 */
+		for (i = 0, man_module = (struct sof_man_module *)((uint8_t *)desc +
+								   SOF_MAN_MODULE_OFFSET(0));
+		     i < modules->output_mod_cfg_count;
+		     i++, man_module++) {
+			int j = man_module_find_cfg(modules, man_module);
+
+			if (j < 0)
+				return j;
+
+			man_module->cfg_offset = offset;
+
+			/* Copy configuration for the module */
+			size_t size = modules->mod_man[j].cfg_count *
+				sizeof(struct sof_man_mod_config);
+
+			memcpy(cfg_start, modules->mod_cfg + modules->mod_man[j].cfg_offset, size);
+
+			cfg_start += size;
+			offset += modules->mod_man[j].cfg_count;
 		}
-	else
-		i = modules->mod_man_count;
 
-	/* We need to copy the configurations for all modules. */
-	cfg_start = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
-	memcpy(cfg_start, modules->mod_cfg, modules->mod_cfg_count * sizeof(struct sof_man_mod_config));
+		/* Update module count */
+		desc->header.num_module_entries = modules->output_mod_cfg_count;
+	} else {
+		if (image->loadable_module)
+			i = modules->mod_man_count;
+		else
+			/* skip modules passed as parameters. Their manifests have
+			 * already been copied by the man_create_modules function. */
+			for (i = image->num_modules; i < modules->mod_man_count; i++) {
+				man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
+				memcpy(man_module, &modules->mod_man[i], sizeof(*man_module));
+			}
+
+		/* We need to copy the configurations for all modules. */
+		cfg_start = (uint8_t *)desc + SOF_MAN_MODULE_OFFSET(i);
+		memcpy(cfg_start, modules->mod_cfg,
+		       modules->mod_cfg_count * sizeof(struct sof_man_mod_config));
+
+		/* Update module count */
+		desc->header.num_module_entries = modules->mod_man_count;
+	}
 
-	desc->header.num_module_entries = modules->mod_man_count;
+	return 0;
 }
 
 static int man_hash_modules(struct image *image, struct sof_man_fw_desc *desc)
 {
-	struct sof_man_module *man_module;
+	struct sof_man_module *man_module, *man;
+	struct manifest_module *mod_file;
 	size_t mod_offset, mod_size;
-	int i, ret = 0;
+	int i, j, idx, ret = 0;
 
-	for (i = 0; i < image->num_modules; i++) {
-		man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
+	/*
+	 * We walk the array of input module files and calculate a hash-sum of each of
+	 * them. Those files might contain multiple modules, so that we then have to
+	 * find all of them and copy the hash-sum into each one.
+	 */
+	for (i = 0, mod_file = image->module;
+	     i < image->num_modules;
+	     i++, mod_file++) {
+		man_module = (struct sof_man_module *)
+			((uint8_t *)desc + SOF_MAN_MODULE_OFFSET(mod_file->file.first_module_idx));
 
 		if (image->adsp->exec_boot_ldr && i == 0) {
 			fprintf(stdout, " module: no need to hash %s\n as its exec header\n",
@@ -726,6 +799,14 @@ static int man_hash_modules(struct image *image, struct sof_man_fw_desc *desc)
 		ret = hash_sha256(image->fw_image + mod_offset, mod_size, man_module->hash, sizeof(man_module->hash));
 		if (ret)
 			break;
+
+		/* If the input file contained more than 1 module, copy to the rest */
+		for (j = 1, idx = mod_file->file.first_module_idx + 1; j < mod_file->file.n_modules;
+		     j++, idx++) {
+			man = (struct sof_man_module *)
+				((uint8_t *)desc + SOF_MAN_MODULE_OFFSET(idx));
+			memcpy(man->hash, man_module->hash, sizeof(man->hash));
+		}
 	}
 
 	return ret;
@@ -1453,7 +1534,9 @@ int man_write_fw_ace_v1_5(struct image *image)
 		goto err;
 
 	/* platform config defines some modules except bringup & base modules */
-	man_create_modules_in_config(image, desc);
+	ret = man_create_modules_in_config(image, desc);
+	if (ret)
+		goto err;
 
 	fprintf(stdout, "Firmware completing manifest v2.5\n");
 
diff --git a/tools/rimage/src/module.c b/tools/rimage/src/module.c
index 965b9feecc19..7ca44ca661e5 100644
--- a/tools/rimage/src/module.c
+++ b/tools/rimage/src/module.c
@@ -500,7 +500,7 @@ static int module_check_overlap(const struct module *mod, const struct module *m
 			const struct module_section *section2 = &mod2->sections[j];
 
 			/* don't compare section with itself */
-			if (section == section2)
+			if (section == section2 || section->detached || section2->detached)
 				continue;
 
 			/* check section overlapping */
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 2e96668e119b..c876d8c08ad3 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -62,6 +62,7 @@ endfunction()
 # of the .text section as arguments.
 function(sof_llext_build module)
 	set(multi_args SOURCES)
+	set(single_args LIB)
 	cmake_parse_arguments(PARSE_ARGV 1 SOF_LLEXT "${options}" "${single_args}" "${multi_args}")
 
 	cmake_path(SET SOF_BASE NORMALIZE ${APPLICATION_SOURCE_DIR}/..)
@@ -73,6 +74,10 @@ function(sof_llext_build module)
 		SOURCES ${SOF_LLEXT_SOURCES}
 	)
 
+	if(CONFIG_LIBRARY_BUILD_LIB AND NOT("${SOF_LLEXT_LIB}" STREQUAL ""))
+		file(WRITE ${PROJECT_BINARY_DIR}/${module}_llext/lib_name.txt ${SOF_LLEXT_LIB})
+	endif()
+
 	target_include_directories(${module}_llext_lib PRIVATE
 		"${SOF_BASE}/xtos/include"
 		"${SOF_BASE}/src/include"