diff --git a/etc/apt/sources.list/sid b/etc/apt/sources.list/sid
index 394ea5be..c4683366 100644
--- a/etc/apt/sources.list/sid
+++ b/etc/apt/sources.list/sid
@@ -1,9 +1,9 @@
 ## Main repos
-deb https://deb.debian.org/debian sid main contrib non-free
-deb-src https://deb.debian.org/debian sid main contrib non-free
-deb https://deb.debian.org/debian-debug sid-debug main contrib non-free
+deb https://deb.debian.org/debian sid main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian sid main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian-debug sid-debug main contrib non-free non-free-firmware
 
 ## Main repos over Tor
-#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free
-#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free
-#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug sid-debug main contrib non-free
+#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free non-free-firmware
+#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian sid main contrib non-free non-free-firmware
+#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug sid-debug main contrib non-free non-free-firmware
diff --git a/etc/apt/sources.list/stable b/etc/apt/sources.list/stable
index a7f79f5d..cba7d628 100644
--- a/etc/apt/sources.list/stable
+++ b/etc/apt/sources.list/stable
@@ -26,19 +26,19 @@ deb-src tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onio
 #deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-proposed-updates-debug main contrib non-free
 
 ## Updates repo
-deb https://deb.debian.org/debian stable-updates main contrib non-free
-deb-src https://deb.debian.org/debian stable-updates main contrib non-free
+deb https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian stable-updates main contrib non-free non-free-firmware
 
 ## Updates repo over Tor
-#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free
-#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free
+#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free non-free-firmware
+#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-updates main contrib non-free non-free-firmware
 
 ## Backports
-deb https://deb.debian.org/debian stable-backports main contrib non-free
-deb-src https://deb.debian.org/debian stable-backports main contrib non-free
-deb https://deb.debian.org/debian-debug stable-backports-debug main contrib non-free
+deb https://deb.debian.org/debian stable-backports main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian stable-backports main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian-debug stable-backports-debug main contrib non-free non-free-firmware
 
 ## Backports over Tor
-#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free
-#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free
-#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-backports-debug main contrib non-free
+#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free non-free-firmware
+#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian stable-backports main contrib non-free non-free-firmware
+#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug stable-backports-debug main contrib non-free non-free-firmware
diff --git a/etc/apt/sources.list/testing b/etc/apt/sources.list/testing
index bd0a68d0..3966b6e7 100644
--- a/etc/apt/sources.list/testing
+++ b/etc/apt/sources.list/testing
@@ -1,34 +1,34 @@
 ## Main repos
-deb https://deb.debian.org/debian testing main contrib non-free
-deb-src https://deb.debian.org/debian testing main contrib non-free
-deb https://deb.debian.org/debian-debug testing-debug main contrib non-free
+deb https://deb.debian.org/debian testing main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian testing main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian-debug testing-debug main contrib non-free non-free-firmware
 
 ## Main repos over Tor
-#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free
-#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free
-#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-debug main contrib non-free
+#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free non-free-firmware
+#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing main contrib non-free non-free-firmware
+#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-debug main contrib non-free non-free-firmware
 
 ## Security repo CDN
-deb https://deb.debian.org/debian-security/ testing-security main contrib non-free
-deb-src https://deb.debian.org/debian-security/ testing-security main contrib non-free
+deb https://deb.debian.org/debian-security/ testing-security main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian-security/ testing-security main contrib non-free non-free-firmware
 ## https://bugs.debian.org/894081
-deb https://deb.debian.org/debian-debug testing-proposed-updates-debug main contrib non-free
+deb https://deb.debian.org/debian-debug testing-proposed-updates-debug main contrib non-free non-free-firmware
 
 ## Security repo directly
 # To be enabled AFTER it gets https, meanwhile CDN & Tor must be enough.
-#deb http://security.debian.org/ testing-security main contrib non-free
-#deb-src http://security.debian.org/ testing-security main contrib non-free
+#deb http://security.debian.org/ testing-security main contrib non-free non-free-firmware
+#deb-src http://security.debian.org/ testing-security main contrib non-free non-free-firmware
 
 ## Security repos over Tor
-deb tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free
-deb-src tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free
+deb tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free non-free-firmware
+deb-src tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security testing-security main contrib non-free non-free-firmware
 ## https://bugs.debian.org/894081
-#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-proposed-updates-debug main contrib non-free
+#deb tor+http://3lz3irtzg5i4z2sz3qca3oz3sdk3p5a3xlmz3zqwornapeofvoudajid.onion/debian-debug testing-proposed-updates-debug main contrib non-free non-free-firmware
 
 ## Updates repo
-deb https://deb.debian.org/debian testing-updates main contrib non-free
-deb-src https://deb.debian.org/debian testing-updates main contrib non-free
+deb https://deb.debian.org/debian testing-updates main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian testing-updates main contrib non-free non-free-firmware
 
 ## Updates repo over Tor
-#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free
-#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free
+#deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free non-free-firmware
+#deb-src tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian testing-updates main contrib non-free non-free-firmware
diff --git a/etc/apt/sources.list/unstable b/etc/apt/sources.list/unstable
index 54a963ed..b3b169b3 100644
--- a/etc/apt/sources.list/unstable
+++ b/etc/apt/sources.list/unstable
@@ -1,9 +1,9 @@
 ## Main repos
-deb https://deb.debian.org/debian unstable main contrib non-free
-deb-src https://deb.debian.org/debian unstable main contrib non-free
-deb https://deb.debian.org/debian-debug unstable-debug main contrib non-free
+deb https://deb.debian.org/debian unstable main contrib non-free non-free-firmware
+deb-src https://deb.debian.org/debian unstable main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian-debug unstable-debug main contrib non-free non-free-firmware
 
 ## Main repos over Tor
-#deb tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free
-#deb-src tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free
-#deb tor+http://ktqxbqrhg5ai2c7f.onion/debian-debug unstable-debug main contrib non-free
+#deb tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free non-free-firmware
+#deb-src tor+http://vwakviie2ienjx6t.onion/debian unstable main contrib non-free non-free-firmware
+#deb tor+http://ktqxbqrhg5ai2c7f.onion/debian-debug unstable-debug main contrib non-free non-free-firmware