diff --git a/scripts/common b/scripts/common
index 6586052..492c570 100644
--- a/scripts/common
+++ b/scripts/common
@@ -9,7 +9,7 @@ bootstrap(){
 
 	#export http_proxy=${APT_PROXY}
 
-	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "arm64" ]; then
+	if [ "$(dpkg --print-architecture)" !=  "arm64" ]; then
 		BOOTSTRAP_CMD=qemu-debootstrap
 	fi
 
@@ -91,7 +91,7 @@ on_chroot() {
 		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi
 
-	setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
 }
 export -f on_chroot