diff --git a/canopen_core/CMakeLists.txt b/canopen_core/CMakeLists.txt
index 33eb0df3..39a7c2e5 100644
--- a/canopen_core/CMakeLists.txt
+++ b/canopen_core/CMakeLists.txt
@@ -26,6 +26,7 @@ find_package(rclcpp REQUIRED)
 find_package(rclcpp_components REQUIRED)
 find_package(rclcpp_lifecycle REQUIRED)
 find_package(yaml_cpp_vendor REQUIRED)
+find_package(yaml-cpp REQUIRED)
 include(ConfigExtras.cmake)
 
 set(dependencies
@@ -57,9 +58,13 @@ ament_target_dependencies(node_canopen_driver
   rclcpp_lifecycle
   lely_core_libraries
   yaml_cpp_vendor
+  yaml-cpp
   canopen_interfaces
   Boost
 )
+target_link_libraries(node_canopen_driver
+  yaml-cpp::yaml-cpp
+)
 
 add_library(node_canopen_master
   SHARED
@@ -77,11 +82,12 @@ ament_target_dependencies(node_canopen_master
   rclcpp
   rclcpp_lifecycle
   lely_core_libraries
-  yaml_cpp_vendor
   canopen_interfaces
   Boost
 )
-
+target_link_libraries(node_canopen_master
+  yaml-cpp::yaml-cpp
+)
 
 add_library(device_container
   SHARED
@@ -107,7 +113,7 @@ ament_target_dependencies(device_container
 target_link_libraries(device_container
   node_canopen_master
   node_canopen_driver
-  yaml-cpp
+  yaml-cpp::yaml-cpp
 )
 
 add_executable(device_container_node