diff --git a/components/asio/examples/asio_chat/CMakeLists.txt b/components/asio/examples/asio_chat/CMakeLists.txt
index 7212f3e33..72a61303a 100644
--- a/components/asio/examples/asio_chat/CMakeLists.txt
+++ b/components/asio/examples/asio_chat/CMakeLists.txt
@@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../.. ../../../../common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(asio_chat)
diff --git a/components/asio/examples/asio_chat/main/idf_component.yml b/components/asio/examples/asio_chat/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/asio_chat/main/idf_component.yml
+++ b/components/asio/examples/asio_chat/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/components/asio/examples/async_request/CMakeLists.txt b/components/asio/examples/async_request/CMakeLists.txt
index ff659707e..1febd7afd 100644
--- a/components/asio/examples/async_request/CMakeLists.txt
+++ b/components/asio/examples/async_request/CMakeLists.txt
@@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../../../../common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(async_http_request)
diff --git a/components/asio/examples/async_request/main/idf_component.yml b/components/asio/examples/async_request/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/async_request/main/idf_component.yml
+++ b/components/asio/examples/async_request/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/components/asio/examples/socks4/CMakeLists.txt b/components/asio/examples/socks4/CMakeLists.txt
index f1ffe9d12..1f2e63fb9 100644
--- a/components/asio/examples/socks4/CMakeLists.txt
+++ b/components/asio/examples/socks4/CMakeLists.txt
@@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../../../../common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(asio_sock4)
diff --git a/components/asio/examples/socks4/main/idf_component.yml b/components/asio/examples/socks4/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/socks4/main/idf_component.yml
+++ b/components/asio/examples/socks4/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/components/asio/examples/ssl_client_server/CMakeLists.txt b/components/asio/examples/ssl_client_server/CMakeLists.txt
index 73ee939a7..7dc1b47d2 100644
--- a/components/asio/examples/ssl_client_server/CMakeLists.txt
+++ b/components/asio/examples/ssl_client_server/CMakeLists.txt
@@ -2,9 +2,6 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../../../../common_components/protocol_examples_common)
 set(EXCLUDE_COMPONENTS openssl)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
diff --git a/components/asio/examples/ssl_client_server/main/idf_component.yml b/components/asio/examples/ssl_client_server/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/ssl_client_server/main/idf_component.yml
+++ b/components/asio/examples/ssl_client_server/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/components/asio/examples/tcp_echo_server/CMakeLists.txt b/components/asio/examples/tcp_echo_server/CMakeLists.txt
index 29e290677..c09d833cf 100644
--- a/components/asio/examples/tcp_echo_server/CMakeLists.txt
+++ b/components/asio/examples/tcp_echo_server/CMakeLists.txt
@@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../../../../common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(asio_tcp_echo_server)
diff --git a/components/asio/examples/tcp_echo_server/main/idf_component.yml b/components/asio/examples/tcp_echo_server/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/tcp_echo_server/main/idf_component.yml
+++ b/components/asio/examples/tcp_echo_server/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/components/asio/examples/udp_echo_server/CMakeLists.txt b/components/asio/examples/udp_echo_server/CMakeLists.txt
index 2e0c28024..103fe5bd1 100644
--- a/components/asio/examples/udp_echo_server/CMakeLists.txt
+++ b/components/asio/examples/udp_echo_server/CMakeLists.txt
@@ -2,9 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# (Not part of the boilerplate)
-# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
-set(EXTRA_COMPONENT_DIRS ../../../../common_components/protocol_examples_common)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(asio_udp_echo_server)
diff --git a/components/asio/examples/udp_echo_server/main/idf_component.yml b/components/asio/examples/udp_echo_server/main/idf_component.yml
index 13632c90e..87c1515f9 100644
--- a/components/asio/examples/udp_echo_server/main/idf_component.yml
+++ b/components/asio/examples/udp_echo_server/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/asio:
     version: "^1.14.1"
     override_path: "../../../"
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common