diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
index af290e52de..694fb1c841 100644
--- a/.github/workflows/deploy-main.yml
+++ b/.github/workflows/deploy-main.yml
@@ -50,7 +50,7 @@ jobs:
   # See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows#restrictions-for-accessing-a-cache
   build-all:
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
+      group: ${{ github.workflow }}-build-${{ github.ref }}
       cancel-in-progress: true
     uses: ./.github/workflows/workflow-build.yml
     if: github.repository == 'lynx-family/lynx-stack'
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'lynx-family/lynx-stack'
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
+      group: ${{ github.workflow }}-publish-${{ github.ref }}
       cancel-in-progress: false
     environment: main branch
     permissions:
diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml
index 36aa34b255..61ede944b6 100644
--- a/.github/workflows/workflow-test.yml
+++ b/.github/workflows/workflow-test.yml
@@ -74,7 +74,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: ${{ inputs.codecov-flags }}
-          override_branch: ${{ github.event_name == 'merge_queue' && 'main' || '' }}
+          override_branch: ${{ github.event_name == 'merge_group' && 'main' || '' }}
       - name: Upload Test Result
         if: ${{ inputs.is-web && failure() }}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4