diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
index 30f622f8cf0b..26a9680e92f1 100644
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -104,7 +104,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_POWER_DOMAIN_INTEL_ADSP=y
 
diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index 5190674693ec..a8888c9557d6 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -83,7 +83,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_POWER_DOMAIN_INTEL_ADSP=y
 
diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf
index 1aab3daf3d03..15e1489c7dc4 100644
--- a/app/boards/intel_adsp_ace30_ptl.conf
+++ b/app/boards/intel_adsp_ace30_ptl.conf
@@ -78,7 +78,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y
 CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_POWER_DOMAIN_INTEL_ADSP=y
 
diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf
index eb72fb6598cc..ef3f717f9082 100644
--- a/app/boards/intel_adsp_ace30_ptl_sim.conf
+++ b/app/boards/intel_adsp_ace30_ptl_sim.conf
@@ -9,7 +9,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 
 # power settings
 CONFIG_PM=n
-CONFIG_PM_POLICY_CUSTOM=y
 
 # enable Zephyr drivers
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf
index 1dbecc00be9c..c33c0e2127bb 100644
--- a/app/boards/intel_adsp_ace30_wcl.conf
+++ b/app/boards/intel_adsp_ace30_wcl.conf
@@ -75,7 +75,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_PM_DEVICE_POWER_DOMAIN=y
 CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_POWER_DOMAIN_INTEL_ADSP=y
 
diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf
index 63020f3652a5..64cfb22acd27 100644
--- a/app/boards/intel_adsp_ace30_wcl_sim.conf
+++ b/app/boards/intel_adsp_ace30_wcl_sim.conf
@@ -9,7 +9,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 
 # power settings
 CONFIG_PM=n
-CONFIG_PM_POLICY_CUSTOM=y
 
 # enable Zephyr drivers
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
diff --git a/west.yml b/west.yml
index 9d3bb326aa58..09d91a0a1453 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: e48c90700de7b84c038e73d01f4b2640e2fea127
+      revision: 8c6b2c8c88773810d64a47ed3b6206b7d6e8290f
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision