diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 7ab9e4a0ef..3f16b63d6c 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -119,7 +119,6 @@
       - sdio      # pytest*sdio*
       - usb       # USB Device & Host tests
       - adc       # pytest*adc*
-      - i154
       - flash_multi
       - ecdsa
       - nvs_encr_hmac
@@ -149,21 +148,6 @@
     - "build:example_test"
     - build:target_test
 
-# For i154 runners
-"test:example_test-i154":
-  patterns:
-    - "example_test-i154"
-    - "target_test-i154"
-  labels:
-    - target_test
-    - example_test
-  included_in:
-    - "build:example_test-esp32s3"
-    - "build:example_test-esp32c6"
-    - "build:example_test-esp32h2"
-    - "build:example_test"
-    - build:target_test
-
 "test:host_test":
   labels:
     - host_test
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index dea9e18d24..98e18be4f1 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -83,22 +83,6 @@
 
   - "components/**/*"
 
-.patterns-component_ut-i154: &patterns-component_ut-i154
-  - "components/{esp_phy,esp_coex}/???[!t]*/**/*"
-  - "components/{esp_phy,esp_coex}/??[!s]?*/**/*"
-  - "components/{esp_phy,esp_coex}/???/**/*"
-  - "components/{esp_phy,esp_coex}/*"
-  - "components/ieee802154/**/*"
-
-.patterns-example_test-i154: &patterns-example_test-i154
-  - "components/{esp_netif,ieee802154,lwip,openthread}/???[!t]*/**/*"
-  - "components/{esp_netif,ieee802154,lwip,openthread}/??[!s]?*/**/*"
-  - "components/{esp_netif,ieee802154,lwip,openthread}/???/**/*"
-  - "components/{esp_netif,ieee802154,lwip,openthread}/??/**/*"
-  - "components/{esp_netif,ieee802154,lwip,openthread}/*"
-  - "examples/common_components/iperf/**/*"
-  - "examples/openthread/**/*"
-
 .patterns-target_test-wifi: &patterns-target_test-wifi
   - "components/{esp_wifi,esp_netif,lwip,esp_phy,wpa_supplicant,esp_coex}/???[!t]*/**/*"
   - "components/{esp_wifi,esp_netif,lwip,esp_phy,wpa_supplicant,esp_coex}/??[!s]?*/**/*"
@@ -1640,8 +1624,6 @@
       changes: *patterns-component_ut-adc
     - <<: *if-dev-push
       changes: *patterns-component_ut-flash_multi
-    - <<: *if-dev-push
-      changes: *patterns-component_ut-i154
     - <<: *if-dev-push
       changes: *patterns-component_ut-nvs_encr_hmac
     - <<: *if-dev-push
@@ -1662,8 +1644,6 @@
       changes: *patterns-example_test-adc
     - <<: *if-dev-push
       changes: *patterns-example_test-ethernet
-    - <<: *if-dev-push
-      changes: *patterns-example_test-i154
     - <<: *if-dev-push
       changes: *patterns-example_test-nvs_encr_hmac
     - <<: *if-dev-push
@@ -2651,18 +2631,6 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-wifi
 
-.rules:test:example_test-i154:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-example_test
-    - <<: *if-label-target_test
-    - <<: *if-dev-push
-      changes: *patterns-example_test-i154
-
 .rules:test:host_test:
   rules:
     - <<: *if-revert-branch
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 28d46e23ce..ddac7aa93a 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -1305,83 +1305,6 @@ pytest_components_esp32c6_adc:
       artifacts: false
   tags: [ esp32c6, adc ]
 
-pytest_examples_esp32c6_i154:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c6
-  needs:
-    - job: build_pytest_examples_esp32c6
-      artifacts: false
-  tags: [ esp32c6, ieee802154 ]
-
-pytest_examples_openthread_br:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-i154
-  needs:
-    - job: build_pytest_examples_esp32s3
-      artifacts: false
-    - job: build_pytest_examples_esp32c6
-      artifacts: false
-    - job: build_pytest_examples_esp32h2
-      artifacts: false
-  tags: [ esp32c6, openthread_br ]
-  script:
-    - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
-    # get runner env config file
-    - retry_failed git clone $TEST_ENV_CONFIG_REPO
-    - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs
-    # using runner tags as markers to filter the test cases
-    # Runner tags are comma separated, replace the comma with " and " for markers
-    - job_tags=$(python tools/ci/python_packages/gitlab_api.py get_job_tags $CI_PROJECT_ID --job_id $CI_JOB_ID)
-    - markers=$(echo $job_tags | sed -e "s/,/ and /g")
-    # download the artifacts, requires s3, c6, h2 chips
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32s3"
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32c6"
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32h2"
-    - run_cmd pytest $TEST_DIR
-      -m \"${markers}\"
-      --junitxml=XUNIT_RESULT.xml
-      --ignore-result-files known_failure_cases/known_failure_cases.txt
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      ${PYTEST_EXTRA_FLAGS}
-      --app-info-filepattern \"list_job_*.txt\"
-
-pytest_examples_openthread_bbr:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-i154
-  needs:
-    - job: build_pytest_examples_esp32s3
-      artifacts: false
-    - job: build_pytest_examples_esp32c6
-      artifacts: false
-    - job: build_pytest_examples_esp32h2
-      artifacts: false
-  tags: [ esp32c6, openthread_bbr ]
-  script:
-    - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
-    # get runner env config file
-    - retry_failed git clone $TEST_ENV_CONFIG_REPO
-    - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs
-    # using runner tags as markers to filter the test cases
-    # Runner tags are comma separated, replace the comma with " and " for markers
-    - job_tags=$(python tools/ci/python_packages/gitlab_api.py get_job_tags $CI_PROJECT_ID --job_id $CI_JOB_ID)
-    - markers=$(echo $job_tags | sed -e "s/,/ and /g")
-    # download the artifacts, requires s3, c6, h2 chips
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32s3"
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32c6"
-    - run_cmd python tools/ci/artifacts_handler.py download --job-name "build_pytest_examples_esp32h2"
-    - run_cmd pytest $TEST_DIR
-      -m \"${markers}\"
-      --junitxml=XUNIT_RESULT.xml
-      --ignore-result-files known_failure_cases/known_failure_cases.txt
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      ${PYTEST_EXTRA_FLAGS}
-      --app-info-filepattern \"list_job_*.txt\"
-
 pytest_examples_openthread_sleep:
   extends:
     - .pytest_examples_dir_template
diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml
index d733dc017f..ecffa999bd 100644
--- a/examples/zigbee/.build-test-rules.yml
+++ b/examples/zigbee/.build-test-rules.yml
@@ -1,8 +1,9 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
 .zigbee_dependencies: &zigbee_dependencies
+  depends_components:
+    - ieee802154
   depends_filepatterns:
-    - components/ieee802154/**/*
     - examples/zigbee/light_sample/**/*
 
 examples/zigbee/esp_zigbee_gateway: