diff --git a/auto/config b/auto/config
index 6c56ca3..bcc5ac9 100755
--- a/auto/config
+++ b/auto/config
@@ -123,10 +123,6 @@ if [ -n "$enable_pu" ]; then
 		> config/archives/kali-proposed-updates.list.binary
 fi
 
-# XXX: --firmware-chroot has been set to false to work around
-# https://bugs.debian.org/1018873 and we deemed that acceptable because
-# kali-linux-headless already pulls kali-linux-firmware so most firmwares
-# will continue to be installed
 lb config noauto \
 	--apt-indices=false \
 	--distribution "$dist" \
@@ -138,7 +134,7 @@ lb config noauto \
 	--backports false \
 	--source false \
 	--firmware-binary true \
-	--firmware-chroot false \
+	--firmware-chroot true \
 	--mirror-bootstrap "$kali_mirror" \
 	--mirror-debian-installer "$kali_mirror" \
 	--mirror-binary "$public_kali_mirror" \