diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 69c204f8da..db3ca17794 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -69,19 +69,6 @@ build:integration_test:
     - build_components
     - build_system
 
-# -------------
-# Special Cases
-# -------------
-"build:example_test-esp32c3":  # esp32c3 test is only run by label, but build jobs should always be triggered
-  labels:
-    - build
-    - example_test
-  patterns:
-    - build_components
-    - build_system
-    - build-example_test
-    - example_test
-
 ####################
 # Target Test Jobs #
 ####################
@@ -121,15 +108,6 @@ build:integration_test:
     - test:target_test
     - test:any_test
 
-"test:example_test-esp32c3":  # For esp32c3 we trigger only with label
-
-"labels:example_test-esp32c3":
-  labels:
-    - example_test_esp32c3
-  included_in:
-    - build:example_test-esp32c3
-    - build:target_test
-
 "test:integration_test":
   labels:
     - "integration_test"
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index bc7c0695f1..47f6b138cc 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -675,12 +675,6 @@
     - <<: *if-dev-push
       changes: *patterns-windows
 
-.rules:labels:example_test-esp32c3:
-  rules:
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-example_test_esp32c3
-
 .rules:labels:fuzzer_test-weekend_test:
   rules:
     - <<: *if-label-fuzzer_test
@@ -715,6 +709,7 @@
     - <<: *if-label-custom_test_esp32s3
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32
+    - <<: *if-label-example_test_esp32c3
     - <<: *if-label-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-host_test
@@ -841,6 +836,18 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
+.rules:test:example_test-esp32c3:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c3
+    - <<: *if-dev-push
+      changes: *patterns-build-example_test
+    - <<: *if-dev-push
+      changes: *patterns-example_test
+
 .rules:test:example_test-esp32s2:
   rules:
     - <<: *if-protected
@@ -909,6 +916,7 @@
     - <<: *if-label-custom_test_esp32s3
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32
+    - <<: *if-label-example_test_esp32c3
     - <<: *if-label-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-integration_test
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 1e1fa7573a..20543f0b6f 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -75,7 +75,7 @@ test_weekend_mqtt:
 .example_test_esp32c3_template:
   extends:
     - .example_test_template
-    - .rules:labels:example_test-esp32c3
+    - .rules:test:example_test-esp32c3
 
 .example_test_esp32s3_template:
   extends: