diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh
index de040aac832a9e265b11d0fb77de080c333a10b0..0c3dea5da8ee3de94953775554758c5b6238e841 100755
--- a/scripts/mkimage.sh
+++ b/scripts/mkimage.sh
@@ -22,7 +22,7 @@ set -e
 all_sections=""
 all_profiles=""
 all_checksums="sha256 sha512"
-all_arches="aarch64 armhf x86 x86_64"
+all_arches="aarch64 armhf armv7 x86 x86_64"
 all_dirs=""
 build_date="$(date +%y%m%d)"
 default_arch="$(apk --print-arch)"
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index 76956d5281216b664aca8a0fd6d92207fad3d6a9..f044a0d9101b27e13a6d617a8761a63361a0bdd6 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -20,6 +20,12 @@ rpi_gen_config() {
 		[pi1]
 		kernel=boot/vmlinuz-rpi
 		initramfs boot/initramfs-rpi
+		[all]
+		include usercfg.txt
+		EOF
+	;;
+	armv7)
+		cat <<-EOF
 		[pi2]
 		kernel=boot/vmlinuz-rpi2
 		initramfs boot/initramfs-rpi2
diff --git a/scripts/mkimg.minirootfs.sh b/scripts/mkimg.minirootfs.sh
index ec2b1435dc43ea3a16802de2c66771b8b067f228..6b8b6b903c3411d01e06ca02759e543e91504056 100755
--- a/scripts/mkimg.minirootfs.sh
+++ b/scripts/mkimg.minirootfs.sh
@@ -20,6 +20,6 @@ profile_minirootfs() {
 		and minimal chroots."
 	image_ext=tar.gz
 	output_format=rootfs
-	arch="x86 x86_64 armhf aarch64 ppc64le s390x"
+	arch="x86 x86_64 armhf armv7 aarch64 ppc64le s390x"
 	rootfs_apks="busybox alpine-baselayout alpine-keys apk-tools libc-utils"
 }
diff --git a/scripts/mkimg.netboot.sh b/scripts/mkimg.netboot.sh
index afce270f815d990db138aa134f3e6fa46a2f61f1..aa7f8c5429a580b6eabc980a7682a5991097d0a0 100755
--- a/scripts/mkimg.netboot.sh
+++ b/scripts/mkimg.netboot.sh
@@ -10,7 +10,7 @@ profile_netboot() {
 	desc="Kernel, initramfs and modloop for
 		netboot.
 		"
-	arch="aarch64 armhf ppc64le x86 x86_64 s390x"
+	arch="aarch64 armhf armv7 ppc64le x86 x86_64 s390x"
 	kernel_cmdline="nomodeset"
 	kernel_flavors="vanilla"
 	modloop_sign=yes