diff --git a/config/examples/mcxw-tz.config b/config/examples/mcxw-tz.config
index 491d59fa..a47253aa 100644
--- a/config/examples/mcxw-tz.config
+++ b/config/examples/mcxw-tz.config
@@ -31,23 +31,23 @@ PKA?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 32KB boot, 80KB keyvault, 16KB NSC, 60KB partitions, 8KB swap
+# 32KB boot, no keyvault, 16KB NSC, 64KB partitions, 8KB swap
 WOLFBOOT_KEYVAULT_ADDRESS?=0x8000
-WOLFBOOT_KEYVAULT_SIZE?=0x14000
-WOLFBOOT_NSC_ADDRESS?=0x1C000
+WOLFBOOT_KEYVAULT_SIZE?=0
+WOLFBOOT_NSC_ADDRESS?=0x8000
 WOLFBOOT_NSC_SIZE?=0x4000
-WOLFBOOT_PARTITION_SIZE?=0xF000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x2F000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3E000
+WOLFBOOT_PARTITION_SIZE?=0x10000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x0C000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1C000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x2C000
 
 # Alternate larger configuration for debugging or ARMASM
-# 40KB boot, 80KB keyvault, 8KB NSC, 60KB partitions, 8KB swap
+# 40KB boot, no keyvault, 16KB NSC, 64KB partitions, 8KB swap
 #WOLFBOOT_KEYVAULT_ADDRESS?=0xA000
-#WOLFBOOT_KEYVAULT_SIZE?=0x14000
-#WOLFBOOT_NSC_ADDRESS?=0x1E000
-#WOLFBOOT_NSC_SIZE?=0x2000
-#WOLFBOOT_PARTITION_SIZE?=0xF000
-#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
-#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x2F000
-#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3E000
+#WOLFBOOT_KEYVAULT_SIZE?=0
+#WOLFBOOT_NSC_ADDRESS?=0xA000
+#WOLFBOOT_NSC_SIZE?=0x4000
+#WOLFBOOT_PARTITION_SIZE?=0x10000
+#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x0E000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1E000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x2E000
diff --git a/config/examples/mcxw.config b/config/examples/mcxw.config
index 77e900b0..242eb5d4 100644
--- a/config/examples/mcxw.config
+++ b/config/examples/mcxw.config
@@ -29,11 +29,11 @@ PKA?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 32KB boot, 44KB partitions, 8KB swap
-WOLFBOOT_PARTITION_SIZE?=0xB000
+# 32KB boot, 40KB partitions, 8KB swap
+WOLFBOOT_PARTITION_SIZE?=0xA000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x13000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x1E000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x12000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x1C000
 
 # Alternate larger configuration for debugging or ARMASM
 # 40KB boot, 40KB partitions, 8KB swap
diff --git a/config/examples/nrf5340-tz.config b/config/examples/nrf5340-tz.config
index ccd473b4..04ebb2a4 100644
--- a/config/examples/nrf5340-tz.config
+++ b/config/examples/nrf5340-tz.config
@@ -26,19 +26,19 @@ QSPI_FLASH?=1
 # Flash is 4KB pages (app)
 WOLFBOOT_SECTOR_SIZE?=0x1000
 
-# Flash keyvault: 124K
-WOLFBOOT_KEYVAULT_ADDRESS?=0x20000
-WOLFBOOT_KEYVAULT_SIZE?=0x1F000
+# Flash keyvault: none
+WOLFBOOT_KEYVAULT_ADDRESS?=0x1F000
+WOLFBOOT_KEYVAULT_SIZE?=0
 
 # Flash NSC: 4K
 # Note: the NSC area must be defined so that:
 # - Its size is exactly 32, 64, 128, 256, 512, 1024, 2048 or 4096 bytes
 # - Its end is 16K-aligned
-WOLFBOOT_NSC_ADDRESS?=0x3F000
+WOLFBOOT_NSC_ADDRESS?=0x1F000
 WOLFBOOT_NSC_SIZE?=0x01000
 
-# Application offset (reserve 256K for wolfBoot + keyvault + NSC)
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x40000
+# Application offset (reserve 128K for wolfBoot + keyvault + NSC)
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
 
 # Application Partition Size (768KB)
 WOLFBOOT_PARTITION_SIZE?=0xC0000
diff --git a/config/examples/stm32h5.config b/config/examples/stm32h5.config
index 7192f650..14b5d681 100644
--- a/config/examples/stm32h5.config
+++ b/config/examples/stm32h5.config
@@ -20,8 +20,8 @@ RAM_CODE?=0
 DUALBANK_SWAP?=0
 WOLFBOOT_PARTITION_SIZE?=0xA0000
 WOLFBOOT_SECTOR_SIZE?=0x2000
-WOLFBOOT_KEYVAULT_ADDRESS?=0x0C040000
-WOLFBOOT_KEYVAULT_SIZE?=0x1C000
+WOLFBOOT_KEYVAULT_ADDRESS?=0x0C05C000
+WOLFBOOT_KEYVAULT_SIZE?=0
 WOLFBOOT_NSC_ADDRESS?=0x0C05C000
 WOLFBOOT_NSC_SIZE?=0x4000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08060000
diff --git a/config/examples/stm32u5.config b/config/examples/stm32u5.config
index b8be273f..77951565 100644
--- a/config/examples/stm32u5.config
+++ b/config/examples/stm32u5.config
@@ -22,8 +22,8 @@ RAM_CODE?=0
 DUALBANK_SWAP?=0
 WOLFBOOT_PARTITION_SIZE?=0x1F800
 WOLFBOOT_SECTOR_SIZE?=0x2000
-WOLFBOOT_KEYVAULT_ADDRESS?=0x0C020000
-WOLFBOOT_KEYVAULT_SIZE?=0x18000
+WOLFBOOT_KEYVAULT_ADDRESS?=0x0C038000
+WOLFBOOT_KEYVAULT_SIZE?=0
 WOLFBOOT_NSC_ADDRESS?=0x0C038000
 WOLFBOOT_NSC_SIZE?=0x8000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08040000