diff --git a/scripts/build.ps1 b/scripts/build.ps1
index cdb7a608c8..4115732e32 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -30,8 +30,8 @@ Param(
     [System.Boolean] $Localized = $false,
 
     [Parameter(Mandatory=$false)]
-    [Alias("real")]
-    [System.Boolean] $RealBuild = $false
+    [Alias("ci")]
+    [Switch] $CIBuild = $false
 )
 
 $ErrorActionPreference = "Stop"
@@ -68,6 +68,7 @@ $TPB_Configuration = $Configuration
 $TPB_TargetRuntime = $TargetRuntime
 $TPB_Version = $Version
 $TPB_VersionSuffix = $VersionSuffix
+$TPB_CIBuild = $CIBuild
 
 # Capture error state in any step globally to modify return code
 $Script:ScriptFailed = $false
@@ -149,7 +150,7 @@ function Invoke-Build
 
     Write-Log ".. .. Build: Source: $TPB_Solution"
     Write-Verbose "$dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version"
-    & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version
+    & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild
     Write-Log ".. .. Build: Complete."
 
     if ($lastExitCode -ne 0) {
diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index 7192063425..72fff2bd78 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -10,8 +10,8 @@
     <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <PublicSign>true</PublicSign>
-    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition="'$(CIBuild)' == '' or '$(CIBuild)' == 'false'">true</PublicSign>
+    <DelaySign Condition="'$(CIBuild)' == 'true'">true</DelaySign>
     <!--<GenerateDocumentationFile>true</GenerateDocumentationFile>-->
     <AssemblyOriginatorKeyFile>$(TestPlatformRoot)scripts/key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>