diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index eaf59bd4..65684c7d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - "!skipci*"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
+  group: ${{ github.ref_name }}
 
 permissions:
   id-token: write
diff --git a/.github/workflows/destroy.yml b/.github/workflows/destroy.yml
index f45b1ba8..4ac1c81e 100644
--- a/.github/workflows/destroy.yml
+++ b/.github/workflows/destroy.yml
@@ -8,6 +8,9 @@ on:
         description: "Name of the environment to destroy:"
         required: true
 
+concurrency:
+  group: ${{ inputs.environment || github.event.ref }}
+
 permissions:
   id-token: write
   contents: read