diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi
index 33fdba4d865..00ce5dcf6c0 100644
--- a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi
+++ b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dtsi
@@ -187,22 +187,19 @@
 		slot0_partition: partition@10000 {
 			label = "image-0";
 		};
-		slot0_ns_partition: partition@40000 {
+		slot0_ns_partition: partition@50000 {
 			label = "image-0-nonsecure";
 		};
 		slot1_partition: partition@80000 {
 			label = "image-1";
 		};
-		slot1_ns_partition: partition@b0000 {
+		slot1_ns_partition: partition@c0000 {
 			label = "image-1-nonsecure";
 		};
-		scratch_partition: partition@f0000 {
-			label = "image-scratch";
-			reg = <0x000f0000 0xa000>;
-		};
-		storage_partition: partition@fa000 {
+		/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
+		storage_partition: partition@f8000 {
 			label = "storage";
-			reg = <0x000fa000 0x00006000>;
+			reg = <0x000f8000 0x00008000>;
 		};
 	};
 };
diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml
index c358a1d87fe..56905972e9f 100644
--- a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml
+++ b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml
@@ -7,7 +7,7 @@ toolchain:
   - xtools
   - zephyr
 ram: 128
-flash: 256
+flash: 192
 supported:
   - i2c
   - pwm
diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi
index e8cb6fc586e..007975132d6 100644
--- a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi
+++ b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_partition_conf.dtsi
@@ -23,19 +23,19 @@
  */
 
 &slot0_partition {
-	reg = <0x00010000 0x30000>;
+	reg = <0x00010000 0x40000>;
 };
 
 &slot0_ns_partition {
-	reg = <0x00040000 0x40000>;
+	reg = <0x00050000 0x30000>;
 };
 
 &slot1_partition {
-	reg = <0x00080000 0x30000>;
+	reg = <0x00080000 0x40000>;
 };
 
 &slot1_ns_partition {
-	reg = <0x000b0000 0x40000>;
+	reg = <0x000c0000 0x30000>;
 };
 
 /* Default SRAM planning when building for nRF9160 with
diff --git a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi
index 0abfd4d6b9c..0ec5de5dfb1 100644
--- a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi
+++ b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dtsi
@@ -168,27 +168,23 @@
 
 		boot_partition: partition@0 {
 			label = "mcuboot";
-			reg = <0x00000000 0xc000>;
+			reg = <0x00000000 0x10000>;
 		};
-		slot0_partition: partition@c000 {
+		slot0_partition: partition@10000 {
 			label = "image-0";
 		};
-		slot0_ns_partition: partition@3e000 {
+		slot0_ns_partition: partition@50000 {
 			label = "image-0-nonsecure";
 		};
-		slot1_partition: partition@7e000 {
+		slot1_partition: partition@80000 {
 			label = "image-1";
 		};
-		slot1_ns_partition: partition@b0000 {
+		slot1_ns_partition: partition@c0000 {
 			label = "image-1-nonsecure";
 		};
-		scratch_partition: partition@f0000 {
-			label = "image-scratch";
-			reg = <0x000f0000 0xa000>;
-		};
-		storage_partition: partition@fa000 {
+		storage_partition: partition@f8000 {
 			label = "storage";
-			reg = <0x000fa000 0x00006000>;
+			reg = <0x000f8000 0x00008000>;
 		};
 	};
 };
diff --git a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml
index 096821d8364..4584ad0e6a4 100644
--- a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml
+++ b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_ns.yaml
@@ -7,7 +7,7 @@ toolchain:
   - xtools
   - zephyr
 ram: 128
-flash: 256
+flash: 192
 supported:
   - i2c
   - pwm
diff --git a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi
index d3a30abdc76..2c64ba67a8a 100644
--- a/boards/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi
+++ b/boards/arm/nrf9160_innblue21/nrf9160_innblue21_partition_conf.dtsi
@@ -22,19 +22,19 @@
  */
 
 &slot0_partition {
-	reg = <0x0000c000 0x30000>;
+	reg = <0x00010000 0x40000>;
 };
 
 &slot0_ns_partition {
-	reg = <0x0003e000 0x40000>;
+	reg = <0x00050000 0x30000>;
 };
 
 &slot1_partition {
-	reg = <0x0007e000 0x30000>;
+	reg = <0x00080000 0x40000>;
 };
 
 &slot1_ns_partition {
-	reg = <0x000b0000 0x40000>;
+	reg = <0x000c0000 0x30000>;
 };
 
 /* Default SRAM planning when building for nRF9160 with
diff --git a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dtsi b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dtsi
index 4582f975f5d..4738dd84a63 100644
--- a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dtsi
+++ b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dtsi
@@ -171,27 +171,24 @@
 
 		boot_partition: partition@0 {
 			label = "mcuboot";
-			reg = <0x00000000 0xc000>;
+			reg = <0x00000000 0x10000>;
 		};
-		slot0_partition: partition@c000 {
+		slot0_partition: partition@10000 {
 			label = "image-0";
 		};
-		slot0_ns_partition: partition@3e000 {
+		slot0_ns_partition: partition@50000 {
 			label = "image-0-nonsecure";
 		};
-		slot1_partition: partition@7e000 {
+		slot1_partition: partition@80000 {
 			label = "image-1";
 		};
-		slot1_ns_partition: partition@b0000 {
+		slot1_ns_partition: partition@c0000 {
 			label = "image-1-nonsecure";
 		};
-		scratch_partition: partition@f0000 {
-			label = "image-scratch";
-			reg = <0x000f0000 0xa000>;
-		};
-		storage_partition: partition@fa000 {
+		/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
+		storage_partition: partition@f8000 {
 			label = "storage";
-			reg = <0x000fa000 0x00006000>;
+			reg = <0x000f8000 0x00008000>;
 		};
 	};
 };
diff --git a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.yaml b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.yaml
index 2ce0d6e3db2..0186c26a377 100644
--- a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.yaml
+++ b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.yaml
@@ -7,7 +7,7 @@ toolchain:
   - xtools
   - zephyr
 ram: 128
-flash: 256
+flash: 192
 supported:
   - i2c
   - pwm
diff --git a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_partition_conf.dtsi b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_partition_conf.dtsi
index 3588a6a7ce1..b14640a02ec 100644
--- a/boards/arm/nrf9160_innblue22/nrf9160_innblue22_partition_conf.dtsi
+++ b/boards/arm/nrf9160_innblue22/nrf9160_innblue22_partition_conf.dtsi
@@ -22,19 +22,19 @@
  */
 
 &slot0_partition {
-	reg = <0x0000c000 0x30000>;
+	reg = <0x00010000 0x40000>;
 };
 
 &slot0_ns_partition {
-	reg = <0x0003e000 0x40000>;
+	reg = <0x00050000 0x30000>;
 };
 
 &slot1_partition {
-	reg = <0x0007e000 0x30000>;
+	reg = <0x00080000 0x40000>;
 };
 
 &slot1_ns_partition {
-	reg = <0x000b0000 0x40000>;
+	reg = <0x000c0000 0x30000>;
 };
 
 /* Default SRAM planning when building for nRF9160 with
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_common.dtsi b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_common.dtsi
index b85c00ea5b2..2658ee5eaa4 100644
--- a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_common.dtsi
+++ b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_common.dtsi
@@ -185,22 +185,19 @@
 		slot0_partition: partition@10000 {
 			label = "image-0";
 		};
-		slot0_ns_partition: partition@40000 {
+		slot0_ns_partition: partition@50000 {
 			label = "image-0-nonsecure";
 		};
 		slot1_partition: partition@80000 {
 			label = "image-1";
 		};
-		slot1_ns_partition: partition@b0000 {
+		slot1_ns_partition: partition@c0000 {
 			label = "image-1-nonsecure";
 		};
-		scratch_partition: partition@f0000 {
-			label = "image-scratch";
-			reg = <0x000f0000 0xa000>;
-		};
-		storage_partition: partition@fa000 {
+		/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
+		storage_partition: partition@f8000 {
 			label = "storage";
-			reg = <0x000fa000 0x00006000>;
+			reg = <0x000f8000 0x00008000>;
 		};
 	};
 };
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns.yaml b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns.yaml
index 438b2df7392..65f9eaad326 100644
--- a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns.yaml
+++ b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_ns.yaml
@@ -7,7 +7,7 @@ toolchain:
   - xtools
   - zephyr
 ram: 128
-flash: 256
+flash: 192
 supported:
   - i2c
   - pwm
diff --git a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_partition_conf.dtsi b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_partition_conf.dtsi
index 2422b2fdc52..64591fbf900 100644
--- a/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_partition_conf.dtsi
+++ b/boards/arm/sparkfun_thing_plus_nrf9160/sparkfun_thing_plus_nrf9160_partition_conf.dtsi
@@ -23,19 +23,19 @@
  */
 
 &slot0_partition {
-	 reg = <0x00010000 0x30000>;
+	reg = <0x00010000 0x40000>;
 };
 
 &slot0_ns_partition {
-	reg = <0x00040000 0x40000>;
+	reg = <0x00050000 0x30000>;
 };
 
 &slot1_partition {
-	reg = <0x00080000 0x30000>;
+	reg = <0x00080000 0x40000>;
 };
 
 &slot1_ns_partition {
-	reg = <0x000b0000 0x40000>;
+	reg = <0x000c0000 0x30000>;
 };
 
 /* Default SRAM planning when building for nRF9160 with