diff --git a/files/flashlayouts/FlashLayout_emmc_stm32mp157c-ev1_sample.tsv b/files/flashlayouts/FlashLayout_emmc_stm32mp157c-ev1_sample.tsv
index 07ae753..502736c 100644
--- a/files/flashlayouts/FlashLayout_emmc_stm32mp157c-ev1_sample.tsv
+++ b/files/flashlayouts/FlashLayout_emmc_stm32mp157c-ev1_sample.tsv
@@ -7,4 +7,4 @@ P	0x06	ssbl	Binary	mmc1	0x00080000	u-boot-stm32mp157c-ev1-trusted.stm32
 P	0x21	bootfs	System	mmc1	0x00280000	st-image-bootfs-openstlinux-weston-stm32mp1.ext4
 P	0x22	vendorfs	FileSystem	mmc1	0x04280000	st-image-vendorfs-openstlinux-weston-stm32mp1.ext4
 P	0x23	rootfs	FileSystem	mmc1	0x05280000	st-image-weston-openstlinux-weston-stm32mp1.ext4
-P	0x24	userfs	FileSystem	mmc1	0x34100000	st-image-userfs-openstlinux-weston-stm32mp1.ext4
+P	0x24	userfs	FileSystem	mmc1	0x33C80000	st-image-userfs-openstlinux-weston-stm32mp1.ext4
diff --git a/files/flashlayouts/FlashLayout_nor-emmc_stm32mp157c-ev1_sample.tsv b/files/flashlayouts/FlashLayout_nor-emmc_stm32mp157c-ev1_sample.tsv
index 89210a8..fcfaaf2 100644
--- a/files/flashlayouts/FlashLayout_nor-emmc_stm32mp157c-ev1_sample.tsv
+++ b/files/flashlayouts/FlashLayout_nor-emmc_stm32mp157c-ev1_sample.tsv
@@ -9,6 +9,6 @@ PE	0x10	empty	Binary	nor0	0x002C0000	none
 P	0x21	bootfs	System	mmc1	0x00080000	st-image-bootfs-openstlinux-weston-stm32mp1.ext4
 P	0x22	vendorfs	FileSystem	mmc1	0x04080000	st-image-vendorfs-openstlinux-weston-stm32mp1.ext4
 P	0x23	rootfs	FileSystem	mmc1	0x05080000	st-image-weston-openstlinux-weston-stm32mp1.ext4
-P	0x24	userfs	FileSystem	mmc1	0x33F00000	st-image-userfs-openstlinux-weston-stm32mp1.ext4
+P	0x24	userfs	FileSystem	mmc1	0x33A80000	st-image-userfs-openstlinux-weston-stm32mp1.ext4
 PED	0x40	nandall	RawImage	nand0	0x0	none
 PED	0x60	sdcardall	RawImage	mmc0	0x0	none
diff --git a/files/flashlayouts/FlashLayout_nor-nand-4-256_stm32mp157c-ev1_sample.tsv b/files/flashlayouts/FlashLayout_nor-nand-4-256_stm32mp157c-ev1_sample.tsv
index 46fa1dc..bf840f3 100644
--- a/files/flashlayouts/FlashLayout_nor-nand-4-256_stm32mp157c-ev1_sample.tsv
+++ b/files/flashlayouts/FlashLayout_nor-nand-4-256_stm32mp157c-ev1_sample.tsv
@@ -6,8 +6,11 @@ P	0x05	fsbl2	Binary	nor0	0x00040000	tf-a-stm32mp157c-ev1-trusted.stm32
 P	0x06	ssbl	Binary	nor0	0x00080000	u-boot-stm32mp157c-ev1-trusted.stm32
 PED	0x20	env	Binary	nor0	0x00280000	none
 PE	0x10	empty	Binary	nor0	0x002C0000	none
-PE	0x11	empty2	Binary	nand0	0x00000000	none
-PE	0x12	empty3	Binary	nand0	0x00200000	none
-PE	0x13	empty4	Binary	nand0	0x00400000	none
+PE	0x11	emptyfsbl1	Binary	nand0	0x00000000	none
+PE	0x12	emptyssbl	Binary	nand0	0x00200000	none
+PE	0x13	emptyssbl2	Binary	nand0	0x00400000	none
 P	0x21	ubifs	System	nand0	0x00600000	st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi
+PED	0x08	emmcfsbl1	Binary	mmc1	boot1	none
+PED	0x09	emmcfsbl2	Binary	mmc1	boot2	none
+PED	0x30	emmcall	RawImage	mmc1	0x0	none
 PED	0x60	sdcardall	RawImage	mmc0	0x0	none
diff --git a/files/flashlayouts/FlashLayout_nor-sdcard_stm32mp157c-ev1_sample.tsv b/files/flashlayouts/FlashLayout_nor-sdcard_stm32mp157c-ev1_sample.tsv
index 2f987df..5c0c9e6 100644
--- a/files/flashlayouts/FlashLayout_nor-sdcard_stm32mp157c-ev1_sample.tsv
+++ b/files/flashlayouts/FlashLayout_nor-sdcard_stm32mp157c-ev1_sample.tsv
@@ -9,4 +9,8 @@ PE	0x10	empty	Binary	nor0	0x002C0000	none
 P	0x21	bootfs	System	mmc0	0x00004400	st-image-bootfs-openstlinux-weston-stm32mp1.ext4
 P	0x22	vendorfs	FileSystem	mmc0	0x04004400	st-image-vendorfs-openstlinux-weston-stm32mp1.ext4
 P	0x23	rootfs	FileSystem	mmc0	0x05004400	st-image-weston-openstlinux-weston-stm32mp1.ext4
-P	0x24	userfs	FileSystem	mmc0	0x33E70400	st-image-userfs-openstlinux-weston-stm32mp1.ext4
+P	0x24	userfs	FileSystem	mmc0	0x33A04400	st-image-userfs-openstlinux-weston-stm32mp1.ext4
+PED	0x08	emmcfsbl1	Binary	mmc1	boot1	none
+PED	0x09	emmcfsbl2	Binary	mmc1	boot2	none
+PED	0x30	emmcall	RawImage	mmc1	0x0	none
+PED	0x40	nandall	RawImage	nand0	0x0	none
diff --git a/files/flashlayouts/FlashLayout_sdcard_stm32mp157c-ev1_sample.tsv b/files/flashlayouts/FlashLayout_sdcard_stm32mp157c-ev1_sample.tsv
index 5de5e46..ec51be5 100644
--- a/files/flashlayouts/FlashLayout_sdcard_stm32mp157c-ev1_sample.tsv
+++ b/files/flashlayouts/FlashLayout_sdcard_stm32mp157c-ev1_sample.tsv
@@ -7,4 +7,4 @@ P	0x06	ssbl	Binary	mmc0	0x00084400	u-boot-stm32mp157c-ev1-trusted.stm32
 P	0x21	bootfs	System	mmc0	0x00284400	st-image-bootfs-openstlinux-weston-stm32mp1.ext4
 P	0x22	vendorfs	FileSystem	mmc0	0x04284400	st-image-vendorfs-openstlinux-weston-stm32mp1.ext4
 P	0x23	rootfs	FileSystem	mmc0	0x05284400	st-image-weston-openstlinux-weston-stm32mp1.ext4
-P	0x24	userfs	FileSystem	mmc0	0x340F0400	st-image-userfs-openstlinux-weston-stm32mp1.ext4
+P	0x24	userfs	FileSystem	mmc0	0x33C84400	st-image-userfs-openstlinux-weston-stm32mp1.ext4