diff --git a/Clients/GithubClient/Client.CI.cs b/Clients/GithubClient/Client.CI.cs
index 127b9ba9..fbb071d3 100644
--- a/Clients/GithubClient/Client.CI.cs
+++ b/Clients/GithubClient/Client.CI.cs
@@ -127,7 +127,7 @@ public partial class Client
         // https://api.github.com/repos/RPCS3/rpcs3/actions/artifacts/2802751674 /zip
         // we need public web links like this:
         // https://github.com/RPCS3/rpcs3/actions/runs/14017059654/artifacts/2802751674
-        var windowsBuildArtifact = artifacts.FirstOrDefault(a => a.Name.Contains("Windows") && !a.Name.Contains("Clang") && !a.Name.Contains("ARM"));
+        var windowsBuildArtifact = artifacts.FirstOrDefault(a => a.Name.Contains("Windows") && !a.Name.Contains("clang") && !a.Name.Contains("ARM"));
         if (windowsBuildArtifact is { ArchiveDownloadUrl.Length: > 0, Expired: false })
         {
             var winZipUrl = $"https://github.com/RPCS3/rpcs3/actions/runs/{run.Id}/artifacts/{windowsBuildArtifact.Id}";
diff --git a/CompatBot/Commands/Pr.cs b/CompatBot/Commands/Pr.cs
index ad657c52..e9d33c36 100644
--- a/CompatBot/Commands/Pr.cs
+++ b/CompatBot/Commands/Pr.cs
@@ -212,7 +212,7 @@ internal sealed class Pr
 
                         // windows build
                         var name = ghBuild.WindowsFilename ?? "Windows PR Build";
-                        name = name.Replace("rpcs3-", "").Replace("_win64", "");
+                        name = name.Replace("rpcs3-", "").Replace("_win64", "").Replace("_msvc", "");
                         if (ghBuild.WindowsBuildDownloadLink is {Length: >0})
                             windowsDownloadText = $"[⏬ {name}]({ghBuild.WindowsBuildDownloadLink})";
                         else if (shouldHaveArtifacts)
@@ -223,7 +223,7 @@ internal sealed class Pr
 
                         // windows arm build
                         name = ghBuild.WindowsArmFilename ?? "Windows ARM64 PR Build";
-                        name = name.Replace("rpcs3-", "").Replace("_arm64", "");
+                        name = name.Replace("rpcs3-", "").Replace("_aarch64", "").Replace("_clang", "");
                         if (ghBuild.WindowsArmBuildDownloadLink is {Length: >0})
                             windowsArmDownloadText = $"[⏬ {name}]({ghBuild.WindowsArmBuildDownloadLink})";
                         else if (shouldHaveArtifacts)
@@ -231,7 +231,6 @@ internal sealed class Pr
                             if ((DateTime.UtcNow - ghBuild.FinishTime).TotalDays > 30)
                                 windowsArmDownloadText = "No longer available";
                         }
-                        windowsArmDownloadText = "-";
 
                         // linux build
                         name = ghBuild.LinuxFilename ?? "Linux PR Build";
@@ -268,7 +267,7 @@ internal sealed class Pr
 
                         // mac arm build
                         name = ghBuild.MacArmFilename ?? "Mac Apple Silicon PR Build";
-                        name = name.Replace("rpcs3-", "").Replace("_macos_arm64", "");
+                        name = name.Replace("rpcs3-", "").Replace("_macos", "").Replace("_arm64", "");
                         if (ghBuild.MacArmBuildDownloadLink is {Length: >0})
                             macArmDownloadText = $"[⏬ {name}]({ghBuild.MacArmBuildDownloadLink})";
                         else if (shouldHaveArtifacts)