diff --git a/configs/config.dell_optiplex_9010_sff_uefi b/configs/config.dell_optiplex_9010_sff_uefi
index f658d2f7c4..c2d468065c 100644
--- a/configs/config.dell_optiplex_9010_sff_uefi
+++ b/configs/config.dell_optiplex_9010_sff_uefi
@@ -1,18 +1,29 @@
 CONFIG_LOCALVERSION="v0.1.0"
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_DELL=y
 CONFIG_FMDFILE="src/mainboard/dell/snb_ivb_workstations/default.fmd"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_BOARD_DELL_OPTIPLEX_9010=y
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
+CONFIG_EDK2_BOOT_TIMEOUT=3
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
 CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
+CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
+CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
+CONFIG_BOOTMEDIA_SMM_BWP=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
+# CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX is not set
+# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="origin/rebased"
+CONFIG_EDK2_TAG_OR_REV="d1399bf8473823f457617752767e9b56d3c2b1c4"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
+CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SD_MMC_TIMEOUT=1000
 CONFIG_EDK2_SERIAL_SUPPORT=y
@@ -23,14 +34,18 @@ CONFIG_IPXE_ADD_SCRIPT=y
 CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
 CONFIG_IPXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_EDK2_ENABLE_IPXE=y
-CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities"
+# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
+CONFIG_EDK2_SATA_PASSWORD=y
+CONFIG_EDK2_OPAL_PASSWORD=y
 CONFIG_EDK2_SETUP_PASSWORD=y
 CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y
 CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y
 CONFIG_EDK2_DASHARO_USB_CONFIG=y
 CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
 CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y
-CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
+CONFIG_EDK2_DASHARO_POWER_CONFIG=y
+CONFIG_EDK2_DASHARO_PCI_CONFIG=y
 CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y
-CONFIG_EDK2_BOOT_MENU_KEY=0x0011
 CONFIG_EDK2_SETUP_MENU_KEY=0x000C
+CONFIG_EDK2_DISABLE_OPTION_ROMS=y
+CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y
diff --git a/configs/config.dell_optiplex_9010_sff_uefi_txt b/configs/config.dell_optiplex_9010_sff_uefi_txt
index 7ac7806ed7..9cc6c6cfc8 100644
--- a/configs/config.dell_optiplex_9010_sff_uefi_txt
+++ b/configs/config.dell_optiplex_9010_sff_uefi_txt
@@ -4,18 +4,28 @@ CONFIG_VENDOR_DELL=y
 CONFIG_FMDFILE="src/mainboard/dell/snb_ivb_workstations/default.fmd"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_BOARD_DELL_OPTIPLEX_9010=y
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x100000
+CONFIG_EDK2_BOOT_TIMEOUT=3
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
 CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_TXT_BDR_VERSION=4
 CONFIG_INTEL_TXT_LOGGING=y
+CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
+CONFIG_BOOTMEDIA_LOCK_WPRO_VBOOT_RO=y
+CONFIG_BOOTMEDIA_SMM_BWP=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
+# CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX is not set
+# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="origin/rebased"
+CONFIG_EDK2_TAG_OR_REV="d1399bf8473823f457617752767e9b56d3c2b1c4"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
+CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SD_MMC_TIMEOUT=1000
 CONFIG_EDK2_SERIAL_SUPPORT=y
@@ -26,14 +36,18 @@ CONFIG_IPXE_ADD_SCRIPT=y
 CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
 CONFIG_IPXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_EDK2_ENABLE_IPXE=y
-CONFIG_EDK2_IPXE_OPTION_NAME="Network Boot and Utilities"
+# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
+CONFIG_EDK2_SATA_PASSWORD=y
+CONFIG_EDK2_OPAL_PASSWORD=y
 CONFIG_EDK2_SETUP_PASSWORD=y
 CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y
 CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y
 CONFIG_EDK2_DASHARO_USB_CONFIG=y
 CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
 CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y
-CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
+CONFIG_EDK2_DASHARO_POWER_CONFIG=y
+CONFIG_EDK2_DASHARO_PCI_CONFIG=y
 CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y
-CONFIG_EDK2_BOOT_MENU_KEY=0x0011
 CONFIG_EDK2_SETUP_MENU_KEY=0x000C
+CONFIG_EDK2_DISABLE_OPTION_ROMS=y
+CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y