diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 81073e7b1c..fd88b6c113 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -176,7 +176,7 @@ build_pytest_examples_esp32:
   extends:
     - .build_pytest_no_jtag_template
     - .rules:build:example_test-esp32
-  parallel: 4
+  parallel: 6
   variables:
     IDF_TARGET: esp32
     TEST_DIR: examples
@@ -203,7 +203,7 @@ build_pytest_examples_esp32c3:
   extends:
     - .build_pytest_no_jtag_template
     - .rules:build:example_test-esp32c3
-  parallel: 3
+  parallel: 4
   variables:
     IDF_TARGET: esp32c3
     TEST_DIR: examples
@@ -212,6 +212,7 @@ build_pytest_examples_esp32c2:
   extends:
     - .build_pytest_no_jtag_template
     - .rules:build:example_test-esp32c2
+  parallel: 2
   variables:
     IDF_TARGET: esp32c2
     TEST_DIR: examples
@@ -244,6 +245,7 @@ build_pytest_examples_esp32c6:
   extends:
     - .build_pytest_template
     - .rules:build:example_test-esp32c6
+  parallel: 2
   variables:
     IDF_TARGET: esp32c6
     TEST_DIR: examples
@@ -252,7 +254,7 @@ build_pytest_components_esp32:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32
-  parallel: 2
+  parallel: 5
   variables:
     IDF_TARGET: esp32
     TEST_DIR: components
@@ -261,7 +263,7 @@ build_pytest_components_esp32s2:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32s2
-  parallel: 2
+  parallel: 4
   variables:
     IDF_TARGET: esp32s2
     TEST_DIR: components
@@ -270,7 +272,7 @@ build_pytest_components_esp32s3:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32s3
-  parallel: 2
+  parallel: 4
   variables:
     IDF_TARGET: esp32s3
     TEST_DIR: components
@@ -279,7 +281,7 @@ build_pytest_components_esp32c3:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32c3
-  parallel: 2
+  parallel: 4
   variables:
     IDF_TARGET: esp32c3
     TEST_DIR: components
@@ -288,6 +290,7 @@ build_pytest_components_esp32c2:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32c2
+  parallel: 3
   variables:
     IDF_TARGET: esp32c2
     TEST_DIR: components
@@ -296,6 +299,7 @@ build_pytest_components_esp32c6:
   extends:
     - .build_pytest_template
     - .rules:build:component_ut-esp32c6
+  parallel: 3
   variables:
     IDF_TARGET: esp32c6
     TEST_DIR: components
@@ -304,7 +308,7 @@ build_non_test_components_apps:
   extends:
     - .build_cmake_template
     - .rules:build:component_ut
-  parallel: 2
+  parallel: 5
   script:
     - set_component_ut_vars
     # CI specific options start from "--collect-size-info xxx". could ignore when running locally
@@ -358,6 +362,7 @@ build_pytest_test_apps_esp32s3:
   extends:
     - .build_pytest_test_apps_template
     - .rules:build:custom_test-esp32s3
+  parallel: 2
   variables:
     IDF_TARGET: esp32s3
     TEST_DIR: tools/test_apps
@@ -519,7 +524,6 @@ build_esp_idf_tests_cmake_esp32:
   extends:
     - .build_esp_idf_tests_cmake_template
     - .rules:build:unit_test-esp32
-  parallel: 2
   variables:
     IDF_TARGET: esp32
 
@@ -527,7 +531,6 @@ build_esp_idf_tests_cmake_esp32s2:
   extends:
     - .build_esp_idf_tests_cmake_template
     - .rules:build:unit_test-esp32s2
-  parallel: 2
   variables:
     IDF_TARGET: esp32s2
 
@@ -563,7 +566,7 @@ build_examples_cmake_esp32:
   extends:
     - .build_cmake_template
     - .rules:build:example_test-esp32
-  parallel: 9
+  parallel: 8
   variables:
     IDF_TARGET: esp32
     TEST_DIR: examples
@@ -572,7 +575,7 @@ build_examples_cmake_esp32s2:
   extends:
     - .build_cmake_template
     - .rules:build:example_test-esp32s2
-  parallel: 6
+  parallel: 7
   variables:
     IDF_TARGET: esp32s2
     TEST_DIR: examples
@@ -590,7 +593,7 @@ build_examples_cmake_esp32c2:
   extends:
     - .build_cmake_template
     - .rules:build:example_test-esp32c2
-  parallel: 4
+  parallel: 6
   variables:
     IDF_TARGET: esp32c2
     TEST_DIR: examples
@@ -616,7 +619,7 @@ build_examples_cmake_esp32c6:
   extends:
     - .build_cmake_template
     - .rules:build:example_test-esp32c6
-  parallel: 4
+  parallel: 6
   variables:
     IDF_TARGET: esp32c6
     TEST_DIR: examples