diff --git a/conf/machine/include/st-machine-common-stm32mp.inc b/conf/machine/include/st-machine-common-stm32mp.inc
index a8521d1..a04c376 100644
--- a/conf/machine/include/st-machine-common-stm32mp.inc
+++ b/conf/machine/include/st-machine-common-stm32mp.inc
@@ -162,7 +162,8 @@ UBINIZE_ARGS_nand_4_256 = "--min-io-size 4096 --peb-size 256KiB"
 EXTRA_UBIFS_SIZE_nand_4_256 = "2304"
 
 # Default FSTYPES requested
-IMAGE_FSTYPES ?= "tar.xz ext4"
+WKS_IMAGE_FSTYPES ?= ""
+IMAGE_FSTYPES ?= "${WKS_IMAGE_FSTYPES} tar.xz ext4"
 
 # Define specific EXT4 command line:
 #   - Create minimal inode number (as it is done by default in image_types.bbclass)
diff --git a/conf/machine/stm32mp1-disco.conf b/conf/machine/stm32mp1-disco.conf
index 3aed654..2c4f2c5 100644
--- a/conf/machine/stm32mp1-disco.conf
+++ b/conf/machine/stm32mp1-disco.conf
@@ -96,5 +96,5 @@ TRUSTED_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-d
 OPTEE_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in','sdcard-stm32mp157c-dk2-optee-1GB.wks.in',d)}"
 
 # for generated a WIC file, please uncomment the 2 following lines or add them to local.conf
-#IMAGE_FSTYPES += "wic ext4"
+#WKS_IMAGE_FSTYPES += "wic wic.bz2 wic.bmap"
 #WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', '${OPTEE_WIC_FILE}', '${TRUSTED_WIC_FILE}', d)}"
diff --git a/recipes-st/images/st-image-bootfs.bb b/recipes-st/images/st-image-bootfs.bb
index 014b9f2..5f3f303 100644
--- a/recipes-st/images/st-image-bootfs.bb
+++ b/recipes-st/images/st-image-bootfs.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 
 inherit core-image
 
-IMAGE_FSTYPES_remove = "wic"
+# WIC image generation is not needed for this image
+IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
 
 IMAGE_NAME_SUFFIX = ".${STM32MP_BOOTFS_LABEL}fs"
 
diff --git a/recipes-st/images/st-image-userfs.bb b/recipes-st/images/st-image-userfs.bb
index 025e3b9..4c317aa 100644
--- a/recipes-st/images/st-image-userfs.bb
+++ b/recipes-st/images/st-image-userfs.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 
 inherit core-image
 
-IMAGE_FSTYPES_remove = "wic"
+# WIC image generation is not needed for this image
+IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
 
 IMAGE_NAME_SUFFIX = ".${STM32MP_USERFS_LABEL}"
 
diff --git a/recipes-st/images/st-image-vendorfs.bb b/recipes-st/images/st-image-vendorfs.bb
index b6dca1b..9652615 100644
--- a/recipes-st/images/st-image-vendorfs.bb
+++ b/recipes-st/images/st-image-vendorfs.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 
 inherit core-image
 
-IMAGE_FSTYPES_remove = "wic"
+# WIC image generation is not needed for this image
+IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
 
 IMAGE_NAME_SUFFIX = ".${STM32MP_VENDORFS_LABEL}"