diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf
index dd37e8b97db9..96ae996bc4ae 100644
--- a/samples/suit/flash_companion/prj.conf
+++ b/samples/suit/flash_companion/prj.conf
@@ -20,7 +20,8 @@ CONFIG_FLASH=y
 # Disable power management
 CONFIG_PM=n
 
-# Disable NRFS
+# Disable GPD service and NRFS
+CONFIG_SOC_NRF54H20_GPD=n
 CONFIG_NRFS=n
 
 # Disable unneeded interrupt features
diff --git a/west.yml b/west.yml
index e60a0609f1f0..36add9be61ee 100644
--- a/west.yml
+++ b/west.yml
@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: pull/2195/head
+      revision: 40ac0cca86ebc2a7af34221f643ec616804a02fa
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above