diff --git a/Scripts/PackEachExperiment.ps1 b/Scripts/PackEachExperiment.ps1
index b71448de..f9e502b3 100644
--- a/Scripts/PackEachExperiment.ps1
+++ b/Scripts/PackEachExperiment.ps1
@@ -1,8 +1,11 @@
 Param (
-    [Parameter(HelpMessage = "Extra properties to pass to the msbuild pack command")]
-    [string]$extraBuildProperties
+    [Parameter(HelpMessage = "Date of Build/Package")]
+    [string]$date,
+
+    [Parameter(HelpMessage = "Any postfix after build number")]
+    [string]$postfix
 )
 
 foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') {
-  & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable $experimentProjPath $extraBuildProperties
+  & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable /p:DateForVersion=$date /p:PreviewVersion=$postfix $experimentProjPath
 }
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 3c9ea580..5fac813f 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -7,7 +7,8 @@
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
   <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$([System.DateTime]::UtcNow.ToString(yyMMdd))</Version>
+    <DateForVersion Condition="'$(DateForVersion)' == ''">$([System.DateTime]::UtcNow.ToString(yyMMdd))</DateForVersion>
+    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$(DateForVersion)</Version>
     <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
     <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>