diff --git a/DasharoPayloadPkg/DasharoPayloadPkg.dsc b/DasharoPayloadPkg/DasharoPayloadPkg.dsc
index 09c7d32983..e8b1259c8b 100644
--- a/DasharoPayloadPkg/DasharoPayloadPkg.dsc
+++ b/DasharoPayloadPkg/DasharoPayloadPkg.dsc
@@ -26,6 +26,21 @@
 
   DEFINE SOURCE_DEBUG_ENABLE          = FALSE
   DEFINE PS2_KEYBOARD_ENABLE          = FALSE
+  DEFINE PS2_MOUSE_ENABLE             = FALSE
+
+  DEFINE HAVE_SATA                    = FALSE
+  DEFINE HAVE_ATA                     = FALSE
+  DEFINE HAVE_SCSI                    = FALSE
+  DEFINE HAVE_NVME                    = FALSE
+  DEFINE HAVE_SD                      = FALSE
+  DEFINE HAVE_EMMC                    = FALSE
+
+  DEFINE SUPPORT_SCREENSHOT           = FALSE
+  DEFINE SUPPORT_USB_MOUSE            = FALSE
+  DEFINE SUPPORT_FS_NTFS              = FALSE
+  DEFINE SUPPORT_FS_EXFAT             = FALSE
+  DEFINE SUPPORT_FS_EXT2              = FALSE
+  DEFINE SUPPORT_FS_EXT4              = FALSE
 
   #
   # SBL:      UEFI payload for Slim Bootloader
@@ -748,7 +763,9 @@
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
   DasharoPayloadPkg/BlSupportDxe/BlSupportDxe.inf
+!if $(SUPPORT_SCREENSHOT)
   CrScreenshotDxe/CrScreenshotDxe.inf
+!endif
 
   #
   # SMBIOS Support
@@ -779,19 +796,33 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+!if $(HAVE_SATA) == TRUE
   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+!endif
+!if $(HAVE_ATA) == TRUE
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+!endif
+!if $(HAVE_NVME) == TRUE
   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!endif
+!if $(HAVE_SCSI) == TRUE
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+!endif
 
   #
   # SD/eMMC Support
   #
+!if $(HAVE_SD) == TRUE || $(HAVE_EMMC) == TRUE
   MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+!endif
+!if $(HAVE_EMMC) == TRUE
   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+!endif
+!if $(HAVE_SD) == TRUE
   MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+!endif
 
   #
   # Usb Support
@@ -801,9 +832,11 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+!if $(SUPPORT_USB_MOUSE) == TRUE
+  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
   MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+!endif
 
   #
   # ISA Support
@@ -826,6 +859,8 @@
   OvmfPkg/SioBusDxe/SioBusDxe.inf
 !if $(PS2_KEYBOARD_ENABLE) == TRUE
   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+!endif
+!if $(PS2_MOUSE_ENABLE) == TRUE
   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
 !endif
 
@@ -844,7 +879,6 @@
   DasharoPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
 !endif
 
-
   #
   # Network Support
   #
diff --git a/DasharoPayloadPkg/DasharoPayloadPkg.fdf b/DasharoPayloadPkg/DasharoPayloadPkg.fdf
index 9842d7cc92..db96322cd0 100644
--- a/DasharoPayloadPkg/DasharoPayloadPkg.fdf
+++ b/DasharoPayloadPkg/DasharoPayloadPkg.fdf
@@ -165,6 +165,8 @@ INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
 INF OvmfPkg/SioBusDxe/SioBusDxe.inf
 !if $(PS2_KEYBOARD_ENABLE) == TRUE
 INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+!endif
+!if $(PS2_MOUSE_ENABLE) == TRUE
 INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
 !endif
 
@@ -194,7 +196,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 !else
   INF DasharoPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf
 !endif
- 
+
 
 
 #
@@ -203,36 +205,51 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
 INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+!if $(HAVE_SATA) == TRUE
 INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+!endif
+!if $(HAVE_ATA) == TRUE
 INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+!endif
+!if $(HAVE_NVME) == TRUE
 INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!endif
+!if $(HAVE_SCSI) == TRUE
 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+!endif
 
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
 #
 # Filesystem drivers
 #
-!if $(ARCH) == IA32
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/exfat.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ext2.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ntfs.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ext4.inf
-!else
-INF  RuleOverride=BINARY USE = X64 FSDrivers/exfat.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ext2.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ntfs.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ext4.inf
+!if $(SUPPORT_FS_EXFAT)
+INF  RuleOverride=BINARY USE = $(ARCH) FSDrivers/exfat.inf
+!endif
+!if $(SUPPORT_FS_EXT2)
+INF  RuleOverride=BINARY USE = $(ARCH) FSDrivers/ext2.inf
+!endif
+!if $(SUPPORT_FS_NTFS)
+INF  RuleOverride=BINARY USE = $(ARCH) FSDrivers/ntfs.inf
+!endif
+!if $(SUPPORT_FS_EXT4)
+INF  RuleOverride=BINARY USE = $(ARCH) FSDrivers/ext4.inf
 !endif
 
 #
 # SD/eMMC Support
 #
+!if $(HAVE_SD) == TRUE || $(HAVE_EMMC) == TRUE
 INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+!endif
+!if $(HAVE_EMMC) == TRUE
 INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+!endif
+!if $(HAVE_SD) == TRUE
 INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+!endif
 
 #
 # Usb Support
@@ -242,9 +259,11 @@ INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
 INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+!if $(SUPPORT_USB_MOUSE) == TRUE
+INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+!endif
 
 #
 # Hash2
@@ -390,7 +409,9 @@ INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
 !endif
 !endif
 
+!if $(SUPPORT_SCREENSHOT)
 INF CrScreenshotDxe/CrScreenshotDxe.inf
+!endif
 
 ################################################################################
 #