diff --git a/images/06-iso/Dockerfile b/images/06-iso/Dockerfile
index 2cb5509c..03cdf1a9 100644
--- a/images/06-iso/Dockerfile
+++ b/images/06-iso/Dockerfile
@@ -11,11 +11,11 @@ ARG TAG
 FROM ${REPO}/k3os-base:${TAG} as base
 ARG VERSION
 ARG ARCH
-RUN apk add xorriso grub grub-efi mtools libvirt qemu-img ovmf
+RUN apk add xorriso grub grub-efi mtools libvirt qemu-img
 RUN if [ "$ARCH" == "amd64" ]; then \
-        apk add qemu-system-x86_64 grub-bios \
+        apk add qemu-system-x86_64 grub-bios ovmf \
     ;elif [ "$ARCH" == "arm64" ]; then \
-        apk add qemu-system-arm64 \
+        apk add qemu-system-aarch64 \
     ;fi
 RUN ln -s /usr/bin/qemu-system-* /usr/bin/qemu-system
 RUN qemu-img create -f qcow2 /hd.img 40G
diff --git a/images/output/01-amd64/Dockerfile b/images/output/01-amd64/Dockerfile
deleted file mode 100644
index da8ec576..00000000
--- a/images/output/01-amd64/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO
-ARG TAG
-FROM ${REPO}/k3os-tar:${TAG} as tar
-
-ARG REPO
-ARG TAG
-FROM ${REPO}/k3os-iso:${TAG} as iso
-
-ARG REPO
-ARG TAG
-FROM ${REPO}/k3os-kernel:${TAG} as kernel
-
-ARG REPO
-ARG TAG
-FROM ${REPO}/k3os-base:${TAG}
-
-COPY --from=kernel /output/vmlinuz /output/k3os-vmlinuz-amd64
-COPY --from=kernel /output/initrd /output/k3os-initrd-amd64
-COPY --from=kernel /output/kernel.squashfs /output/k3os-kernel-amd64.squashfs
-COPY --from=kernel /output/version /output/k3os-kernel-version-amd64
-COPY --from=iso /output/k3os.iso /output/k3os-amd64.iso
-
-COPY --from=tar /output/ /usr/src/tar
-COPY --from=kernel /output/initrd /usr/src/initrd/initrd
-
-RUN mv /usr/src/tar/userspace.tar /output/k3os-rootfs-amd64.tar && \
-    gzip /output/k3os-rootfs-amd64.tar
diff --git a/images/output/01-amd64/archs b/images/output/01-amd64/archs
deleted file mode 100644
index 21d5bd8c..00000000
--- a/images/output/01-amd64/archs
+++ /dev/null
@@ -1 +0,0 @@
-amd64
diff --git a/images/output/01-arm/archs b/images/output/01-arm/archs
deleted file mode 100644
index 518320d4..00000000
--- a/images/output/01-arm/archs
+++ /dev/null
@@ -1 +0,0 @@
-arm arm64
diff --git a/images/output/01-full/Dockerfile b/images/output/01-full/Dockerfile
new file mode 100644
index 00000000..eff2d08c
--- /dev/null
+++ b/images/output/01-full/Dockerfile
@@ -0,0 +1,28 @@
+ARG REPO
+ARG TAG
+FROM ${REPO}/k3os-tar:${TAG} as tar
+
+ARG REPO
+ARG TAG
+FROM ${REPO}/k3os-iso:${TAG} as iso
+
+ARG REPO
+ARG TAG
+FROM ${REPO}/k3os-kernel:${TAG} as kernel
+
+ARG REPO
+ARG TAG
+FROM ${REPO}/k3os-base:${TAG}
+ARG ARCH
+
+COPY --from=kernel /output/vmlinuz /output/k3os-vmlinuz-${ARCH}
+COPY --from=kernel /output/initrd /output/k3os-initrd-${ARCH}
+COPY --from=kernel /output/kernel.squashfs /output/k3os-kernel-${ARCH}.squashfs
+COPY --from=kernel /output/version /output/k3os-kernel-version-${ARCH}
+COPY --from=iso /output/k3os.iso /output/k3os-${ARCH}.iso
+
+COPY --from=tar /output/ /usr/src/tar
+COPY --from=kernel /output/initrd /usr/src/initrd/initrd
+
+RUN mv /usr/src/tar/userspace.tar /output/k3os-rootfs-${ARCH}.tar && \
+    gzip /output/k3os-rootfs-${ARCH}.tar
diff --git a/images/output/01-full/archs b/images/output/01-full/archs
new file mode 100644
index 00000000..8f7b3477
--- /dev/null
+++ b/images/output/01-full/archs
@@ -0,0 +1 @@
+amd64 arm64
diff --git a/images/output/01-arm/Dockerfile b/images/output/01-lite/Dockerfile
similarity index 100%
rename from images/output/01-arm/Dockerfile
rename to images/output/01-lite/Dockerfile
diff --git a/images/output/01-lite/archs b/images/output/01-lite/archs
new file mode 100644
index 00000000..fb05f39d
--- /dev/null
+++ b/images/output/01-lite/archs
@@ -0,0 +1 @@
+arm