diff --git a/.github/workflows/loadtest.yml b/.github/workflows/loadtest.yml
index 0f9f070fc..a6163c07d 100644
--- a/.github/workflows/loadtest.yml
+++ b/.github/workflows/loadtest.yml
@@ -39,10 +39,37 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Run All JMeter Tests In tests Folder
-        uses: rbhadti94/apache-jmeter-action@v0.5.0
+      - uses: rbhadti94/apache-jmeter-action@v0.5.0
         with:
-          testFilePath: loadtests
+          testFilePath: loadtests/dops
+          outputReportsFolder: loadtests/results
+          args: |
+            --loglevel INFO 
+            --jmeterlogconf=log.conf
+            -JBEARER_TOKEN=${{inputs.bearer_token}}
+            -JNUM_THREADS=${{inputs.num_threads}}
+            -JFRONTEND_API_URL=${{inputs.frontend_api_url}}
+            -JDOPS_API_URL=${{inputs.dops_api_url}}
+            -JVEHICLES_API_URL=${{inputs.vehicles_api_url}}
+            -JRESULTS_DIR=loadtests/results
+      
+      - uses: rbhadti94/apache-jmeter-action@v0.5.0
+        with:
+          testFilePath: loadtests/vehicles
+          outputReportsFolder: loadtests/results
+          args: |
+            --loglevel INFO 
+            --jmeterlogconf=log.conf
+            -JBEARER_TOKEN=${{inputs.bearer_token}}
+            -JNUM_THREADS=${{inputs.num_threads}}
+            -JFRONTEND_API_URL=${{inputs.frontend_api_url}}
+            -JDOPS_API_URL=${{inputs.dops_api_url}}
+            -JVEHICLES_API_URL=${{inputs.vehicles_api_url}}
+            -JRESULTS_DIR=loadtests/results
+      
+      - uses: rbhadti94/apache-jmeter-action@v0.5.0
+        with:
+          testFilePath: loadtests/frontend
           outputReportsFolder: loadtests/results
           args: |
             --loglevel INFO 
diff --git a/loadtests/orbc_load_test_plan_dops.jmx b/loadtests/dops/orbc_load_test_plan_dops.jmx
similarity index 100%
rename from loadtests/orbc_load_test_plan_dops.jmx
rename to loadtests/dops/orbc_load_test_plan_dops.jmx
diff --git a/loadtests/orbc_load_test_plan_frontend.jmx b/loadtests/frontend/orbc_load_test_plan_frontend.jmx
similarity index 100%
rename from loadtests/orbc_load_test_plan_frontend.jmx
rename to loadtests/frontend/orbc_load_test_plan_frontend.jmx
diff --git a/loadtests/orbc_load_test_plan_vehicles.jmx b/loadtests/vehicles/orbc_load_test_plan_vehicles.jmx
similarity index 100%
rename from loadtests/orbc_load_test_plan_vehicles.jmx
rename to loadtests/vehicles/orbc_load_test_plan_vehicles.jmx