diff --git a/src/init/init.c b/src/init/init.c
index c76b4842d88e..7976e2eb673e 100644
--- a/src/init/init.c
+++ b/src/init/init.c
@@ -41,7 +41,7 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <user/abi_dbg.h>
 #include <sof_versions.h>
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 #include <sof/lib/ams.h>
 
diff --git a/src/ipc/ipc-common.c b/src/ipc/ipc-common.c
index d0d248c9ec77..f0268b4c6c1c 100644
--- a/src/ipc/ipc-common.c
+++ b/src/ipc/ipc-common.c
@@ -330,11 +330,13 @@ __cold int ipc_init(struct sof *sof)
 #endif
 
 #ifdef __ZEPHYR__
-	struct k_thread *thread = &sof->ipc->ipc_send_wq.thread;
+	k_tid_t thread;
 
 	k_work_queue_start(&sof->ipc->ipc_send_wq, ipc_send_wq_stack,
 			   K_THREAD_STACK_SIZEOF(ipc_send_wq_stack), 1, NULL);
 
+	thread = k_work_queue_thread_get(&sof->ipc->ipc_send_wq);
+
 	k_thread_suspend(thread);
 
 #ifdef CONFIG_SCHED_CPU_MASK
diff --git a/src/ipc/ipc-zephyr.c b/src/ipc/ipc-zephyr.c
index 66ada4ddaa05..b03c8420a8bb 100644
--- a/src/ipc/ipc-zephyr.c
+++ b/src/ipc/ipc-zephyr.c
@@ -9,7 +9,7 @@
 //         Andrey Borisovich <andrey.borisovich@intel.com>
 //         Adrian Warecki <adrian.warecki@intel.com>
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/ipc/ipc_service.h>
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
index 554204ac5c70..bfa359b4ba74 100644
--- a/src/trace/dma-trace.c
+++ b/src/trace/dma-trace.c
@@ -30,7 +30,7 @@
 #include <sof_versions.h>
 
 #ifdef __ZEPHYR__
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 
 #include <errno.h>
diff --git a/west.yml b/west.yml
index af96853d6586..bb8556ccfb55 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: ee13f80fd5ede26838d461914858b9cc8cdb652f
+      revision: 3841a72452ec13ff7a0a5df14f514e7870b71817
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/edf_schedule.c b/zephyr/edf_schedule.c
index a14ed31d060d..67bc79a30ae6 100644
--- a/zephyr/edf_schedule.c
+++ b/zephyr/edf_schedule.c
@@ -102,7 +102,7 @@ static struct scheduler_ops schedule_edf_ops = {
 
 __cold int scheduler_init_edf(void)
 {
-	struct k_thread *thread = &edf_workq.thread;
+	k_tid_t thread;
 
 	assert_can_be_cold();
 
@@ -113,6 +113,7 @@ __cold int scheduler_init_edf(void)
 		       K_THREAD_STACK_SIZEOF(edf_workq_stack),
 		       CONFIG_EDF_THREAD_PRIORITY, NULL);
 
+	thread = k_work_queue_thread_get(&edf_workq);
 	k_thread_suspend(thread);
 
 	k_thread_heap_assign(thread, sof_sys_heap_get());
diff --git a/zephyr/lib/alloc.c b/zephyr/lib/alloc.c
index 031b31673be8..621ac0a83749 100644
--- a/zephyr/lib/alloc.c
+++ b/zephyr/lib/alloc.c
@@ -37,7 +37,7 @@ struct vmh_heap *virtual_buffers_heap;
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/cache.h>
 
diff --git a/zephyr/lib/cpu.c b/zephyr/lib/cpu.c
index 94f004bd7356..c2f654509a34 100644
--- a/zephyr/lib/cpu.c
+++ b/zephyr/lib/cpu.c
@@ -27,7 +27,7 @@ static uint32_t mic_disable_status;
 #include "../audio/copier/copier.h"
 
 /* Zephyr includes */
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel/smp.h>
 #include <zephyr/device.h>
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index e929135ce851..9bbb43f8a798 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -33,7 +33,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>