diff --git a/Support/Build.ps1 b/Support/Build.ps1
index 886974eb..dc05f719 100644
--- a/Support/Build.ps1
+++ b/Support/Build.ps1
@@ -9,8 +9,16 @@ if (!$versionId) {
     $versionId = $unixTime
 }
 
+$versionId = $versionId.Substring(0, [Math]::Min(10, $versionId.Length))
+
+$versionId = "alpha.$versionId"
+
 Write-Output "Creating new '$config' build @ $unixTime with version identifier: '$versionId'"
 
-dotnet msbuild /p:VersionSuffix=alpha.$unixTime /p:Configuration=$config
+dotnet msbuild /p:VersionSuffix=$versionId /p:Configuration=$config
+
+$versionPrefix = [xml](Get-Content Core/Key2Joy.Core/Key2Joy.Core.csproj) | Select-Xml -XPath "/Project/PropertyGroup/VersionPrefix" | Select-Object -ExpandProperty Node | Select-Object -ExpandProperty "#text"
+
+$versionId = "$versionPrefix-$versionId"
 
 Write-Output $versionId