diff --git a/recipes-kernel/images/esp-qcom-image.bb b/recipes-kernel/images/esp-qcom-image.bb
index 50e50378b..ff33205a0 100644
--- a/recipes-kernel/images/esp-qcom-image.bb
+++ b/recipes-kernel/images/esp-qcom-image.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "EFI System Partition Image to boot Qualcomm boards"
 PACKAGE_INSTALL = " \
     linux-qcom-uki \
     systemd-boot \
-    systemd-bootconf \
 "
 
 KERNELDEPMODDEPEND = ""
@@ -14,4 +13,19 @@ inherit image
 IMAGE_FSTYPES = "vfat"
 IMAGE_FSTYPES_DEBUGFS = ""
 
-LINGUAS_INSTALL = ""
+# UFS requires vfat sector size of 4096 (default is 512)
+VFAT_SECTOR_SIZE ?= "4096"
+EXTRA_IMAGECMD:vfat += " -S ${VFAT_SECTOR_SIZE}"
+
+# Align image size with the expected partition size (512MB)
+IMAGE_ROOTFS_SIZE = "524288"
+IMAGE_ROOTFS_MAXSIZE = "524288"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+IMAGE_LINGUAS = ""
+IMAGE_FEATURES = ""
+
+remove_unused_files() {
+    find ${IMAGE_ROOTFS} -mindepth 1 ! -path "${IMAGE_ROOTFS}/EFI*" -exec rm -rf {} +
+}
+IMAGE_PREPROCESS_COMMAND:append = " remove_unused_files"