diff --git a/system76/qemu/config b/system76/qemu/config
index 251beaf23e..e0c00c1ad7 100644
--- a/system76/qemu/config
+++ b/system76/qemu/config
@@ -15,7 +15,8 @@ CONFIG_COMPILER_GCC=y
 CONFIG_CCACHE=y
 # CONFIG_FMD_GENPARSER is not set
 # CONFIG_UTIL_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+# CONFIG_STATIC_OPTION_TABLE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
@@ -89,7 +90,6 @@ CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
 CONFIG_MAX_CPUS=1
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_UART_FOR_CONSOLE=0
-CONFIG_PAYLOAD_CONFIGFILE=""
 CONFIG_MAINBOARD_VENDOR="Emulation"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=256
@@ -130,7 +130,6 @@ CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_CONSOLE_POST=y
-CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -282,7 +281,6 @@ CONFIG_EC_BASE_ACPI_COMMAND=0x934
 CONFIG_EC_BASE_HOST_DATA=0x940
 CONFIG_EC_BASE_HOST_COMMAND=0x944
 CONFIG_EC_BASE_PACKET=0x950
-CONFIG_SEABIOS_PS2_TIMEOUT=0
 # CONFIG_CAVIUM_BDK is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
@@ -444,8 +442,8 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
-CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
-CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=1024
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
@@ -549,9 +547,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
-# CONFIG_POST_DEVICE_NONE is not set
-# CONFIG_POST_DEVICE_LPC is not set
-# CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
@@ -588,35 +583,21 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_LINUXBOOT is not set
-CONFIG_PAYLOAD_SEABIOS=y
+# CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_YABITS is not set
 # CONFIG_PAYLOAD_LINUX is not set
-# CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
-CONFIG_SEABIOS_STABLE=y
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
-CONFIG_SEABIOS_THREAD_OPTIONROMS=y
-CONFIG_SEABIOS_VGA_COREBOOT=y
-CONFIG_SEABIOS_BOOTORDER_FILE=""
-# CONFIG_SEABIOS_ADD_SERCON_PORT_FILE is not set
-CONFIG_PAYLOAD_VGABIOS_FILE="payloads/external/SeaBIOS/seabios/out/vgabios.bin"
-CONFIG_SEABIOS_DEBUG_LEVEL=-1
-
-#
-# Using default SeaBIOS log level
-#
+CONFIG_PAYLOAD_TIANOCORE=y
+CONFIG_PAYLOAD_FILE="payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd"
 CONFIG_PAYLOAD_OPTIONS=""
-CONFIG_PXE=y
-
-#
-# PXE Options
-#
-CONFIG_PXE_ROM=y
-# CONFIG_BUILD_IPXE is not set
-CONFIG_PXE_ROM_FILE="system76/qemu/pxe"
-CONFIG_PXE_SERIAL_CONSOLE=y
+# CONFIG_PXE is not set
+CONFIG_TIANOCORE_STABLE=y
+# CONFIG_TIANOCORE_REVISION is not set
+# CONFIG_TIANOCORE_TARGET_IA32 is not set
+CONFIG_TIANOCORE_TARGET_X64=y
+# CONFIG_TIANOCORE_DEBUG is not set
+CONFIG_TIANOCORE_RELEASE=y
+CONFIG_TIANOCORE_USE_8254_TIMER=y
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set