diff --git a/classes/flashlayout-stm32mp.bbclass b/classes/flashlayout-stm32mp.bbclass
index c626024..aa41908 100644
--- a/classes/flashlayout-stm32mp.bbclass
+++ b/classes/flashlayout-stm32mp.bbclass
@@ -120,7 +120,7 @@ FLASHLAYOUT_CONFIGURE_FILES ??= ""
 # -----------------------------------------------------------------------------
 python __anonymous () {
     flashlayout_config = d.getVar('ENABLE_FLASHLAYOUT_CONFIG')
-    if flashlayout_config:
+    if flashlayout_config == "1":
         # Gather all current tasks
         tasks = filter(lambda k: d.getVarFlag(k, "task", True), d.keys())
         for task in tasks:
diff --git a/classes/st-partitions-image.bbclass b/classes/st-partitions-image.bbclass
index dc06fdf..29777a0 100755
--- a/classes/st-partitions-image.bbclass
+++ b/classes/st-partitions-image.bbclass
@@ -38,6 +38,10 @@ python __anonymous () {
 }
 
 image_rootfs_image_clean_task () {
+    if [ ${ENABLE_PARTITIONS_IMAGE} -ne "1" ]; then
+        return
+    fi
+
     for name in ${PARTITIONS_IMAGE};
     do
         if `echo ${IMAGE_NAME} | grep -q $name` ;