diff --git a/boards/qemu-tiny/qemu-tiny.config b/boards/qemu-tiny/qemu-tiny.config
index 0ed7c08c..809a19c7 100644
--- a/boards/qemu-tiny/qemu-tiny.config
+++ b/boards/qemu-tiny/qemu-tiny.config
@@ -6,6 +6,7 @@ export CONFIG_COREBOOT=n
 #CONFIG_LINUXBOOT_BOARD=qemu
 CONFIG_LINUX_CONFIG=config/linux-tiny.config
 
+# Use the qboot BIOS for faster startup
 CONFIG_QBOOT=y
 
 ifeq "$(CONFIG_UROOT)" "y"
@@ -14,13 +15,13 @@ else
 CONFIG_KEXEC=y
 CONFIG_QRENCODE=n
 CONFIG_TPMTOTP=n
-CONFIG_POPT=y
+CONFIG_POPT=n
 CONFIG_FLASHTOOLS=n
 CONFIG_FLASHROM=n
 CONFIG_PCIUTILS=y
 CONFIG_UTIL_LINUX=y
 CONFIG_CRYPTSETUP=y
-CONFIG_GPG2=y
+CONFIG_GPG2=n
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_DROPBEAR=y
@@ -33,11 +34,11 @@ CONFIG_LINUX_AHCI=n
 CONFIG_LINUX_USB=n
 CONFIG_LINUX_E1000=n
 
-export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOTSCRIPT=/bin/tiny-init
 export CONFIG_TPM=n
 
 #run: coreboot.intermediate
-run:
+run: $(build)/$(BOARD)/initrd.cpio
 	-qemu-system-x86_64 \
 		--machine q35 \
 		--serial /dev/tty \
@@ -45,5 +46,8 @@ run:
 		--netdev user,id=net0,hostfwd=tcp::5555-:22 \
 		--bios $(build)/qboot-git/bios.bin \
 		--kernel $(build)/$(BOARD)/bzImage \
-		--initrd $(build)/$(BOARD)/initrd.cpio.xz
+		--initrd $(build)/$(BOARD)/initrd.cpio
 	stty sane
+
+$(build)/$(BOARD)/initrd.cpio: $(build)/$(BOARD)/initrd.cpio.xz
+	xzcat $< > $@