diff --git a/app/boards/imx95_evk_mimx9596_m7_ddr.overlay b/app/boards/imx95_evk_mimx9596_m7_ddr.overlay
index f1d2cce00781..4c9ce43c9452 100644
--- a/app/boards/imx95_evk_mimx9596_m7_ddr.overlay
+++ b/app/boards/imx95_evk_mimx9596_m7_ddr.overlay
@@ -26,6 +26,10 @@
 	status = "okay";
 };
 
+&edma1 {
+	status = "disabled";
+};
+
 &edma2 {
 	compatible = "nxp,edma";
 	reg = <0x42000000 (DT_SIZE_K(64) * 33)>;
diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
index 4f124eee5285..9bbf01b9c61b 100644
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -55,6 +55,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
 CONFIG_WATCHDOG=y
diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index 2aef09fb9a4a..695be421be20 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -38,6 +38,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
 
diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf
index 20e866ade585..b6ac41938398 100644
--- a/app/boards/intel_adsp_ace30_ptl.conf
+++ b/app/boards/intel_adsp_ace30_ptl.conf
@@ -42,6 +42,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf
index 999a3c309d41..a46b4dfaa08f 100644
--- a/app/boards/intel_adsp_ace30_wcl.conf
+++ b/app/boards/intel_adsp_ace30_wcl.conf
@@ -40,6 +40,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf
index 0472a7c00de1..bb39cf026ada 100644
--- a/app/boards/intel_adsp_ace40_nvl.conf
+++ b/app/boards/intel_adsp_ace40_nvl.conf
@@ -39,6 +39,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf
index 0472a7c00de1..bb39cf026ada 100644
--- a/app/boards/intel_adsp_ace40_nvls.conf
+++ b/app/boards/intel_adsp_ace40_nvls.conf
@@ -39,6 +39,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
diff --git a/west.yml b/west.yml
index faf374b914fb..abb3dcaa9736 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: c162980efd9ad8616d0e2fe886ca917d8d8d240a
+      revision: ef5cfd369f4a0ab3601db9a23c1da8c406cc1a72
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision