diff --git a/debian/changelog b/debian/changelog
index 2cf55c7..72169c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-build (1:20220505kali2) kali-dev; urgency=medium
+
+  * Do not consider nvidia-tesla-* firmwares, it causes the ISO build to fail.
+
+ -- Sophie Brun <sophie@offensive-security.com>  Fri, 02 Sep 2022 12:08:57 +0200
+
 live-build (1:20220505kali1) kali-dev; urgency=medium
 
   * Synchronize with Debian. Remaining changes:
diff --git a/functions/firmwarelists.sh b/functions/firmwarelists.sh
index 572e567..2f9497e 100755
--- a/functions/firmwarelists.sh
+++ b/functions/firmwarelists.sh
@@ -48,7 +48,10 @@
 			fi
 
 			local PACKAGES
-			PACKAGES="$(gunzip -c "${CONTENTS_FILE}" | awk '/^lib\/firmware/ { print $2 }' | sort -u )"
+			# remove the nvidia-tesla firmwares and also add
+			# || true because grep fails if there is no
+			# content (like in Contrib)
+			PACKAGES="$(gunzip -c "${CONTENTS_FILE}" | awk '/^lib\/firmware/ { print $2 }' | sort -u | grep -v nvidia-tesla- || true)"
 			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} ${PACKAGES}"
 
 			# Don't waste disk space, if not making use of caching