diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6afd7cc..dfc09ea 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -86,7 +86,7 @@ jobs:
           name: "Thunderstore CLI ${{ needs.validate-tag.outputs.tag }}"
           body_path: ${{ github.workspace }}/.github/RELEASE_TEMPLATE.md
           draft: true
-          prerelease: ${{ startsWith(steps.tag.outputs.tag, '0.') }}
+          prerelease: ${{ startsWith(needs.validate-tag.outputs.tag, '0.') }}
 
   nupkg:
     name: Build NuGet Package
@@ -119,4 +119,4 @@ jobs:
           name: "Thunderstore CLI ${{ needs.validate-tag.outputs.tag }}"
           body_path: ${{ github.workspace }}/.github/RELEASE_TEMPLATE.md
           draft: true
-          prerelease: ${{ startsWith(steps.tag.outputs.tag, '0.') }}
+          prerelease: ${{ startsWith(needs.validate-tag.outputs.tag, '0.') }}
diff --git a/ThunderstoreCLI/Utils/MiscUtils.cs b/ThunderstoreCLI/Utils/MiscUtils.cs
index 3e93f21..627863e 100644
--- a/ThunderstoreCLI/Utils/MiscUtils.cs
+++ b/ThunderstoreCLI/Utils/MiscUtils.cs
@@ -23,8 +23,8 @@ public static int[] GetCurrentVersion()
             throw new Exception("Reading app version from assembly failed");
         }
 
-        // Drop possible pre-release cruft ("-alpha.0.1") from the end.
-        var versionParts = version.Split('-')[0].Split('.');
+        // Drop possible pre-release or build metadata cruft ("-alpha.0.1", "+abcde") from the end.
+        var versionParts = version.Split('-', '+')[0].Split('.');
 
         if (versionParts is null || versionParts.Length != 3)
         {