diff --git a/configs/config.emulation_qemu_x86_q35_uefi_all_menus b/configs/config.emulation_qemu_x86_q35_uefi_all_menus
index 2e6d30aff68..861e72f0137 100644
--- a/configs/config.emulation_qemu_x86_q35_uefi_all_menus
+++ b/configs/config.emulation_qemu_x86_q35_uefi_all_menus
@@ -15,7 +15,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # 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="5556f91962b93ebf29e5cb91529195e232a322a2"
+CONFIG_EDK2_TAG_OR_REV="85df9231b5ec16b281d458b7c5f28ef898459f6e"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS=""
diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index 08bb7a4031c..9cb56b5f132 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -223,6 +223,7 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
 		CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=$(CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS) \
 		CONFIG_EDK2_DASHARO_MEMORY_CONFIG=$(CONFIG_EDK2_DASHARO_MEMORY_CONFIG) \
 		CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=$(CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE) \
+		CONFIG_EDK2_DASHARO_FAST_BOOT_DEFAULT_ENABLE=$(CONFIG_EDK2_DASHARO_FAST_BOOT_DEFAULT_ENABLE) \
 		CONFIG_EDK2_DASHARO_NETWORK_CONFIG=$(CONFIG_EDK2_DASHARO_NETWORK_CONFIG) \
 		CONFIG_EDK2_DASHARO_OC_WDT_ENABLE=$(CONFIG_SOC_INTEL_COMMON_OC_WDT_ENABLE) \
 		CONFIG_EDK2_DASHARO_OC_WDT_TIMEOUT=$(CONFIG_SOC_INTEL_COMMON_OC_WDT_TIMEOUT_SECONDS) \
diff --git a/payloads/external/edk2/Kconfig.dasharo b/payloads/external/edk2/Kconfig.dasharo
index 34656728b55..511c01bd643 100644
--- a/payloads/external/edk2/Kconfig.dasharo
+++ b/payloads/external/edk2/Kconfig.dasharo
@@ -203,6 +203,12 @@ config EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE
 	help
 	  Enables the network boot option in EDK2 by default.
 
+config EDK2_DASHARO_FAST_BOOT_DEFAULT_ENABLE
+	bool "Enable EDK2 fast boot option by default"
+	default n
+	help
+	  Enables the fast boot option in EDK2 by default.
+
 config EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE
 	bool "Enable serial console redirection by default"
 	depends on EDK2_SERIAL_SUPPORT
diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile
index cd9de0b7e7a..654c70d95ad 100644
--- a/payloads/external/edk2/Makefile
+++ b/payloads/external/edk2/Makefile
@@ -288,6 +288,10 @@ endif
 ifeq ($(CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE),y)
 BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdDefaultNetworkBootEnable=TRUE
 endif
+# EDK2_DASHARO_FAST_BOOT_DEFAULT_ENABLE   = FALSE
+ifeq ($(EDK2_DASHARO_FAST_BOOT_DEFAULT_ENABLE),y)
+BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdDefaultFastBootEnable=TRUE
+endif
 ifeq ($(CONFIG_EDK2_DASHARO_OC_WDT_SHOW),y)
 BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdOcWdtEnableDefault=TRUE
 endif