diff --git a/examples/zephyr/common/Kconfig.defconfig b/examples/zephyr/common/Kconfig.defconfig
index 576ec3f9..ad680876 100644
--- a/examples/zephyr/common/Kconfig.defconfig
+++ b/examples/zephyr/common/Kconfig.defconfig
@@ -167,4 +167,7 @@ configdefault SHELL_DEFAULT_TERMINAL_WIDTH
 
 endif # GOLIOTH_SAMPLE_TWISTER_TEST
 
+configdefault MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE
+	default 110 if NET_NATIVE_OFFLOADED_SOCKETS
+
 endif # GOLIOTH_SAMPLE_COMMON
diff --git a/west-ncs.yml b/west-ncs.yml
index 8abba3f7..879d01b4 100644
--- a/west-ncs.yml
+++ b/west-ncs.yml
@@ -1,7 +1,7 @@
 manifest:
   projects:
     - name: nrf
-      revision: v2.9.0
+      revision: cfd224a72298ed39883f08b96df7257fe7e04cdd  # post v2.9.0
       url: http://github.com/nrfconnect/sdk-nrf
       import: true
 
diff --git a/west-zephyr.yml b/west-zephyr.yml
index 71706cd5..ae8b88de 100644
--- a/west-zephyr.yml
+++ b/west-zephyr.yml
@@ -1,7 +1,7 @@
 manifest:
   projects:
     - name: zephyr
-      revision: v4.0.0
+      revision: c5c061a5c0033299c12b98e09aba738ee6f3936a  # post v4.0.0
       url: https://github.com/zephyrproject-rtos/zephyr
       west-commands: scripts/west-commands.yml
       import: true