diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 8589710d..1a60855d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -14,8 +14,8 @@ on:
         default: 'false'
 
 concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ (github.ref_type == 'tag' && !contains(github.ref_name, '-')) && 'prod' || (github.ref_type == 'tag' && 'staging' || 'testing') }}
+  cancel-in-progress: true
 
 jobs:
   # ──────────────────────────────────────────────────────────────────────────────