diff --git a/recipes-bsp/images/initramfs-firmware-db8074-image.bb b/recipes-bsp/images/initramfs-firmware-db8074-image.bb
new file mode 100644
index 000000000..c531a2316
--- /dev/null
+++ b/recipes-bsp/images/initramfs-firmware-db8074-image.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Tiny ramdisk image with Dragonboard APQ8074 firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-dragonboard-apq8074 \
+"
+
+require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb b/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb
new file mode 100644
index 000000000..c667b7779
--- /dev/null
+++ b/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-ifc6560 \
+"
+
+BAD_RECOMMENDATIONS = "\
+    linux-firmware-qcom-sda660-audio \
+    linux-firmware-qcom-sda660-compute \
+    linux-firmware-qcom-sda660-modem \
+    linux-firmware-qcom-sda660-venus \
+    linux-firmware-qca \
+    linux-firmware-ath10k \
+"
+
+require initramfs-firmware-image.inc
diff --git a/recipes-test/images/initramfs-firmware-image.bb b/recipes-bsp/images/initramfs-firmware-image.bb
similarity index 67%
rename from recipes-test/images/initramfs-firmware-image.bb
rename to recipes-bsp/images/initramfs-firmware-image.bb
index e3fb61ba7..61b2e95c3 100644
--- a/recipes-test/images/initramfs-firmware-image.bb
+++ b/recipes-bsp/images/initramfs-firmware-image.bb
@@ -1,10 +1,5 @@
 DESCRIPTION = "Tiny ramdisk image with firmware files"
 
-# We do not use kernel image or kernel modules in the image, so remove the
-# dependency on the kernel
-KERNELDEPMODDEPEND = ""
-KERNEL_DEPLOY_DEPEND = ""
-
 # Do not install anything by default
 PACKAGE_INSTALL = ""
 
@@ -31,14 +26,4 @@ PACKAGE_INSTALL:qcom-armv7a = " \
     firmware-qcom-nexus7-2013 \
 "
 
-IMAGE_LINGUAS = ""
-LICENSE = "MIT"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-
-# Inhibit installing /init
-IMAGE_BUILDING_DEBUGFS = "true"
+require initramfs-firmware-image.inc
diff --git a/recipes-test/images/initramfs-firmware-rb12-image.bb b/recipes-bsp/images/initramfs-firmware-image.inc
similarity index 56%
rename from recipes-test/images/initramfs-firmware-rb12-image.bb
rename to recipes-bsp/images/initramfs-firmware-image.inc
index 10379093c..c8b05c363 100644
--- a/recipes-test/images/initramfs-firmware-rb12-image.bb
+++ b/recipes-bsp/images/initramfs-firmware-image.inc
@@ -1,21 +1,8 @@
-DESCRIPTION = "Tiny ramdisk image with RB1/RB2 devices firmware files"
-
 # We do not use kernel image or kernel modules in the image, so remove the
 # dependency on the kernel
 KERNELDEPMODDEPEND = ""
 KERNEL_DEPLOY_DEPEND = ""
 
-PACKAGE_INSTALL += " \
-    packagegroup-firmware-rb1 \
-    packagegroup-firmware-rb2 \
-"
-
-BAD_RECOMMENDATIONS = " \
-    firmware-qcom-rb1-dspso \
-    firmware-qcom-rb2-dspso \
-    linux-firmware-qcom-venus-6.0 \
-"
-
 IMAGE_LINGUAS = ""
 LICENSE = "MIT"
 
diff --git a/recipes-test/images/initramfs-firmware-nexus-image.bb b/recipes-bsp/images/initramfs-firmware-nexus-image.bb
similarity index 66%
rename from recipes-test/images/initramfs-firmware-nexus-image.bb
rename to recipes-bsp/images/initramfs-firmware-nexus-image.bb
index f47b26e58..668d99334 100644
--- a/recipes-test/images/initramfs-firmware-nexus-image.bb
+++ b/recipes-bsp/images/initramfs-firmware-nexus-image.bb
@@ -1,10 +1,5 @@
 DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files"
 
-# We do not use kernel image or kernel modules in the image, so remove the
-# dependency on the kernel
-KERNELDEPMODDEPEND = ""
-KERNEL_DEPLOY_DEPEND = ""
-
 # Firmware support for newer Nexus and Pixel devices depends on simg2img, which
 # is provided by the meta-oe only. So they are split into the bbappend in
 # dynamic-layers/openembedded-layer.
@@ -26,14 +21,4 @@ PACKAGE_INSTALL += " \
     firmware-qcom-pixel5a-5g \
 "
 
-IMAGE_LINGUAS = ""
-LICENSE = "MIT"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-
-# Inhibit installing /init
-IMAGE_BUILDING_DEBUGFS = "true"
+require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-rb12-image.bb b/recipes-bsp/images/initramfs-firmware-rb12-image.bb
new file mode 100644
index 000000000..30c793a01
--- /dev/null
+++ b/recipes-bsp/images/initramfs-firmware-rb12-image.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Tiny ramdisk image with RB1/RB2 devices firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-rb1 \
+    packagegroup-firmware-rb2 \
+"
+
+BAD_RECOMMENDATIONS = " \
+    firmware-qcom-rb1-dspso \
+    firmware-qcom-rb2-dspso \
+    linux-firmware-qcom-venus-6.0 \
+"
+
+require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb
new file mode 100644
index 000000000..3ffcbe712
--- /dev/null
+++ b/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tiny ramdisk image with SM8150 HDK devices firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-sm8150-hdk \
+"
+
+BAD_RECOMMENDATIONS = " \
+    linux-firmware-qcom-sm8150-sensors \
+"
+
+require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb
new file mode 100644
index 000000000..587012e3c
--- /dev/null
+++ b/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Tiny ramdisk image with SM8350 HDK devices firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-sm8350-hdk \
+"
+
+BAD_RECOMMENDATIONS = " \
+    linux-firmware-qcom-sm8350-sensors \
+"
+
+require initramfs-firmware-image.inc