diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
index 922b3179a4..d0351a9a9d 100644
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@@ -27,12 +27,16 @@ on:
           - sustained-load
           - spike-test
 
+concurrency:
+  group: load-test-${{ inputs.environment }}
+  cancel-in-progress: false
+
 jobs:
   load-test:
     name: 'Load Test: ${{ inputs.scenario }} (${{ inputs.client_count }} clients)'
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment == 'staging' && 'staging' || '' }}
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     services:
       postgres:
@@ -183,9 +187,9 @@ jobs:
           echo "LOAD_TEST_CLIENTS=$CLIENT_COUNT" >> $GITHUB_ENV
 
       - name: Run load test
+        working-directory: tests/load
         run: |
-          pnpm --filter @cipherbox/load-tests test:single -- \
-            "${{ inputs.scenario }}"
+          pnpm exec vitest run --no-coverage "${{ inputs.scenario }}"
 
       - name: Upload metrics report
         if: always()