diff --git a/auto/config b/auto/config
index bcc5ac9..ce9c71b 100755
--- a/auto/config
+++ b/auto/config
@@ -117,9 +117,9 @@ cp -rT kali-config/common config
 
 if [ -n "$enable_pu" ]; then
 	mkdir -p config/archives
-	echo "deb $kali_mirror $dist-proposed-updates main contrib non-free" \
+	echo "deb $kali_mirror $dist-proposed-updates main contrib non-free non-free-firmware" \
 		> config/archives/kali-proposed-updates.list.chroot
-	echo "deb $public_kali_mirror $dist-proposed-updates main contrib non-free" \
+	echo "deb $public_kali_mirror $dist-proposed-updates main contrib non-free non-free-firmware" \
 		> config/archives/kali-proposed-updates.list.binary
 fi
 
@@ -127,7 +127,7 @@ lb config noauto \
 	--apt-indices=false \
 	--distribution "$dist" \
 	--debian-installer-distribution "$dist" \
-	--archive-areas "main contrib non-free" \
+	--archive-areas "main contrib non-free non-free-firmware" \
 	--debootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg" \
 	--keyring-packages kali-archive-keyring \
 	--updates false \
diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 42db0ee..9cc5232 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -17,10 +17,10 @@ configure_sources_list() {
 
     cat >/etc/apt/sources.list <<END
 # See https://www.kali.org/docs/general-use/kali-linux-sources-list-repositories/
-deb http://http.kali.org/kali kali-rolling main contrib non-free
+deb http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware
 
 # Additional line for source packages
-# deb-src http://http.kali.org/kali kali-rolling main contrib non-free
+# deb-src http://http.kali.org/kali kali-rolling main contrib non-free non-free-firmware
 END
     apt-get update
 }
diff --git a/kali-config/common/includes.installer/preseed.cfg b/kali-config/common/includes.installer/preseed.cfg
index 848fede..eabc6bf 100644
--- a/kali-config/common/includes.installer/preseed.cfg
+++ b/kali-config/common/includes.installer/preseed.cfg
@@ -15,6 +15,7 @@ d-i apt-setup/services-select multiselect
 
 # Enable contrib and non-free
 d-i apt-setup/non-free boolean true
+d-i apt-setup/non-free-firmware boolean true
 d-i apt-setup/contrib boolean true
 
 # Disable CDROM entries after install
diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf
index d7dccd6..91de782 100644
--- a/simple-cdd/simple-cdd.conf
+++ b/simple-cdd/simple-cdd.conf
@@ -43,7 +43,7 @@ debian_mirror=${debian_mirror:-http://archive.kali.org/kali/}
 keyring="/usr/share/keyrings/kali-archive-keyring.gpg"
 
 # which components to get from the mirror
-mirror_components="main contrib non-free"
+mirror_components="main contrib non-free non-free-firmware"
 
 # Disable *-security and *-updates repositories
 security_mirror=""
@@ -78,7 +78,7 @@ export OMIT_DOC_TOOLS=1
 export DOJIGDO=0
 export NORECOMMENDS=0
 export NONFREE=1
-export NONFREE_COMPONENTS="non-free"
+export NONFREE_COMPONENTS="non-free non-free-firmware"
 export CONTRIB=1
 export FORCE_FIRMWARE=1
 export ARCHIVE_KEYRING_PACKAGE=kali-archive-keyring