diff --git a/layers/meta-balena-generic/recipes-core/images/balena-image.inc b/layers/meta-balena-generic/recipes-core/images/balena-image.inc
index 6d5c4bc2f..434a761fb 100644
--- a/layers/meta-balena-generic/recipes-core/images/balena-image.inc
+++ b/layers/meta-balena-generic/recipes-core/images/balena-image.inc
@@ -31,3 +31,6 @@ IMAGE_INSTALL:append = " \
     linux-firmware \
     efibootmgr \
     "
+
+# Disable firmware exclusion
+BALENA_FIRMWARE_EXCLUSION_ENABLED = "0"
diff --git a/layers/meta-balena-generic/recipes-kernel/linux-firmware/files/generic_WHENCE b/layers/meta-balena-generic/recipes-kernel/linux-firmware/files/generic_WHENCE
new file mode 100644
index 000000000..bf963b503
--- /dev/null
+++ b/layers/meta-balena-generic/recipes-kernel/linux-firmware/files/generic_WHENCE
@@ -0,0 +1,8 @@
+--------------------------------------------------------------------------
+
+Driver: iwlwifi - Intel Wireless Wifi
+
+File: iwlwifi-so-a0-gf-a0-64.ucode
+
+--------------------------------------------------------------------------
+
diff --git a/layers/meta-balena-generic/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/layers/meta-balena-generic/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 74eefc723..ec2aa6d7e 100644
--- a/layers/meta-balena-generic/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/layers/meta-balena-generic/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:${THISDIR}/files/ax211:"
 
+SRC_URI:append = " file://generic_WHENCE"
+
 # NOTE: These files show be removed once linux-firmware is updated in meta-balena,
 # see README.
 SRC_URI:append = " \
@@ -16,8 +18,8 @@ PACKAGES =+ " \
 
 
 FILES:${PN}-ibt-40-41  = " \
-    ${nonarch_base_libdir}/firmware/intel/ibt-0040-0041.ddc \
-    ${nonarch_base_libdir}/firmware/intel/ibt-0040-0041.sfi \
+    ${nonarch_base_libdir}/firmware/intel/ibt-0040-0041.ddc* \
+    ${nonarch_base_libdir}/firmware/intel/ibt-0040-0041.sfi* \
 "
 
 LICENSE:${PN}-ibt-40-41 = "Firmware-ibt_firmware"
@@ -25,8 +27,8 @@ RDEPENDS:${PN}-ibt-40-41 = "${PN}-ibt-license"
 
 
 FILES:${PN}-iwlwifi-so-a0  = " \
-    ${nonarch_base_libdir}/firmware/iwlwifi-so-a0-gf-a0-64.ucode \
-    ${nonarch_base_libdir}/firmware/iwlwifi-so-a0-gf-a0.pnvm \
+    ${nonarch_base_libdir}/firmware/iwlwifi-so-a0-gf-a0-64.ucode* \
+    ${nonarch_base_libdir}/firmware/iwlwifi-so-a0-gf-a0.pnvm* \
 "
 LICENSE:${PN}-iwlwifi-so-a0 = "Firmware-iwlwifi_firmware"
 RDEPENDS:${PN}-iwlwifi-so-a0 = "${PN}-iwlwifi-license"