diff --git a/.github/workflows/pio.yml b/.github/workflows/pio.yml
index 6b6d3115..ce34e695 100644
--- a/.github/workflows/pio.yml
+++ b/.github/workflows/pio.yml
@@ -22,13 +22,18 @@ jobs:
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
       - name: Setup Vars
-        run: git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        id: vars
+        run: |
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          git_branch=${GITHUB_REF#refs/heads/}
+          echo "git_hash=${git_hash}" >> $GITHUB_ENV
+          echo "git_branch=${git_branch}" >> $GITHUB_ENV
       - name: Build PlatformIO Project
         run: pio run
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:
-            name: StarMod-esp32-${git_hash}.bin
+            name: StarMod-esp32-${{env.git_branch}}-${{env.git_hash}}.bin
             path: .pio/build/esp32dev/firmware.bin
             retention-days: 30