diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix-rust.yml
similarity index 100%
rename from .github/workflows/autofix.yml
rename to .github/workflows/autofix-rust.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test-rust.yml
similarity index 100%
rename from .github/workflows/test.yml
rename to .github/workflows/test-rust.yml
diff --git a/.github/workflows/tabby-agent-test.yml b/.github/workflows/test-tabby-agent.yml
similarity index 79%
rename from .github/workflows/tabby-agent-test.yml
rename to .github/workflows/test-tabby-agent.yml
index 9f62fb107ec6..6a3c41974301 100644
--- a/.github/workflows/tabby-agent-test.yml
+++ b/.github/workflows/test-tabby-agent.yml
@@ -1,13 +1,6 @@
-name: Test tabby-agent
+name: Test Tabby Agent
 
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - '.github/workflows/tabby-agent-test.yml'
-      - 'package.json'
-      - 'yarn.lock'
-      - 'clients/tabby-agent/**'
   pull_request:
     branches: [ main ]
     paths:
@@ -16,8 +9,14 @@ on:
       - 'yarn.lock'
       - 'clients/tabby-agent/**'
 
+concurrency:
+  group: ${{ github.workflow_ref }}-${{ github.head_ref || github.ref_name }} 
+  
+  # If this is enabled it will cancel current running and start latest
+  cancel-in-progress: true
+
 jobs:
-  test:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/vscode-test.yml b/.github/workflows/test-vscode.yml
similarity index 80%
rename from .github/workflows/vscode-test.yml
rename to .github/workflows/test-vscode.yml
index f581d0e98375..b7f946b67e2f 100644
--- a/.github/workflows/vscode-test.yml
+++ b/.github/workflows/test-vscode.yml
@@ -1,14 +1,6 @@
 name: Test VSCode Extension
 
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - '.github/workflows/vscode-test.yml'
-      - 'package.json'
-      - 'yarn.lock'
-      - 'clients/tabby-agent/**'
-      - 'clients/vscode/**'
   pull_request:
     branches: [ main ]
     paths:
@@ -18,8 +10,14 @@ on:
       - 'clients/tabby-agent/**'
       - 'clients/vscode/**'
 
+concurrency:
+  group: ${{ github.workflow_ref }}-${{ github.head_ref || github.ref_name }} 
+  
+  # If this is enabled it will cancel current running and start latest
+  cancel-in-progress: true
+
 jobs:
-  test:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout