diff --git a/app/debug_overlay.conf b/app/debug_overlay.conf
index 650b3c09f7f2..44f3c4435d4f 100644
--- a/app/debug_overlay.conf
+++ b/app/debug_overlay.conf
@@ -22,3 +22,4 @@ CONFIG_COLD_STORE_EXECUTE_DEBUG=y
 
 CONFIG_GDBSTUB=y
 CONFIG_GDBSTUB_ENTER_IMMEDIATELY=n
+CONFIG_XTENSA_EXCEPTION_ENTER_GDB=y
diff --git a/west.yml b/west.yml
index c428ba32bb74..ccdf12d20dd9 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 8843fd9fe1800164fbb5221d95d1eba7d0699458
+      revision: 9a4804490647c74787bd92f042750b2c5e4cfb90
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision