diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4a2ad00c6..89c760191d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -208,7 +208,7 @@ jobs:
       matrix:
         vendor: [ emulation_qemu ]
         model: [ x86_q35 ]
-        payload: [ uefi, uefi_all_menus ]
+        payload: [ uefi, uefi_all_menus, uefi_svboot ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/configs/config.emulation_qemu_x86_q35_uefi_all_menus b/configs/config.emulation_qemu_x86_q35_uefi_all_menus
index 9297306cca..a720d7970c 100644
--- a/configs/config.emulation_qemu_x86_q35_uefi_all_menus
+++ b/configs/config.emulation_qemu_x86_q35_uefi_all_menus
@@ -14,7 +14,6 @@ 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_TAG_OR_REV="sovereign-boot-rc1"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_BUILD_IPXE=y
@@ -24,7 +23,6 @@ CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789"
 CONFIG_DASHARO=y
 CONFIG_EDK2_ENABLE_IPXE=y
 # CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
-CONFIG_EDK2_ENABLE_SOVEREIGN_BOOT_WIZARD=y
 CONFIG_EDK2_SATA_PASSWORD=y
 CONFIG_EDK2_OPAL_PASSWORD=y
 CONFIG_EDK2_SETUP_PASSWORD=y
diff --git a/configs/config.emulation_qemu_x86_q35_uefi_svboot b/configs/config.emulation_qemu_x86_q35_uefi_svboot
new file mode 100644
index 0000000000..87873f80fa
--- /dev/null
+++ b/configs/config.emulation_qemu_x86_q35_uefi_svboot
@@ -0,0 +1,55 @@
+CONFIG_LOCALVERSION="sovereign-boot-rc1"
+CONFIG_OPTION_BACKEND_NONE=y
+CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
+CONFIG_EDK2_BOOT_TIMEOUT=3
+CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
+CONFIG_TPM_MEASURED_BOOT=y
+CONFIG_CPU_QEMU_X86_TSEG_SMM=y
+CONFIG_UDK_202005_BINDING=y
+CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_TPM1=y
+CONFIG_TPM2=y
+CONFIG_TPM_HASH_SHA256=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="sovereign-boot-rc1"
+CONFIG_EDK2_CBMEM_LOGGING=y
+CONFIG_EDK2_SERIAL_SUPPORT=y
+CONFIG_BUILD_IPXE=y
+CONFIG_IPXE_ADD_SCRIPT=y
+CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
+CONFIG_IPXE_CUSTOM_BUILD_ID="0123456789"
+CONFIG_EDK2_ENABLE_IPXE=y
+# CONFIG_EDK2_SECURE_BOOT_DEFAULT_ENABLE is not set
+CONFIG_EDK2_ENABLE_SOVEREIGN_BOOT_WIZARD=y
+CONFIG_EDK2_SATA_PASSWORD=y
+CONFIG_EDK2_OPAL_PASSWORD=y
+CONFIG_EDK2_SETUP_PASSWORD=y
+CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y
+CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y
+CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y
+CONFIG_EDK2_SHOW_CAMERA_OPTION=y
+CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y
+CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y
+CONFIG_EDK2_DASHARO_USB_CONFIG=y
+CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
+CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y
+CONFIG_EDK2_DASHARO_POWER_CONFIG=y
+CONFIG_EDK2_SLEEP_TYPE_OPTION=y
+CONFIG_EDK2_FAN_CURVE_OPTION=y
+CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
+CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y
+CONFIG_EDK2_DASHARO_PCI_CONFIG=y
+CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y
+CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y
+CONFIG_EDK2_HAVE_2ND_UART=y
+CONFIG_EDK2_DASHARO_CPU_CONFIG=y
+CONFIG_EDK2_CORE_DISABLE_OPTION=y
+CONFIG_EDK2_HYPERTHREADING_OPTION=y
+CONFIG_EDK2_BOOT_MENU_KEY=0x0017
+CONFIG_EDK2_SETUP_MENU_KEY=0x000C
+CONFIG_EDK2_RAM_DISK_ENABLE=y
+CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y