diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000..7ee4b9af4d
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This file was generated by https://github.com/audrow/update-ros2-repos
+* @ivanpauno @hidmic @wjwwood
diff --git a/rclcpp/package.xml b/rclcpp/package.xml
index f113613fd3..6775f4a46d 100644
--- a/rclcpp/package.xml
+++ b/rclcpp/package.xml
@@ -4,11 +4,15 @@
   <name>rclcpp</name>
   <version>17.1.0</version>
   <description>The ROS client library in C++.</description>
+
   <maintainer email="ivanpauno@ekumenlabs.com">Ivan Paunovic</maintainer>
-  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michel@ekumenlabs.com">Michel Hidalgo</maintainer>
   <maintainer email="william@openrobotics.org">William Woodall</maintainer>
+
   <license>Apache License 2.0</license>
+
   <author email="dthomas@openrobotics.org">Dirk Thomas</author>
+  <author email="jacob@openrobotics.org">Jacob Perron</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
   <buildtool_depend>ament_cmake_gen_version_h</buildtool_depend>
diff --git a/rclcpp_action/package.xml b/rclcpp_action/package.xml
index 758eb0db4e..38e7fdcba1 100644
--- a/rclcpp_action/package.xml
+++ b/rclcpp_action/package.xml
@@ -4,11 +4,15 @@
   <name>rclcpp_action</name>
   <version>17.1.0</version>
   <description>Adds action APIs for C++.</description>
+
   <maintainer email="ivanpauno@ekumenlabs.com">Ivan Paunovic</maintainer>
-  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michel@ekumenlabs.com">Michel Hidalgo</maintainer>
   <maintainer email="william@openrobotics.org">William Woodall</maintainer>
+
   <license>Apache License 2.0</license>
+
   <author email="dthomas@openrobotics.org">Dirk Thomas</author>
+  <author email="jacob@openrobotics.org">Jacob Perron</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
diff --git a/rclcpp_components/package.xml b/rclcpp_components/package.xml
index 3557608bc1..cfb88b9e3f 100644
--- a/rclcpp_components/package.xml
+++ b/rclcpp_components/package.xml
@@ -4,10 +4,14 @@
   <name>rclcpp_components</name>
   <version>17.1.0</version>
   <description>Package containing tools for dynamically loadable components</description>
+
   <maintainer email="ivanpauno@ekumenlabs.com">Ivan Paunovic</maintainer>
-  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michel@ekumenlabs.com">Michel Hidalgo</maintainer>
   <maintainer email="william@openrobotics.org">William Woodall</maintainer>
+
   <license>Apache License 2.0</license>
+
+  <author email="jacob@openrobotics.org">Jacob Perron</author>
   <author email="michael@openrobotics.org">Michael Carroll</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
diff --git a/rclcpp_lifecycle/package.xml b/rclcpp_lifecycle/package.xml
index ab94c9fffb..8fa958a0bc 100644
--- a/rclcpp_lifecycle/package.xml
+++ b/rclcpp_lifecycle/package.xml
@@ -4,10 +4,14 @@
   <name>rclcpp_lifecycle</name>
   <version>17.1.0</version>
   <description>Package containing a prototype for lifecycle implementation</description>
+
   <maintainer email="ivanpauno@ekumenlabs.com">Ivan Paunovic</maintainer>
-  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michel@ekumenlabs.com">Michel Hidalgo</maintainer>
   <maintainer email="william@openrobotics.org">William Woodall</maintainer>
+
   <license>Apache License 2.0</license>
+
+  <author email="jacob@openrobotics.org">Jacob Perron</author>
   <author email="karsten@openrobotics.org">Karsten Knese</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>