diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
index 46df6ffc0..35d1e14f1 100644
--- a/.github/workflows/macosx_cpn.yml
+++ b/.github/workflows/macosx_cpn.yml
@@ -91,9 +91,13 @@ jobs:
           mkdir output && \
           tools/build-companion-nightly.sh $(pwd) $(pwd)/output/
 
+      - name: Compose release filename
+        # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
+        run: echo "artifact_name=edgetx-cpn-osx-${GITHUB_REF##*/}" >> $GITHUB_ENV
+
       - name: Archive production artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: companion-nightly
+          name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output
           retention-days: 15
diff --git a/.github/workflows/win_cpn.yml b/.github/workflows/win_cpn.yml
index 257bba59a..df3c582e5 100644
--- a/.github/workflows/win_cpn.yml
+++ b/.github/workflows/win_cpn.yml
@@ -85,9 +85,13 @@ jobs:
           CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
           tools/build-companion-nightly.sh $(pwd) $(pwd)/output/
 
+      - name: Compose release filename
+        # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
+        run: echo "artifact_name=edgetx-cpn-win-${GITHUB_REF##*/}" >> $GITHUB_ENV
+
       - name: Archive production artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: companion-nightly
+          name: "${{ env.artifact_name }}"
           path:  ${{github.workspace}}/output
           retention-days: 15