diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index 7bf1536616ccf..ff905fd5a1e68 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -430,4 +430,13 @@ config MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
 	  when bootloader is in DirectXIP-revert mode.
 endif
 
+config MCUBOOT_BOOT_MAX_ALIGN
+	int "Override programmable flash block alignment"
+	default 0
+	help
+	  Allow to override the programmable flash block alignment size.
+	  By default it's set to the maximum of the write block size of
+	  the chosen zephyr,flash node and 8.
+	  This option is ignored if set to zero.
+
 endif # MCUBOOT_BOOTUTIL_LIB
diff --git a/west.yml b/west.yml
index ed07825bff075..f0b15f2ee4b4a 100644
--- a/west.yml
+++ b/west.yml
@@ -23,6 +23,8 @@ manifest:
       url-base: https://github.com/zephyrproject-rtos
     - name: babblesim
       url-base: https://github.com/BabbleSim
+    - name: mcuboot
+      url-base: https://github.com/mcu-tools
 
   group-filter: [-babblesim, -optional]
 
@@ -316,7 +318,8 @@ manifest:
       groups:
         - crypto
     - name: mcuboot
-      revision: aa4fa2b6e17361dd3ce16a60883059778fd147a9
+      revision: pull/2453/head
+      remote: mcuboot
       path: bootloader/mcuboot
       groups:
         - bootloader