diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
index fa4f59f..926c4c6 100755
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@@ -14,8 +14,13 @@ fi
 
 cat files/raspberrypi.gpg.key | gpg --dearmor > "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg"
 install -m 644 "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/"
-on_chroot << EOF
-dpkg --add-architecture arm64
-apt-get update
-apt-get dist-upgrade -y
+on_chroot <<- \EOF
+	ARCH="$(dpkg --print-architecture)"
+	if [ "$ARCH" = "armhf" ]; then
+		dpkg --add-architecture arm64
+	elif [ "$ARCH" = "arm64" ]; then
+		dpkg --add-architecture armhf
+	fi
+	apt-get update
+	apt-get dist-upgrade -y
 EOF