diff --git a/banana-pi.sh b/banana-pi.sh
index 95c4197..2215a97 100755
--- a/banana-pi.sh
+++ b/banana-pi.sh
@@ -270,6 +270,7 @@ echo "sunxi_emac" >> ${work_dir}/etc/modules
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/banana-pro.sh b/banana-pro.sh
index 52f704e..eb3b994 100755
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -275,6 +275,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/bbb.sh b/bbb.sh
index 6a9fbc4..db25857 100755
--- a/bbb.sh
+++ b/bbb.sh
@@ -281,6 +281,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/chromebook-arm-exynos.sh b/chromebook-arm-exynos.sh
index 97d1c66..d4d5110 100755
--- a/chromebook-arm-exynos.sh
+++ b/chromebook-arm-exynos.sh
@@ -264,6 +264,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/chromebook-arm-nyan.sh b/chromebook-arm-nyan.sh
index 77e3d49..1f4d719 100755
--- a/chromebook-arm-nyan.sh
+++ b/chromebook-arm-nyan.sh
@@ -268,6 +268,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/chromebook-arm-veyron.sh b/chromebook-arm-veyron.sh
index e548e6c..36a2cdd 100755
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-arm-veyron.sh
@@ -265,6 +265,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/cubieboard2.sh b/cubieboard2.sh
index 2148348..62c737c 100755
--- a/cubieboard2.sh
+++ b/cubieboard2.sh
@@ -277,6 +277,7 @@ echo "sunxi_emac" >> ${work_dir}/etc/modules
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/cubietruck.sh b/cubietruck.sh
index 9627577..679465f 100755
--- a/cubietruck.sh
+++ b/cubietruck.sh
@@ -273,6 +273,7 @@ echo "sunxi_gmac" >> ${work_dir}/etc/modules
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/cubox-i.sh b/cubox-i.sh
index 5d4ce87..db40be7 100755
--- a/cubox-i.sh
+++ b/cubox-i.sh
@@ -278,6 +278,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/cubox.sh b/cubox.sh
index f8be4e8..8ff34d2 100755
--- a/cubox.sh
+++ b/cubox.sh
@@ -272,6 +272,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/gateworks_ventana.sh b/gateworks_ventana.sh
index e57994d..b129528 100755
--- a/gateworks_ventana.sh
+++ b/gateworks_ventana.sh
@@ -319,6 +319,7 @@ echo 'T1:12345:respawn:/sbin/getty -L ttymxc1 115200 vt100' >> \
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/kalitap.sh b/kalitap.sh
index 72e18b7..e0a033c 100755
--- a/kalitap.sh
+++ b/kalitap.sh
@@ -278,6 +278,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/luna.sh b/luna.sh
index cf044ca..977d40c 100755
--- a/luna.sh
+++ b/luna.sh
@@ -277,6 +277,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/mini-x.sh b/mini-x.sh
index 5d4942b..5d6d310 100755
--- a/mini-x.sh
+++ b/mini-x.sh
@@ -275,6 +275,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/nanopi2.sh b/nanopi2.sh
index 8767cdf..6926a04 100755
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -282,6 +282,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/nanopi3.sh b/nanopi3.sh
index afabae8..3ca2ba2 100755
--- a/nanopi3.sh
+++ b/nanopi3.sh
@@ -297,6 +297,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/nanopineoplus2-minimal.sh b/nanopineoplus2-minimal.sh
index d7a7cc4..a251d26 100755
--- a/nanopineoplus2-minimal.sh
+++ b/nanopineoplus2-minimal.sh
@@ -381,6 +381,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/nanopineoplus2.sh b/nanopineoplus2.sh
index 85b9241..388e65a 100755
--- a/nanopineoplus2.sh
+++ b/nanopineoplus2.sh
@@ -379,6 +379,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-c.sh b/odroid-c.sh
index d0bf2e6..1df37d4 100755
--- a/odroid-c.sh
+++ b/odroid-c.sh
@@ -278,6 +278,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-c2.sh b/odroid-c2.sh
index a9bce9d..a62a1b4 100755
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -278,6 +278,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-u2.sh b/odroid-u2.sh
index 5793e1a..3917c6d 100755
--- a/odroid-u2.sh
+++ b/odroid-u2.sh
@@ -277,6 +277,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-w-devkit.sh b/odroid-w-devkit.sh
index 0905aae..e6e654a 100755
--- a/odroid-w-devkit.sh
+++ b/odroid-w-devkit.sh
@@ -324,6 +324,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-w.sh b/odroid-w.sh
index e297296..92d5f24 100755
--- a/odroid-w.sh
+++ b/odroid-w.sh
@@ -328,6 +328,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/odroid-xu3.sh b/odroid-xu3.sh
index c06ded1..8589a50 100755
--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -288,6 +288,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/pinebook-pro.sh b/pinebook-pro.sh
index 4d3e6c0..d936cca 100755
--- a/pinebook-pro.sh
+++ b/pinebook-pro.sh
@@ -270,6 +270,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/pinebook.sh b/pinebook.sh
index 85994dc..8af80b8 100755
--- a/pinebook.sh
+++ b/pinebook.sh
@@ -343,6 +343,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/riot.sh b/riot.sh
index f7702f3..61a9ade 100755
--- a/riot.sh
+++ b/riot.sh
@@ -323,6 +323,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi.sh b/rpi.sh
index e73cdc3..46cfc90 100755
--- a/rpi.sh
+++ b/rpi.sh
@@ -302,6 +302,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi0w-nexmon-minimal.sh b/rpi0w-nexmon-minimal.sh
index f4f584b..696b967 100755
--- a/rpi0w-nexmon-minimal.sh
+++ b/rpi0w-nexmon-minimal.sh
@@ -340,6 +340,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi0w-nexmon-p4wnp1-aloa.sh b/rpi0w-nexmon-p4wnp1-aloa.sh
index edb308a..49d78a3 100755
--- a/rpi0w-nexmon-p4wnp1-aloa.sh
+++ b/rpi0w-nexmon-p4wnp1-aloa.sh
@@ -335,6 +335,7 @@ echo "T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100" >> ${work_dir}/etc/ini
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi0w-nexmon.sh b/rpi0w-nexmon.sh
index fb4eedd..986bc46 100755
--- a/rpi0w-nexmon.sh
+++ b/rpi0w-nexmon.sh
@@ -334,6 +334,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi3-64-lite.sh b/rpi3-64-lite.sh
index f9464aa..a93b3b0 100755
--- a/rpi3-64-lite.sh
+++ b/rpi3-64-lite.sh
@@ -318,6 +318,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi3-64.sh b/rpi3-64.sh
index 8fdc510..bc2835f 100755
--- a/rpi3-64.sh
+++ b/rpi3-64.sh
@@ -316,6 +316,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/rpi3-nexmon.sh b/rpi3-nexmon.sh
index 1a9cdc8..9e3b1bf 100755
--- a/rpi3-nexmon.sh
+++ b/rpi3-nexmon.sh
@@ -312,6 +312,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/trimslice.sh b/trimslice.sh
index 9a2465d..3326c68 100755
--- a/trimslice.sh
+++ b/trimslice.sh
@@ -321,6 +321,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/usbarmory.sh b/usbarmory.sh
index 4707139..b8c7d15 100755
--- a/usbarmory.sh
+++ b/usbarmory.sh
@@ -269,6 +269,7 @@ fi
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi
 
diff --git a/utilite.sh b/utilite.sh
index 232c8da..9cfc4b6 100755
--- a/utilite.sh
+++ b/utilite.sh
@@ -282,6 +282,7 @@ EOF
 
 # Mirror replacement
 if [ ! -z "${@:5}" ]; then
+  [ $suite != kali-rolling ] || suite=kali-rolling
   mirror=${@:5}
 fi