diff --git a/.gitea/workflows/ci-build.yml b/.gitea/workflows/ci-build.yml
index da5439f8f..1b2772def 100644
--- a/.gitea/workflows/ci-build.yml
+++ b/.gitea/workflows/ci-build.yml
@@ -159,6 +159,9 @@ jobs:
     name: Deploy Staging (Watchtower auto-deploy)
     runs-on: saas
     timeout-minutes: 15
+    concurrency:
+      group: deploy-staging-${{ gitea.ref }}
+      cancel-in-progress: false
     needs:
     - build-staging
     if: github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'develop')
@@ -594,6 +597,9 @@ jobs:
     name: Deploy Production
     runs-on: saas
     timeout-minutes: 30
+    concurrency:
+      group: deploy-production-${{ gitea.ref }}
+      cancel-in-progress: false
     if: startsWith(github.ref, 'refs/tags/v')
     needs:
     - build-production
diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index d50dc24d2..a03a4401f 100755
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -30,7 +30,7 @@ on:
 permissions:
   contents: read
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  group: ci-cd-${{ gitea.event_name }}-${{ gitea.ref }}
   cancel-in-progress: true
 jobs:
   validate: