diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt
index 42c2b3a7978f..dcbf74ca446f 100644
--- a/sysbuild/CMakeLists.txt
+++ b/sysbuild/CMakeLists.txt
@@ -268,6 +268,13 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
         set_config_bool(${DEFAULT_IMAGE} CONFIG_HAVE_CUSTOM_LINKER_SCRIPT y)
         set_config_bool(${DEFAULT_IMAGE} CONFIG_BUILD_NO_GAP_FILL y)
 
+        # Set required options if MCUmgr img mgmt is used
+        if(SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP)
+          set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE y)
+        else()
+          set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE n)
+        endif()
+
         if(NOT DEFINED SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK)
           # If external driver check Kconfig is enabled then users will need to select their own
           # Kconfigs (to allow for forked/derivative QSPI NOR drivers), otherwise force enable the
@@ -289,6 +296,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
             IMAGE_CONF_SCRIPT ${ZEPHYR_NRF_MODULE_DIR}/sysbuild/image_configurations/firmware_loader_image_default.cmake
           )
         endif()
+
+        set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE n)
       endif()
 
       if(SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK)
diff --git a/west.yml b/west.yml
index d9f50415e003..8c7644ebd88c 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: e734c8433f00bef70f08c682313e19792dc07ad8
+      revision: 6debbaf8115c13f31fca0d6acdadfad153e413b4
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above