diff --git a/build.sh b/build.sh
index 36a05c3..e82b351 100755
--- a/build.sh
+++ b/build.sh
@@ -144,7 +144,7 @@ run_stage() {
 	unmount "${WORK_DIR}/${STAGE}"
 
 	if [ ! -f SKIP_IMAGES ]; then
-		if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then
+		if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ] || [ -f "${STAGE_DIR}/EXPORT_ISO" ]; then
 			EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
 		fi
 	fi
@@ -346,16 +346,16 @@ done
 
 CLEAN=1
 for EXPORT_DIR in ${EXPORT_DIRS}; do
-	STAGE_DIR=${EXPORT_CONFIG_DIR}
-	# shellcheck source=/dev/null
-	source "${EXPORT_DIR}/EXPORT_IMAGE"
 	EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename "${EXPORT_DIR}")/rootfs
 	if [ -e "${EXPORT_DIR}/EXPORT_ISO" ]; then
+		STAGE_DIR=${EXPORT_CONFIG_DIR}
 		# shellcheck source=/dev/null
 		source "${EXPORT_DIR}/EXPORT_ISO"
 		STAGE_DIR="${BASE_DIR}/export-iso"
 		run_stage
-	elif [ -e "${EXPORT_DIR}/EXPORT_IMAGE" ]; then
+	fi
+	if [ -e "${EXPORT_DIR}/EXPORT_IMAGE" ]; then
+		STAGE_DIR=${EXPORT_CONFIG_DIR}
 		# shellcheck source=/dev/null
 		source "${EXPORT_DIR}/EXPORT_IMAGE"
 		STAGE_DIR="${BASE_DIR}/export-image"
diff --git a/export-iso/04-finalise/01-run.sh b/export-iso/03-finalise/01-run.sh
old mode 100755
new mode 100644
similarity index 96%
rename from export-iso/04-finalise/01-run.sh
rename to export-iso/03-finalise/01-run.sh
index 87daaf9..5ecc96d
--- a/export-iso/04-finalise/01-run.sh
+++ b/export-iso/03-finalise/01-run.sh
@@ -1,5 +1,10 @@
 #!/bin/bash -e
 
+if [ "${ARCH}" != "amd64" ]; then
+	echo "export-iso: skipping ISO creation for non-amd64 arch (${ARCH})"
+	exit 0
+fi
+
 ISO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.iso"
 ISO_TEMP_DIR="${STAGE_WORK_DIR}/iso_temp"
 
diff --git a/export-iso/03-set-partuuid/00-run.sh b/export-iso/03-set-partuuid/00-run.sh
deleted file mode 100755
index 23f2982..0000000
--- a/export-iso/03-set-partuuid/00-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-ROOT_DEV="$(awk "\$2 == \"${ROOTFS_DIR}\" {print \$1}" /etc/mtab)"
-BOOT_DEV="$(awk "\$2 == \"${ROOTFS_DIR}/boot\" {print \$1}" /etc/mtab)"
-EFI_DEV="$(awk "\$2 == \"${ROOTFS_DIR}/boot/efi\" {print \$1}" /etc/mtab)"
-
-ROOT_UUID="$(blkid -s UUID -o value "${ROOT_DEV}")"
-BOOT_UUID="$(blkid -s UUID -o value "${BOOT_DEV}")"
-EFI_UUID="$(blkid -s UUID -o value "${EFI_DEV}")"
-
-# Write amd64-appropriate fstab (boot at /boot, EFI at /boot/efi)
-cat > "${ROOTFS_DIR}/etc/fstab" << EOF
-proc            /proc           proc    defaults          0       0
-UUID=${BOOT_UUID}  /boot           vfat    defaults          0       2
-UUID=${EFI_UUID}   /boot/efi       vfat    defaults          0       2
-UUID=${ROOT_UUID}  /               ext4    defaults,noatime  0       1
-EOF
diff --git a/stage3/EXPORT_IMAGE b/stage3/EXPORT_ISO
similarity index 100%
rename from stage3/EXPORT_IMAGE
rename to stage3/EXPORT_ISO