diff --git a/recipes-kernel/images/initramfs-qcom-image.bb b/recipes-kernel/images/initramfs-qcom-image.bb
new file mode 100644
index 000000000..dd6ac1298
--- /dev/null
+++ b/recipes-kernel/images/initramfs-qcom-image.bb
@@ -0,0 +1,5 @@
+require initramfs-rootfs-image.bb
+
+DESCRIPTION = "Ramdisk image for Qualcomm boards"
+
+PACKAGE_INSTALL += "packagegroup-qcom-boot"
diff --git a/recipes-kernel/linux/linux-qcom-6.18/configs/bsp-additions.cfg b/recipes-kernel/linux/linux-qcom-6.18/configs/bsp-additions.cfg
index aed21d841..e67f70e21 100644
--- a/recipes-kernel/linux/linux-qcom-6.18/configs/bsp-additions.cfg
+++ b/recipes-kernel/linux/linux-qcom-6.18/configs/bsp-additions.cfg
@@ -1,6 +1,5 @@
 # for UFS enumeration
 CONFIG_PHY_QCOM_QMP=y
-CONFIG_SCSI_UFS_QCOM=y
 CONFIG_SM_TCSRCC_8750=y
 CONFIG_CLK_KAANAPALI_TCSRCC=y
 
diff --git a/recipes-kernel/linux/linux-qcom-next/configs/bsp-additions.cfg b/recipes-kernel/linux/linux-qcom-next/configs/bsp-additions.cfg
index 266b73b6f..bbe8c9a98 100644
--- a/recipes-kernel/linux/linux-qcom-next/configs/bsp-additions.cfg
+++ b/recipes-kernel/linux/linux-qcom-next/configs/bsp-additions.cfg
@@ -1,6 +1,5 @@
 # for UFS enumeration
 CONFIG_PHY_QCOM_QMP=y
-CONFIG_SCSI_UFS_QCOM=y
 CONFIG_SM_TCSRCC_8750=y
 CONFIG_CLK_KAANAPALI_TCSRCC=y
 
diff --git a/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb b/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb
new file mode 100644
index 000000000..6eec1ea24
--- /dev/null
+++ b/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Qualcomm boot requirements"
+DESCRIPTION = "Storage and boot-critical kernel modules required for Qualcomm platforms"
+
+inherit packagegroup
+
+RRECOMMENDS:${PN} += " \
+    kernel-module-gpucc-sa8775p \
+    kernel-module-phy-qcom-snps-femto-v2 \
+    kernel-module-ufs-qcom \
+"