diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96dce2eaa..5212c2d06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,6 +95,9 @@ jobs:
             "${{ env.IMAGE_TAG }}"
 
       - uses: actions/upload-artifact@v2
+        env:
+          VERSIONED_ARTIFACT_NAME: |
+            format('{0}-{1}', matrix.tag, (github.event.release.tag_name != '' && github.event.release.tag_name) || github.sha)
         with:
-          name: ${{ matrix.tag }}-${{ github.sha }}
+          name: ${{ env.VERSIONED_ARTIFACT_NAME }}
           path: build/run.dist/