diff --git a/src/schedule/CMakeLists.txt b/src/schedule/CMakeLists.txt
index cc9a83c5daab..35cbfec4f8e5 100644
--- a/src/schedule/CMakeLists.txt
+++ b/src/schedule/CMakeLists.txt
@@ -1,17 +1,59 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL)
-	add_local_sources(sof dma_multi_chan_domain.c)
+set(base_files
+	schedule.c
+)
+
+if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
+	list(APPEND base_files dma_multi_chan_domain.c)
+endif()
+
+if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
+	list(APPEND base_files dma_single_chan_domain.c)
 endif()
 
-if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL)
-	add_local_sources(sof dma_single_chan_domain.c)
+is_zephyr(it_is)
+if(it_is) ###  Zephyr ###
+
+zephyr_library_sources(
+	${base_files}
+	zephyr_domain.c
+)
+
+if (CONFIG_SOC_ACP_6_0)
+	# Zephyr DMA domain should only be used with zephyr_ll
+	if (CONFIG_DMA_DOMAIN)
+		zephyr_library_sources(
+			zephyr_ll.c
+			zephyr_dma_domain.c
+		)
+	else()
+		zephyr_library_sources(
+			ll_schedule.c
+		)
+	endif()
+else()
+	zephyr_library_sources(
+		zephyr_ll.c
+	)
 endif()
 
+zephyr_library_sources_ifdef(CONFIG_ZEPHYR_DP_SCHEDULER
+	${SOF_SRC_PATH}/schedule/zephyr_dp_schedule.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_ZEPHYR_TWB_SCHEDULER
+	${SOF_SRC_PATH}/schedule/zephyr_twb_schedule.c
+)
+
+else() ###  Not Zephyr ###
+
 add_local_sources(sof
+	${base_files}
 	edf_schedule.c
 	ll_schedule.c
-	schedule.c
 	task.c
 	timer_domain.c
 )
+
+endif()
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index d0ba04d4a879..37c9f8f80b8d 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -203,6 +203,7 @@ add_subdirectory(../src/init/ init_unused_install/)
 add_subdirectory(../src/ipc/  ipc_unused_install/)
 add_subdirectory(../src/debug/telemetry/  telemetry_unused_install/)
 add_subdirectory(../src/debug/debug_stream/  debug_stream_unused_install/)
+add_subdirectory(../src/schedule/  schedule_unused_install/)
 
 if(CONFIG_COMP_TESTER STREQUAL "m")
 	add_subdirectory(${SOF_DEBUG_PATH}/tester/llext
@@ -235,11 +236,6 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
 		lib/dma.c
 	)
 
-	# SOF core infrastructure - runs on top of Zephyr
-	zephyr_library_sources(
-		${SOF_SRC_PATH}/schedule/zephyr_ll.c
-	)
-
 	set(PLATFORM "tigerlake")
 	zephyr_include_directories(${SOF_PLATFORM_PATH}/intel/cavs/include)
 endif()
@@ -271,14 +267,6 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 		${SOF_SRC_PATH}/schedule/zephyr_ll.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_ZEPHYR_DP_SCHEDULER
-		${SOF_SRC_PATH}/schedule/zephyr_dp_schedule.c
-	)
-
-	zephyr_library_sources_ifdef(CONFIG_ZEPHYR_TWB_SCHEDULER
-		${SOF_SRC_PATH}/schedule/zephyr_twb_schedule.c
-	)
-
 	# Sources for virtual heap management
 	zephyr_library_sources(
 		lib/regions_mm.c
@@ -321,8 +309,6 @@ if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP)
 		lib/dma.c
 	)
 
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
-
 	set(PLATFORM "imx8")
 endif()
 
@@ -342,8 +328,6 @@ if (CONFIG_SOC_MIMX8ML8_ADSP)
 		lib/dma.c
 	)
 
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
-
 	set(PLATFORM "imx8m")
 endif()
 
@@ -363,8 +347,6 @@ if (CONFIG_SOC_MIMX8UD7_ADSP)
 		lib/dma.c
 	)
 
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
-
 	set(PLATFORM "imx8ulp")
 endif()
 
@@ -381,10 +363,6 @@ if (CONFIG_SOC_MIMX9352_A55)
 		${SOF_DRIVERS_PATH}/imx/ipc.c
 	)
 
-	zephyr_library_sources(
-		${SOF_SRC_PATH}/schedule/zephyr_ll.c
-	)
-
 	set(PLATFORM "imx93_a55")
 endif()
 
@@ -400,10 +378,6 @@ if (CONFIG_SOC_MIMX9596_M7)
 		${SOF_DRIVERS_PATH}/imx/ipc.c
 	)
 
-	zephyr_library_sources(
-		${SOF_SRC_PATH}/schedule/zephyr_ll.c
-	)
-
 	# SOF-specific linker script additions
 	zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/platform/imx95/linker/data-sections.ld)
 
@@ -444,17 +418,6 @@ if (CONFIG_SOC_ACP_6_0)
 		${SOF_SRC_PATH}/drivers/interrupt.c
 	)
 
-	# Zephyr DMA domain should only be used with zephyr_ll
-	if (CONFIG_DMA_DOMAIN)
-		zephyr_library_sources(
-		${SOF_SRC_PATH}/schedule/zephyr_ll.c
-			)
-	else()
-		zephyr_library_sources(
-			${SOF_SRC_PATH}/schedule/ll_schedule.c
-			)
-	endif()
-
 	zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/rembrandt/include)
 	zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/common/include)
 	zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/rembrandt/include/arch)
@@ -468,7 +431,6 @@ if (CONFIG_SOC_FAMILY_MTK)
 	zephyr_library_sources(
 		${SOF_PLATFORM_PATH}/mtk/platform.c
 		${SOF_PLATFORM_PATH}/mtk/dai.c
-		${SOF_SRC_PATH}/schedule/zephyr_ll.c
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_SRC_PATH}/drivers/mediatek/afe/afe-memif.c
 		${SOF_SRC_PATH}/drivers/mediatek/afe/afe-dai.c
@@ -478,7 +440,6 @@ endif()
 
 # Building for native_posix-based whole-OS host emulator
 zephyr_library_sources_ifdef(CONFIG_ZEPHYR_POSIX
-	${SOF_SRC_PATH}/schedule/zephyr_ll.c
 	${SOF_PLATFORM_PATH}/posix/dma.c
 	${SOF_PLATFORM_PATH}/posix/dai.c
 	${SOF_PLATFORM_PATH}/posix/ipc.c
@@ -530,8 +491,6 @@ zephyr_library_sources(
 
 	# SOF core infrastructure - runs on top of Zephyr
 	${SOF_SRC_PATH}/arch/xtensa/drivers/cache_attr.c
-	${SOF_SRC_PATH}/schedule/zephyr_domain.c
-	${SOF_SRC_PATH}/schedule/schedule.c
 
 	${SOF_SRC_PATH}/idc/zephyr_idc.c
 
@@ -612,15 +571,6 @@ add_subdirectory(../src/module module_unused_install/)
 if(CONFIG_PIPELINE_2_0)
 	zephyr_library_sources(${SOF_AUDIO_PATH}/buffers/ring_buffer.c)
 endif()
-if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/dma_single_chan_domain.c)
-endif()
-if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/dma_multi_chan_domain.c)
-endif()
-if (CONFIG_DMA_DOMAIN)
-	zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_dma_domain.c)
-endif()
 
 if(CONFIG_COMP_BLOB)
 	zephyr_library_sources(