diff --git a/examples/ethernet/.build-test-rules.yml b/examples/ethernet/.build-test-rules.yml
index 35a00eebdb..e52a806732 100644
--- a/examples/ethernet/.build-test-rules.yml
+++ b/examples/ethernet/.build-test-rules.yml
@@ -49,7 +49,6 @@ examples/ethernet/iperf:
     - console
     - esp_driver_gpio
     - esp_driver_spi
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
-    - examples/system/console/advanced/components/cmd_system/**/*
-    - examples/ethernet/basic/components/ethernet_init/**/*
+    - cmd_system
+    - ethernet_init
+    - protocol_examples_common
diff --git a/examples/ieee802154/.build-test-rules.yml b/examples/ieee802154/.build-test-rules.yml
index 0af66989a0..da1aefce19 100644
--- a/examples/ieee802154/.build-test-rules.yml
+++ b/examples/ieee802154/.build-test-rules.yml
@@ -5,9 +5,9 @@
     - esp_coex
     - esp_phy
     - ieee802154
+    - cmd_system
   depends_filepatterns:
     - examples/ieee802154/**/*
-    - examples/system/console/advanced/components/cmd_system/**/*
 
 examples/ieee802154/ieee802154_cli:
   enable:
diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml
index 2a62378780..d479ebc53e 100644
--- a/examples/network/.build-test-rules.yml
+++ b/examples/network/.build-test-rules.yml
@@ -26,7 +26,6 @@ examples/network/simple_sniffer:
       reason: lack of runners
   depends_filepatterns:
     - tools/ci/python_packages/common_test_methods.py
-    - examples/common_components/protocol_examples_common/**/*
     - examples/protocols/**/*
     - examples/wifi/**/*
     - examples/network/simple_sniffer/**/*
@@ -35,6 +34,7 @@ examples/network/simple_sniffer:
   depends_components:
     - app_update
     - esp_https_ota
+    - protocol_examples_common
 
 examples/network/sta2eth:
   disable:
diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
index 07d49e3b3b..2c0892d6ee 100644
--- a/examples/protocols/.build-test-rules.yml
+++ b/examples/protocols/.build-test-rules.yml
@@ -1,8 +1,6 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
 .default_dependencies: &default_dependencies
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
   depends_components:
     - lwip
     - esp_netif
@@ -10,6 +8,7 @@
     - esp_phy
     - esp_eth
     - mbedtls
+    - protocol_examples_common
 
 examples/protocols/esp_http_client:
   <<: *default_dependencies
@@ -22,7 +21,6 @@ examples/protocols/esp_http_client:
   disable_test:
     - if: IDF_TARGET not in ["esp32", "linux"]
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_http_client/**/*
 
 examples/protocols/esp_local_ctrl:
@@ -35,7 +33,6 @@ examples/protocols/esp_local_ctrl:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/protocomm/**/*
     - tools/esp_prov/**/*
 
@@ -59,7 +56,6 @@ examples/protocols/http_server:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_http_server/**/*
 
 examples/protocols/http_server/captive_portal:
@@ -72,7 +68,6 @@ examples/protocols/http_server/captive_portal:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_http_server/**/*
 
 examples/protocols/http_server/restful_server:
@@ -82,7 +77,6 @@ examples/protocols/http_server/restful_server:
       temporary: true
       reason: not supported yet  # TODO: [ESP32C5] IDF-8697
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_http_server/**/*
 
 examples/protocols/http_server/ws_echo_server:
@@ -95,7 +89,6 @@ examples/protocols/http_server/ws_echo_server:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_http_server/**/*
 
 examples/protocols/https_mbedtls:
@@ -130,7 +123,6 @@ examples/protocols/https_server/simple:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_https_server/**/*
     - components/esp_tls/**/*
 
@@ -144,7 +136,6 @@ examples/protocols/https_server/wss_server:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_https_server/**/*
 
 examples/protocols/https_x509_bundle:
@@ -157,7 +148,6 @@ examples/protocols/https_x509_bundle:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/esp_tls/**/*
 
 examples/protocols/icmp_echo:
@@ -186,7 +176,6 @@ examples/protocols/modbus:
       temporary: true
       reason: not supported yet  # TODO: [ESP32C5] IDF-8722, IDF-8697
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - examples/protocols/modbus/mb_example_common/**/*
 
 examples/protocols/mqtt:
@@ -196,7 +185,6 @@ examples/protocols/mqtt:
       temporary: true
       reason: not supported on c5 # TODO: [ESP32C5] IDF-8697
   depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
     - components/mqtt/**/*
 
 examples/protocols/mqtt/custom_outbox:
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index c9c8fa36b1..06fc045042 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -148,8 +148,7 @@ examples/system/ota/advanced_https_ota:
     - esp_wifi
     - esp_phy
     - bt
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
+    - protocol_examples_common
 
 examples/system/ota/native_ota_example:
   disable:
@@ -166,8 +165,7 @@ examples/system/ota/native_ota_example:
     - esp_eth
     - esp_driver_gpio
     - bootloader_support
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
+    - protocol_examples_common
 
 examples/system/ota/otatool:
   disable:
@@ -191,8 +189,7 @@ examples/system/ota/pre_encrypted_ota:
     - esp_eth
     - mbedtls
     - bootloader_support
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
+    - protocol_examples_common
 
 examples/system/ota/simple_ota_example:
   disable:
diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml
index 1a6e8bc6d6..1c6124963d 100644
--- a/examples/wifi/.build-test-rules.yml
+++ b/examples/wifi/.build-test-rules.yml
@@ -12,8 +12,7 @@
     - nvs_flash
     - console
     - esp_pm
-  depends_filepatterns:
-    - examples/common_components/protocol_examples_common/**/*
+    - protocol_examples_common
 
 examples/wifi:
   <<: *wifi_depends_default
@@ -52,9 +51,9 @@ examples/wifi/iperf:
     - esp_event
     - esp_coex
     - wpa_supplicant
+    - cmd_system
   depends_filepatterns:
     - examples/common_components/iperf/**/*
-    - examples/system/console/advanced/components/cmd_system/**/*
 
 examples/wifi/itwt:
   <<: *wifi_depends_default