diff --git a/.github/workflows/buildAndRelease.yaml b/.github/workflows/buildAndRelease.yaml
index 31fb5fc..00a355e 100644
--- a/.github/workflows/buildAndRelease.yaml
+++ b/.github/workflows/buildAndRelease.yaml
@@ -6,6 +6,10 @@ on:
     tags:
       - "v*.*"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   buildAndRelease:
     runs-on: ubuntu-latest
@@ -35,11 +39,9 @@ jobs:
 
       - name: Zip the out directory
         if: startsWith(github.ref, 'refs/tags/v')
-        env:
-          REPO_NAME: ${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}
         run: |
           cd out
-          zip -r ../${REPO_NAME}-${{ github.ref_name }}.zip *
+          zip -r ../${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}-${{ github.ref_name }}.zip *
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2