diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50e886942c98..da7757fcbfa8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 concurrency:
-  group: "${{ github.ref }}-lint"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c76425a40fbf..d6b346cb3995 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
 
 concurrency:
-  group: "${{ github.ref }}-jest"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-jest
   cancel-in-progress: true
 
 jobs: