diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da340282..311532f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ on:
       - Alpha
       
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
   
 env:
@@ -234,7 +234,7 @@ jobs:
 
   Upload-Prerelease:
     permissions: write-all
-    if: ${{ github.ref_type=='branch' && github.event_name != 'pull_request' }}
+    if: ${{ github.ref_type == 'branch' && !startsWith(github.event_name, 'pull_request') }}
     needs: [Build]
     runs-on: ubuntu-latest
     steps:
@@ -310,7 +310,7 @@ jobs:
           generate_release_notes: true
 
   Docker:
-    if: ${{ github.event_name != 'pull_request'  }}
+    if: ${{ !startsWith(github.event_name, 'pull_request') }}
     permissions: write-all
     needs: [Build]
     runs-on: ubuntu-latest