diff --git a/build_all.sh b/build_all.sh
index 31f1513..cc4defc 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -10,11 +10,11 @@ HOST_ARCH="$(dpkg --print-architecture)"
 case "$HOST_ARCH" in
 	i386|amd64)
 		KALI_ARCHES="amd64 i386"
-		IMAGE_NAME="binary.hybrid.iso"
+		IMAGE_TEMPLATE="live-image-ARCH.hybrid.iso"
 	;;
 	armel|armhf)
 		KALI_ARCHES="$HOST_ARCH"
-		IMAGE_NAME="binary.img"
+		IMAGE_TEMPLATE="live-image-ARCH.img"
 	;;
 	*)
 		echo "ERROR: $HOST_ARCH build is not supported"
@@ -71,8 +71,8 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 # Or we ensure we have proper version installed
 ver_live_build=$(dpkg-query -f '${Version}' -W live-build)
-if dpkg --compare-versions "$ver_live_build" lt 3.0.5-1kali7; then
-	echo "You need live-build (>= 3.0.5-1kali7), you have $ver_live_build" >&2
+if dpkg --compare-versions "$ver_live_build" lt 4.0.3-1kali2; then
+	echo "You need live-build (>= 4.0.3-1kali2), you have $ver_live_build" >&2
 	exit 1
 fi
 
@@ -80,6 +80,7 @@ cd $(dirname $0)
 mkdir -p $TARGET_DIR
 
 for KALI_ARCH in $KALI_ARCHES; do
+	IMAGE_NAME=$(echo $IMAGE_TEMPLATE | sed -e "s/ARCH/$KALI_ARCH/")
 	lb clean --purge >prepare.log 2>&1
 	lb config -a $KALI_ARCH $KALI_CONFIG_OPTS >>prepare.log 2>&1
 	lb build >/dev/null
diff --git a/config/package-lists/kali.list.binary b/config/package-lists/kali.list.binary
index 51edfbf..dc1f3aa 100644
--- a/config/package-lists/kali.list.binary
+++ b/config/package-lists/kali.list.binary
@@ -1,11 +1,11 @@
 # EFI support, ensure we have the required .deb in the ISO available for
 # installation
 
-#if ARCHITECTURES i386
+#if ARCHITECTURE i386
 grub-efi
 grub-efi-ia32
 #endif
-#if ARCHITECTURES amd64
+#if ARCHITECTURE amd64
 grub-efi
 grub-efi-amd64
 #endif
diff --git a/config/package-lists/kali.list.chroot b/config/package-lists/kali.list.chroot
index cd9ace3..66e5012 100644
--- a/config/package-lists/kali.list.chroot
+++ b/config/package-lists/kali.list.chroot
@@ -16,13 +16,13 @@ kbd
 console-data
 console-common
 
-#if ARCHITECTURES armel armhf
+#if ARCHITECTURE armel armhf
 cgpt
 vboot-utils
 vboot-kernel-utils
 #endif
 
-#if ARCHITECTURES i386 amd64
+#if ARCHITECTURE i386 amd64
 firmware-b43legacy-installer 
 firmware-b43-installer
 guymager
@@ -35,7 +35,7 @@ guymager
 # or you can just comment everything except the package of your
 # preferred desktop.
 
-#if ARCHITECTURES i386 amd64
+#if ARCHITECTURE i386 amd64
 # *** GNOME DESKTOP ***
 gnome-core
 gnome-brave-icon-theme
@@ -44,7 +44,7 @@ nautilus-open-terminal
 gnome-orca
 #endif
 
-#if ARCHITECTURES armel armhf
+#if ARCHITECTURE armel armhf
 # *** XFCE DESKTOP ***
 xfce4
 network-manager-gnome