diff --git a/config/hooks/live/normcap.hook.chroot b/config/hooks/live/normcap.hook.chroot
index df72a8b..0239639 100644
--- a/config/hooks/live/normcap.hook.chroot
+++ b/config/hooks/live/normcap.hook.chroot
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-python3 -m pip install normcap
+python3 -m pip install --break-system-packages normcap
 
diff --git a/config/package-lists/cli.list.chroot b/config/package-lists/cli.list.chroot
index 75f7791..06cd735 100644
--- a/config/package-lists/cli.list.chroot
+++ b/config/package-lists/cli.list.chroot
@@ -21,7 +21,7 @@ lbzip2
 xz-utils
 zstd
 p7zip-full
-p7zip-rar
+#p7zip-rar
 zip
 unzip
 hwinfo
diff --git a/config/package-lists/firmware.list.chroot b/config/package-lists/firmware.list.chroot
index 0d0982e..8a2287c 100644
--- a/config/package-lists/firmware.list.chroot
+++ b/config/package-lists/firmware.list.chroot
@@ -1,28 +1,15 @@
 firmware-amd-graphics
 firmware-atheros
-firmware-bnx2
-firmware-bnx2x
 firmware-brcm80211
-firmware-cavium
-firmware-intel-sound
-firmware-intelwimax
-firmware-ipw2x00
-firmware-ivtv
 firmware-iwlwifi
-firmware-libertas
+firmware-realtek
+firmware-intel-sound
+firmware-sof-signed
+firmware-iwlwifi
+firmware-realtek
 firmware-linux
 firmware-linux-free
 firmware-linux-nonfree
 firmware-misc-nonfree
-firmware-myricom
-firmware-netronome
-firmware-netxen
-firmware-qcom-media
-firmware-qlogic
-firmware-realtek
-firmware-samsung
-firmware-siano
-firmware-ti-connectivity
-firmware-zd1211
 amd64-microcode
 intel-microcode
diff --git a/config/package-lists/gui.list.chroot b/config/package-lists/gui.list.chroot
index 671669a..e7b348c 100644
--- a/config/package-lists/gui.list.chroot
+++ b/config/package-lists/gui.list.chroot
@@ -23,14 +23,12 @@ gedit
 gnome-calculator
 vlc
 hardinfo
-network-manager/bullseye-backports
+network-manager
 network-manager-gnome
-libnm0/bullseye-backports
-remmina/bullseye-backports
-remmina-common/bullseye-backports
-remmina-plugin-vnc/bullseye-backports
-remmina-plugin-rdp/bullseye-backports
-remmina-plugin-spice/bullseye-backports
+remmina
+remmina-common
+remmina-plugin-vnc
+remmina-plugin-rdp
 virt-manager
 gir1.2-spiceclientgtk-3.0
 libvirt-clients
diff --git a/config/package-lists/net.list.chroot b/config/package-lists/net.list.chroot
index b2decaa..bd47195 100644
--- a/config/package-lists/net.list.chroot
+++ b/config/package-lists/net.list.chroot
@@ -18,4 +18,4 @@ openssh-client
 openssh-sftp-server
 libnss3-tools
 wpasupplicant
-torbrowser-launcher/bullseye-backports
+torbrowser-launcher
diff --git a/make.sh b/make.sh
index 688c2bb..c034de7 100755
--- a/make.sh
+++ b/make.sh
@@ -147,7 +147,7 @@ _config()
   --architectures amd64 \
   --distribution $debian_version \
   --binary-images iso-hybrid \
-  --archive-areas "main contrib non-free" \
+  --archive-areas "main contrib non-free-firmware" \
   --debian-installer none \
   --apt-recommends false \
   --updates true \