diff --git a/conf/site.conf b/conf/site.conf
index 65105014e..11ab6a1b1 100644
--- a/conf/site.conf
+++ b/conf/site.conf
@@ -8,6 +8,9 @@ SCONF_VERSION = "1"
 # Modify the following if you need to change the types of images generated
 # most of the time, this is set by the machine conf or in a custom image
 # recipe.
+# Ensure that meta-yoe/recipes-core/images/yoe-initramfs-image.bb is removing
+# all these appends, otherwise it can cause parsing cycles on some riscv machines
+# e.g. unmatched
 IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
 IMAGE_FSTYPES:remove:qemuall = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"
 
diff --git a/sources/meta-yoe/recipes-core/images/yoe-initramfs-image.bb b/sources/meta-yoe/recipes-core/images/yoe-initramfs-image.bb
index 7edfde1a3..a1e740475 100644
--- a/sources/meta-yoe/recipes-core/images/yoe-initramfs-image.bb
+++ b/sources/meta-yoe/recipes-core/images/yoe-initramfs-image.bb
@@ -25,6 +25,9 @@ PACKAGE_INSTALL = "\
   util-linux-fdisk \
   "
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+# Check conf/site.conf where there is IMAGE_FSTYPES:append
+# if that value changes make the change here as well
+IMAGE_FSTYPES:remove = "wic.* wic.xz wic.bmap tar.xz"
 inherit core-image
 
 IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"