diff --git a/micro_ros_agent/CMakeLists.txt b/micro_ros_agent/CMakeLists.txt
index c635ee4..1ae84a1 100644
--- a/micro_ros_agent/CMakeLists.txt
+++ b/micro_ros_agent/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.11)
 
 option(UROSAGENT_GENERATE_PROFILE
   "Generates agent.refs according to the .msgs provided in the .repos" OFF
@@ -62,16 +62,15 @@ target_include_directories(${PROJECT_NAME}
     include
   )
 
-ament_target_dependencies(${PROJECT_NAME}
-  rosidl_typesupport_fastrtps_cpp
-  rosidl_runtime_cpp
-  rosidl_typesupport_cpp
-  fastcdr
-  fastdds
-  rmw_dds_common
-  rmw
-  rmw_fastrtps_shared_cpp
-  micro_ros_msgs
+target_link_libraries(${PROJECT_NAME}
+  ${micro_ros_msgs_TARGETS}
+  ${rmw_dds_common_TARGETS}
+  rmw::rmw
+  rmw_dds_common::rmw_dds_common_library
+  rmw_fastrtps_shared_cpp::rmw_fastrtps_shared_cpp
+  rosidl_runtime_cpp::rosidl_runtime_cpp
+  rosidl_typesupport_cpp::rosidl_typesupport_cpp
+  rosidl_typesupport_fastrtps_cpp::rosidl_typesupport_fastrtps_cpp
   )
 
 target_link_libraries(${PROJECT_NAME}
diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml
index d35c138..61e7d43 100644
--- a/micro_ros_agent/package.xml
+++ b/micro_ros_agent/package.xml
@@ -4,8 +4,8 @@
   <name>micro_ros_agent</name>
   <version>6.0.0</version>
   <description>micro-ROS Agent package</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
-  <maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
+  <maintainer email="carlosespinoza@eprosima.com">Carlos Espinoza</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>