diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index 0e4240e1a..a426af847 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -15,6 +15,8 @@ UBOOT_SUFFIX = "imx"
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6sbc_defconfig"
 
+STORAGE_MEDIA = "mmc"
+
 # Wireless external module
 WIRELESS_MODULE ?= ""
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index 5465cebfc..96349cf22 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -12,6 +12,8 @@ include conf/machine/include/tune-cortexa7.inc
 UBOOT_PREFIX = "u-boot"
 UBOOT_SUFFIX = "imx"
 
+STORAGE_MEDIA = "mtd"
+
 # Bluetooth interface
 BT_DEVICE_NAME ?= "cc6ul"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
index 32905e6e1..4f947eb48 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc
@@ -22,6 +22,8 @@ SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
 
+STORAGE_MEDIA = "mmc"
+
 # Bluetooth interface
 BT_DEVICE_NAME ?= "cc8mn"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index e1f2c67e1..873296c9f 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -29,6 +29,8 @@ RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_3
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
 
+STORAGE_MEDIA = "mmc"
+
 # Bluetooth interface
 BT_DEVICE_NAME ?= "cc8x"
 
diff --git a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
index 7ce5d3949..15cc4481e 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
@@ -5,6 +5,8 @@ LICENSE = "MIT"
 
 PACKAGE_INSTALL = " \
     busybox \
+    ${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'e2fsprogs-mke2fs', '', d)} \
+    ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
     psplash \
     recovery-initramfs \
     swupdate \
@@ -13,11 +15,6 @@ PACKAGE_INSTALL = " \
     wipe \
 "
 
-PACKAGE_INSTALL_append_ccimx6 = " e2fsprogs-mke2fs"
-PACKAGE_INSTALL_append_ccimx6ul = " mtd-utils-ubifs"
-PACKAGE_INSTALL_append_ccimx8x = " e2fsprogs-mke2fs"
-PACKAGE_INSTALL_append_ccimx8mn = " e2fsprogs-mke2fs"
-
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
 IMAGE_LINGUAS = ""
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
index 46b69834f..25e3e9e3a 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
@@ -53,7 +53,4 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-RDEPENDS_${PN}_append_ccimx6sbc = " cryptsetup"
-RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
-RDEPENDS_${PN}_append_ccimx8x = " cryptsetup"
-RDEPENDS_${PN}_append_ccimx8mn = " cryptsetup"
+RDEPENDS_${PN}_append = "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', ' cryptsetup', '', d)}"