diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs
index b96a8762c..03b5e5038 100644
--- a/build_projects/dotnet-cli-build/PrepareTargets.cs
+++ b/build_projects/dotnet-cli-build/PrepareTargets.cs
@@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build
         public static BuildTargetResult ExpectedBuildArtifacts(BuildTargetContext c)
         {
             var config = Environment.GetEnvironmentVariable("CONFIGURATION");
-            var versionBadgeName = $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}_{config}_version_badge.svg";
+            var versionBadgeName = $"{Monikers.GetBadgeMoniker()}_{config}_version_badge.svg";
             c.BuildContext["VersionBadge"] = Path.Combine(Dirs.Output, versionBadgeName);
 
             var cliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs
index b7d883f9d..d28723643 100644
--- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs
+++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs
@@ -30,6 +30,21 @@ namespace Microsoft.DotNet.Cli.Build
             }
         }
 
+        public static string GetBadgeMoniker()
+        {
+            switch (RuntimeEnvironment.GetRuntimeIdentifier())
+            {
+                case "ubuntu.16.04-x64":
+                    return "Ubuntu_16_04_x64";
+                case "fedora.23-x64":
+                    return "Fedora_23_x64";
+                case "opensuse.13.2-x64":
+                    return "openSUSE_13_2_x64";
+            }
+
+            return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
+        }
+
         public static string GetDebianPackageName(BuildTargetContext c)
         {
             var channel = c.BuildContext.Get<string>("Channel").ToLower();