diff --git a/arch/x86/configs/nati_x86_64_defconfig b/arch/x86/configs/nati_x86_64_defconfig
index e72f30fd5c64b..0e56f71365bbb 100644
--- a/arch/x86/configs/nati_x86_64_defconfig
+++ b/arch/x86/configs/nati_x86_64_defconfig
@@ -53,6 +53,7 @@ CONFIG_NUMA=y
 # CONFIG_AMD_NUMA is not set
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 CONFIG_HZ_100=y
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_SUSPEND is not set
@@ -316,8 +317,8 @@ CONFIG_ATA_PIIX=y
 CONFIG_SATA_MV=m
 CONFIG_SATA_SIL=m
 CONFIG_MD=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
 CONFIG_DM_RAID=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
@@ -546,7 +547,7 @@ CONFIG_IRQ_REMAP=y
 CONFIG_NTB=y
 CONFIG_NTB_SWITCHTEC=y
 CONFIG_USB4=m
-CONFIG_DAX=m
+CONFIG_DAX=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -593,7 +594,6 @@ CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_HMAC=y