diff --git a/recipes-bsp/images-woa/initramfs-firmware-lenovo-t14s-g6-image.bb b/recipes-bsp/images-woa/initramfs-firmware-lenovo-t14s-g6-image.bb
new file mode 100644
index 0000000..3c95a29
--- /dev/null
+++ b/recipes-bsp/images-woa/initramfs-firmware-lenovo-t14s-g6-image.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Tiny ramdisk image with Lenovo T14s G6 firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-lenovo-t14s-g6 \
+"
+
+require recipes-bsp/images/initramfs-firmware-image.inc
diff --git a/recipes-bsp/images-woa/initramfs-firmware-lenovo-x13s-image.bb b/recipes-bsp/images-woa/initramfs-firmware-lenovo-x13s-image.bb
new file mode 100644
index 0000000..65a9336
--- /dev/null
+++ b/recipes-bsp/images-woa/initramfs-firmware-lenovo-x13s-image.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Tiny ramdisk image with Lenovo X13s firmware files"
+
+PACKAGE_INSTALL += " \
+    packagegroup-firmware-lenovo-x13s \
+"
+
+require recipes-bsp/images/initramfs-firmware-image.inc
diff --git a/recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-t14s-g6.bb b/recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-t14s-g6.bb
new file mode 100644
index 0000000..0a972e4
--- /dev/null
+++ b/recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-t14s-g6.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Firmware packages for the Lenovo T14s G6 laptop"
+
+inherit packagegroup
+
+RRECOMMENDS:${PN} += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-g750 linux-firmware-qcom-x1e80100-lenovo-t14s-g6-adreno', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
+    linux-firmware-qcom-x1e80100-lenovo-t14s-g6-audio \
+    linux-firmware-qcom-x1e80100-lenovo-t14s-g6-compute \
+"
diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb b/recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-x13s.bb
similarity index 81%
rename from recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb
rename to recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-x13s.bb
index 545c05e..1b5133e 100644
--- a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb
+++ b/recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-x13s.bb
@@ -3,8 +3,8 @@ SUMMARY = "Firmware packages for the Lenovo X13s laptop"
 inherit packagegroup
 
 RRECOMMENDS:${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-sc8280xp-lenovo-x13s-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a660 linux-firmware-qcom-sc8280xp-lenovo-x13s-adreno', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-wcn6855', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca2066', '', d)} \
     linux-firmware-qcom-sc8280xp-lenovo-x13s-audio \
     linux-firmware-qcom-sc8280xp-lenovo-x13s-compute \
diff --git a/recipes-bsp/packagegroups-woa/packagegroup-firmware-x1e80100-crd.bb b/recipes-bsp/packagegroups-woa/packagegroup-firmware-x1e80100-crd.bb
index 5fabde3..02b0ac2 100644
--- a/recipes-bsp/packagegroups-woa/packagegroup-firmware-x1e80100-crd.bb
+++ b/recipes-bsp/packagegroups-woa/packagegroup-firmware-x1e80100-crd.bb
@@ -5,7 +5,7 @@ inherit packagegroup
 RRECOMMENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-g750 linux-firmware-qcom-x1e80100-adreno', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k linux-firmware-qcom-x1e80100-wifi', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850 linux-firmware-qcom-x1e80100-wifi', '', d)} \
     firmware-qcom-x1e80100 \
     linux-firmware-qcom-x1e80100-audio \
     linux-firmware-qcom-x1e80100-compute \