diff --git a/build.proj b/build.proj
index e93d45d9c..5d0235bb7 100644
--- a/build.proj
+++ b/build.proj
@@ -7,9 +7,6 @@
   <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
 
   <PropertyGroup>
-    <Architecture Condition=" '$(OverrideArchitecture)' != '' ">$(OverrideArchitecture)</Architecture>
-    <Rid Condition=" '$(OverrideRid)' != '' ">$(OverrideRid)</Rid>    
-
     <!--
       $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
     -->
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index f7e181a16..19165e0ad 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -16,10 +16,6 @@
 
   <Target Name="InitializeCommonProps"
           DependsOnTargets="BuildDotnetCliBuildFramework" >
-    <GetVersionBadgeMoniker>
-      <Output TaskParameter="VersionBadgeMoniker" PropertyName="VersionBadgeMoniker" />
-    </GetVersionBadgeMoniker>
-
     <!-- Common Properties -->
     <PropertyGroup>
       <IsDesktopAvailable>False</IsDesktopAvailable>
@@ -52,6 +48,11 @@
       <VersionSuffix>$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
       <NugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix)</NugetVersion>
 
+      <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
+      <VersionBadgeMoniker Condition=" '$(Rid)' == 'ubuntu.16.04-x64' ">Ubuntu_16_04_x64</VersionBadgeMoniker>
+      <VersionBadgeMoniker Condition=" '$(Rid)' == 'fedora.23-x64' ">Fedora_23_x64</VersionBadgeMoniker>
+      <VersionBadgeMoniker Condition=" '$(Rid)' == 'opensuse.13.2-x64' ">openSUSE_13_2_x64</VersionBadgeMoniker>
+
       <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
       <SdkVersion>$(NugetVersion)</SdkVersion>
 
diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index 4f623018a..571ed3322 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -24,7 +24,6 @@
   <UsingTask TaskName="GetCommitCount" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="GetCommitHash" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="GetVersionBadgeMoniker" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
diff --git a/build_projects/dotnet-cli-build/GetCommitCount.cs b/build_projects/dotnet-cli-build/GetCommitCount.cs
index b820dd209..a160792ce 100644
--- a/build_projects/dotnet-cli-build/GetCommitCount.cs
+++ b/build_projects/dotnet-cli-build/GetCommitCount.cs
@@ -36,7 +36,12 @@ namespace Microsoft.DotNet.Cli.Build
 
         protected override void LogEventsFromTextOutput(string line, MessageImportance importance)
         {
-            CommitCount = line;
+            var buildVersion = new BuildVersion()
+            {
+                CommitCount = int.Parse(line)
+            };
+
+            CommitCount = buildVersion.CommitCountString;
         }
     }
 }
diff --git a/build_projects/dotnet-cli-build/GetVersionBadgeMoniker.cs b/build_projects/dotnet-cli-build/GetVersionBadgeMoniker.cs
deleted file mode 100644
index b199bc6f7..000000000
--- a/build_projects/dotnet-cli-build/GetVersionBadgeMoniker.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.DotNet.Cli.Build
-{
-    public class GetVersionBadgeMoniker : Task
-    {
-        [Output]
-        public string VersionBadgeMoniker { get; set; }
-
-        public override bool Execute()
-        {
-            VersionBadgeMoniker = Monikers.GetBadgeMoniker();
-
-            return true;
-        }
-    }
-}
diff --git a/run-build.ps1 b/run-build.ps1
index 435ea5ceb..632bbe286 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -110,11 +110,11 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
 if ($NoBuild)
 {
     Write-Host "Not building due to --nobuild"
-    Write-Host "Command that would be run: 'dotnet msbuild build.proj /m /p:OverrideArchitecture=$Architecture $ExtraParameters'"
+    Write-Host "Command that would be run: 'dotnet msbuild build.proj /m /p:Architecture=$Architecture $ExtraParameters'"
 }
 else
 {
-    dotnet msbuild build.proj /p:OverrideArchitecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
-    dotnet msbuild build.proj /m /v:diag /p:OverrideArchitecture=$Architecture $ExtraParameters
+    dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
+    dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters
     if($LASTEXITCODE -ne 0) { throw "Failed to build" } 
 }
diff --git a/run-build.sh b/run-build.sh
index bebcd7670..877c5b547 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -179,9 +179,9 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 echo "${args[@]}"
 
 if [ $BUILD -eq 1 ]; then
-    dotnet msbuild build.proj /p:OverrideArchitecture=$ARCHITECTURE /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
-    dotnet msbuild build.proj /m /v:diag /p:OverrideArchitecture=$ARCHITECTURE "${args[@]}"
+    dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
+    dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}"
 else
     echo "Not building due to --nobuild"
-    echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:OverrideArchitecture=$ARCHITECTURE ${args[@]}'"
+    echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE ${args[@]}'"
 fi