diff --git a/Build-AllSamples.ps1 b/Build-AllSamples.ps1
index 6b3a19765..6b2e16614 100644
--- a/Build-AllSamples.ps1
+++ b/Build-AllSamples.ps1
@@ -40,6 +40,7 @@ param(
     [string[]]$Configurations = @(if ([string]::IsNullOrEmpty($env:WDS_Configuration)) { ('Debug', 'Release') } else { $env:WDS_Configuration }),
     [string[]]$Platforms = @(if ([string]::IsNullOrEmpty($env:WDS_Platform)) { ('x64', 'arm64') } else { $env:WDS_Platform }),
     [string]$LogFilesDirectory = (Join-Path (Get-Location) "_logs"),
+    [string]$InfOptions = "",
     [int]$ThrottleLimit
 )
 
@@ -68,4 +69,4 @@ foreach ($file in $solutionFiles) {
     }
 }
 
-.\Build-SampleSet -SampleSet $sampleSet -Configurations $Configurations -Platform $Platforms -LogFilesDirectory $LogFilesDirectory -Verbose:$Verbose -ThrottleLimit $ThrottleLimit
+.\Build-SampleSet -SampleSet $sampleSet -Configurations $Configurations -Platform $Platforms -LogFilesDirectory $LogFilesDirectory -Verbose:$Verbose -ThrottleLimit $ThrottleLimit -InfOptions $InfOptions
diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1
index 8638d5173..25346cda0 100644
--- a/Build-SampleSet.ps1
+++ b/Build-SampleSet.ps1
@@ -5,6 +5,7 @@ param(
     [string[]]$Platforms = @(if ([string]::IsNullOrEmpty($env:WDS_Platform)) { "x64" } else { $env:WDS_Platform }),
     $LogFilesDirectory = (Get-Location),
     [string]$ReportFileName = $(if ([string]::IsNullOrEmpty($env:WDS_ReportFileName)) { "_overview" } else { $env:WDS_ReportFileName }),
+    [string]$InfOptions = "",
     [int]$ThrottleLimit = 0
 )
 
@@ -135,6 +136,11 @@ if ($build_environment -match '^EWDK') {
 #
 $InfVerif_AdditionalOptions=($build_number -le 22621 ? "/sw1284 /sw1285 /sw1293 /sw2083 /sw2086" : "/samples")
 
+# Override InfVerif_AdditionalOptions if InfOptions parameter was provided
+if (-not [string]::IsNullOrEmpty($InfOptions)) {
+    $InfVerif_AdditionalOptions = $InfOptions
+}
+
 #
 # Determine exclusions.  
 #