diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index 49835019ba..f387878114 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -7,8 +7,10 @@ on:
       - master
   workflow_dispatch:
 
+# This cancels older workflow runs on pull requests while ensuring that there
+# are no concurrency limits on pushes and manual workflow dispatches.
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions: