diff --git a/conf/layer.conf b/conf/layer.conf
index d2e2a7b..0346bca 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -20,8 +20,8 @@ PREFERRED_VERSION_linux-megi = "6.12.10"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-megous"
 PREFERRED_PROVIDER_u-boot = "u-boot-megous"
 
-INITRAMFS_FSTYPES = "cpio.lz4.u-boot"
-KERNEL_IMAGETYPE = "Image.gz"
+#INITRAMFS_FSTYPES = "cpio.lz4.u-boot"
+#KERNEL_IMAGETYPE = "Image.gz"
 
 #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_ARCH}"
 #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
diff --git a/recipes-bsp/diya-overlay/diya-overlay.bbappend b/recipes-bsp/diya-overlay/diya-overlay.bbappend
deleted file mode 100644
index a004edd..0000000
--- a/recipes-bsp/diya-overlay/diya-overlay.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += " file://resize2fs.service file://firstboot file://expandfs \
-            "
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "resize2fs.service"
-
-do_install:append () {
-    install -m 0644 ${UNPACKDIR}/firstboot ${D}${sysconfdir}/firstboot
-    install -m 0755 ${UNPACKDIR}/expandfs ${D}/usr/sbin/expandfs
-    install -D -p -m0644 ${UNPACKDIR}/resize2fs.service \
-      ${D}${systemd_unitdir}/system/resize2fs.service
-}
\ No newline at end of file
diff --git a/recipes-bsp/diya-overlay/files/expandfs b/recipes-bsp/diya-overlay/files/expandfs
deleted file mode 100644
index 351c523..0000000
--- a/recipes-bsp/diya-overlay/files/expandfs
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-. /etc/profile
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-PARTNO=4
-if [ -z "$DISK" ]; then
-    DISK="mmcblk0"
-fi
-
-if [ "$(/usr/bin/id -u)" -ne 0 ]; then
-    echo "$0 shall be run as root"
-    exit 1
-fi
-yes | parted  ---pretend-input-tty  /dev/mmcblk0 resizepart ${PARTNO} 100%
-resize2fs /dev/${DISK}p${PARTNO}
\ No newline at end of file
diff --git a/recipes-bsp/diya-overlay/files/firstboot b/recipes-bsp/diya-overlay/files/firstboot
deleted file mode 100644
index e69de29..0000000
diff --git a/recipes-bsp/diya-overlay/files/resize2fs.service b/recipes-bsp/diya-overlay/files/resize2fs.service
deleted file mode 100644
index 40f0a9a..0000000
--- a/recipes-bsp/diya-overlay/files/resize2fs.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Resize home partition
-ConditionPathExists=/etc/firstboot
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/expandfs
-ExecStartPost=rm /etc/firstboot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
index f0d7864..1a6ef76 100644
--- a/recipes-core/images/core-image-base.bbappend
+++ b/recipes-core/images/core-image-base.bbappend
@@ -6,4 +6,5 @@ IMAGE_INSTALL:append:pinephone = " \
     modemmanager \
     gpsd \
     gps-utils \
+    diya-resizefs \
     "
\ No newline at end of file