diff --git a/tools/ci/config/rules.yml b/tools/ci/config/rules.yml
index 5108085bf5..b4dad123fd 100644
--- a/tools/ci/config/rules.yml
+++ b/tools/ci/config/rules.yml
@@ -32,14 +32,14 @@
 .if-label-integration_test: &if-label-integration_test
   if: '$BOT_LABEL_INTEGRATION_TEST'
 
-.if-label-unit_test: &if-label-unit_test
-  if: '$BOT_LABEL_UNIT_TEST'
+.if-label-unit_test-32_only: &if-label-unit_test-32_only
+  if: '$BOT_LABEL_UNIT_TEST_32'
 
-.if-label-unit_test_s2: &if-label-unit_test_s2
+.if-label-unit_test-s2_only: &if-label-unit_test-s2_only
   if: '$BOT_LABEL_UNIT_TEST_S2'
 
 .if-label-unit_test-all_targets: &if-label-unit_test-all_targets
-  if: '$BOT_LABEL_UNIT_TEST || $BOT_LABEL_UNIT_TEST_S2'
+  if: '$BOT_LABEL_UNIT_TEST'
 
 .if-label-weekend_test: &if-label-weekend_test
   if: '$BOT_LABEL_WEEKEND_TEST'
@@ -176,11 +176,17 @@
 .rules:tests:unit_test:
   rules:
     - <<: *if-protected-no_label
-    - <<: *if-label-unit_test
+    - <<: *if-label-unit_test-all_targets
+
+.rules:tests:unit_test_32-only:
+  rules:
+    - <<: *if-protected-no_label
+    - <<: *if-label-unit_test-32_only
 
 .rules:tests:unit_test_s2-only:
   rules:
-    - <<: *if-label-unit_test_s2
+    - <<: *if-protected-no_label
+    - <<: *if-label-unit_test-s2_only
 
 .rules:tests:integration_test:
   rules:
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index c5f17599a2..7af34fa0f3 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -80,6 +80,18 @@
     TEST_CASE_PATH: "$CI_PROJECT_DIR/tools/unit-test-app"
     CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs"
 
+.unit_test_32_template:
+  extends:
+    - .unit_test_template
+    - .rules:tests:unit_test_32-only
+    - .rules:tests:unit_test
+
+.unit_test_s2_template:
+  extends:
+    - .unit_test_template
+    - .rules:tests:unit_test_s2-only
+    - .rules:tests:unit_test
+
 .integration_test_template:
   extends:
     - .target_test_job_template
@@ -332,7 +344,7 @@ component_ut_test_001:
     - COMPONENT_UT_GENERIC
 
 UT_001:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 45
   tags:
     - ESP32_IDF
@@ -341,7 +353,7 @@ UT_001:
 # Max. allowed value of 'parallel' is 50.
 
 UT_002:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 13
   tags:
     - ESP32_IDF
@@ -349,74 +361,74 @@ UT_002:
     - psram
 
 UT_003:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 2
   tags:
     - ESP32_IDF
     - UT_T1_SDMODE
 
 UT_004:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_SPIMODE
 
 UT_005:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_SDMODE
     - psram
 
 UT_006:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_SPIMODE
     - psram
 
 UT_008:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_GPIO
     - psram
 
 UT_012:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_LEDC
     - psram
 
 UT_014:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T2_RS485
     - psram
 
 UT_015:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_RMT
 
 UT_016:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_RMT
     - psram
 
 UT_017:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - EMMC
 
 UT_018:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 2
   tags:
     - ESP32_IDF
@@ -424,65 +436,60 @@ UT_018:
     - 8Mpsram
 
 UT_020:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - Example_SPI_Multi_device
     - psram
 
 UT_022:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T2_I2C
     - psram
 
 UT_023:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 2
   tags:
     - ESP32_IDF
     - UT_T1_MCPWM
 
 UT_024:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_MCPWM
     - psram
 
 UT_028:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T2_1
     - psram
 
 UT_031:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_FlashEncryption
 
 UT_033:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T2_Ethernet
     - psram
 
 UT_034:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   parallel: 2
   tags:
     - ESP32_IDF
     - UT_T1_ESP_FLASH
 
-.unit_test_s2_template:
-  extends:
-    - .unit_test_template
-    - .rules:tests:unit_test_s2-only # due to the lack of runners, s2 tests will only be triggered by label
-
 UT_035:
   extends: .unit_test_s2_template
   parallel: 46
@@ -491,7 +498,7 @@ UT_035:
     - UT_T1_1
 
 UT_036:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_PSRAMV0
@@ -512,34 +519,34 @@ UT_038:
     - UT_T1_ESP_FLASH
 
 UT_041:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_no32kXTAL
     - psram
 
 UT_043:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_32kXTAL
     - psram
 
 UT_044:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_SDIO
 
 UT_045:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_SDIO
     - psram
 
 UT_046:
-  extends: .unit_test_template
+  extends: .unit_test_32_template
   tags:
     - ESP32_IDF
     - UT_T1_GPIO