diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3d2b10..0a35ea2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,10 +15,23 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      tag_name: ${{ steps.set_tag_name.outputs.tag_name }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Determine TAG_NAME
+        id: set_tag_name
+        run: |
+          if [ "${{ github.event_name }}" = "release" ]; then
+            echo "TAG_NAME=${{ github.event.release.tag_name }}" >> "$GITHUB_ENV"
+            echo "tag_name=${{ github.event.release.tag_name }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "TAG_NAME=${{ github.ref_name }}" >> "$GITHUB_ENV"
+            echo "tag_name=${{ github.ref_name }}" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
@@ -40,7 +53,7 @@ jobs:
           fi
 
       - name: Package addon
-        run: zip -r "BetterWho-${{ github.event.release.tag_name }}.zip" addons/
+        run: zip -r "BetterWho-${TAG_NAME}.zip" addons/
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -52,7 +65,7 @@ jobs:
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
         with:
-          files: BetterWho.zip
+          files: BetterWho-${{ env.TAG_NAME }}.zip
 
   release:
     needs: build
@@ -60,6 +73,9 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release'
     steps:
+      - name: Set TAG_NAME
+        run: echo "TAG_NAME=${{ needs.build.outputs.tag_name }}" >> "$GITHUB_ENV"
+
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
@@ -69,7 +85,7 @@ jobs:
       - name: Zip release artifact
         run: |
           cd BetterWho
-          zip -r "../BetterWho-${{ github.event.release.tag_name }}.zip" -i counterstriksharp/
+          zip -r "../BetterWho-${TAG_NAME}.zip" -i counterstriksharp/
       - name: Get release upload URL
         id: release_info
         env:
@@ -87,6 +103,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release_info.outputs.upload_url }}
-          asset_path: BetterWho-${{ github.event.release.tag_name }}.zip
-          asset_name: cs2-betterwho-${{ github.event.release.tag_name }}.zip
+          asset_path: BetterWho-${{ env.TAG_NAME }}.zip
+          asset_name: cs2-betterwho-${{ env.TAG_NAME }}.zip
           asset_content_type: application/zip