diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dcb9d986..007f1f7d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,10 +12,6 @@ on:
         type: string
         default: "dev"
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 env:
   CHANNEL: "${{ inputs.channel }}"
   NDK_VERSION: r26b
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9064d368..3b744737 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,14 @@ on:
       - '.vscode/'
       - 'appcast.xml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run:
     uses: ./.github/workflows/build.yml
     secrets: inherit
     permissions: write-all
     with:
-      upload-artifact: false
\ No newline at end of file
+      upload-artifact: ${{ github.event_name == 'push' }}
\ No newline at end of file