diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index c9a26e839d..fd439bab0f 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -5,7 +5,8 @@
           DependsOnTargets="CheckIfAllBuildsHavePublished;
                             FinalizeBuild" />
 
-  <Target Name="CheckIfAllBuildsHavePublished">
+  <Target Name="CheckIfAllBuildsHavePublished"
+          DependsOnTargets="SetBadgeProps">
     <CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)"
                                    AccountName="$(ArtifactCloudDropAccountName)"
                                    ContainerName="$(ArtifactContainerName)"
diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
index 49f72e4409..c2f3496241 100644
--- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
+++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
@@ -55,9 +55,9 @@ public override bool Execute()
                 { "linux_x64", false },
                 { "rhel.6_x64", false },
                 { "alpine.3.6_x64", false },
-                { "all_linux_distros_native_installer", false},
-                { "linux_arm", false},
-                { "linux_arm64", false}
+                { "all_linux_distros_native_installer", false },
+                { "linux_arm", false },
+                { "linux_arm64", false }
             };
 
             if (!badges.ContainsKey(VersionBadgeMoniker))
@@ -71,7 +71,7 @@ public override bool Execute()
                 string name = Path.GetFileName(file);
                 foreach (string img in badges.Keys)
                 {
-                    if ((name.StartsWith($"{img}")) && (name.EndsWith(".svg")))
+                    if ((name.StartsWith($"{img}_")) && (name.EndsWith(".svg")))
                     {
                         badges[img] = true;
                         break;