diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 45242d98e5..239f2c7c73 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -33,6 +33,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride Runtime for Android
diff --git a/.github/workflows/build-assembly-processor.yml b/.github/workflows/build-assembly-processor.yml
index 9a00e4194e..4b208ea5a2 100644
--- a/.github/workflows/build-assembly-processor.yml
+++ b/.github/workflows/build-assembly-processor.yml
@@ -29,6 +29,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Assembly Processor
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
index 9ada33e0a1..2cad4b67b4 100644
--- a/.github/workflows/build-ios.yml
+++ b/.github/workflows/build-ios.yml
@@ -33,6 +33,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride Runtime for iOS
diff --git a/.github/workflows/build-launcher.yml b/.github/workflows/build-launcher.yml
index bcced9d613..c2faab22ff 100644
--- a/.github/workflows/build-launcher.yml
+++ b/.github/workflows/build-launcher.yml
@@ -31,6 +31,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride Runtime for Windows
diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml
index 531768b08f..4b9c52432c 100644
--- a/.github/workflows/build-linux-runtime.yml
+++ b/.github/workflows/build-linux-runtime.yml
@@ -43,6 +43,10 @@ on:
         default: OpenGL
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.graphics-api || inputs.graphics-api || 'OpenGL' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride Runtime for Linux
diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml
index f89b051ad0..a80b9413bb 100644
--- a/.github/workflows/build-vs-package.yml
+++ b/.github/workflows/build-vs-package.yml
@@ -28,6 +28,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Visual Studio Package
diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml
index c1f6ce681e..99b30f3ab5 100644
--- a/.github/workflows/build-windows-full.yml
+++ b/.github/workflows/build-windows-full.yml
@@ -28,6 +28,10 @@ on:
         default: Debug
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride for Windows
diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml
index 6d0ded05a7..10b9ff4055 100644
--- a/.github/workflows/build-windows-runtime.yml
+++ b/.github/workflows/build-windows-runtime.yml
@@ -46,6 +46,10 @@ on:
         default: Direct3D11
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.graphics-api || inputs.graphics-api || 'Direct3D11' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Build Stride Runtime for Windows
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35813c2aba..f940f82411 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,6 +16,10 @@ on:
       - '!crowdin.yml'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ### Misc. ###
   Assembly-Processor:
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 551819bcce..6356087acc 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -26,13 +26,17 @@ on:
         default: Simple
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Test Stride on Linux
   #
   Linux-Tests:
     if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' || github.event.pull_request.draft == false }}
-    name: Test (${{ github.event.inputs.build-type || inputs.build-type }}, ${{ github.event.inputs.test-category || inputs.test-category }})
+    name: Test (${{ github.event.inputs.build-type || inputs.build-type }}, ${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }})
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +47,7 @@ jobs:
           dotnet-version: '8.0.x'
       - name: Build
         run: |
-          dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category }}.slnf `
+          dotnet build build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
             -restore -m:1 -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }} `
@@ -51,6 +55,6 @@ jobs:
             -p:StrideGraphicsApis=OpenGL
       - name: Test
         run: |
-          dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category }}.slnf `
+          dotnet test build\Stride.Tests.${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}.slnf `
             --no-build `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type }}
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 449a83eb6e..cc81400a2d 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -39,6 +39,10 @@ on:
         default: Simple
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}-${{ github.event.inputs.test-category || inputs.test-category || 'Simple' }}
+  cancel-in-progress: true
+
 jobs:
   #
   # Test Stride on Windows