diff --git a/rmw_connext_cpp/package.xml b/rmw_connext_cpp/package.xml
index 10269945..d7564bfd 100644
--- a/rmw_connext_cpp/package.xml
+++ b/rmw_connext_cpp/package.xml
@@ -4,9 +4,12 @@
   <name>rmw_connext_cpp</name>
   <version>1.0.2</version>
   <description>Implement the ROS middleware interface using RTI Connext static code generation in C++.</description>
-  <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
+  <maintainer email="alejandro@openrobotics.org">Alejandro Hernandez Cordero</maintainer>
+  <maintainer email="michael@openrobotics.org">Michael Carroll</maintainer>
   <license>Apache License 2.0</license>
 
+  <author>Dirk Thomas</author>
+
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_cmake</buildtool_depend>
 
diff --git a/rmw_connext_dynamic_cpp/package.xml b/rmw_connext_dynamic_cpp/package.xml
index aedae141..e08a375e 100644
--- a/rmw_connext_dynamic_cpp/package.xml
+++ b/rmw_connext_dynamic_cpp/package.xml
@@ -4,9 +4,12 @@
   <name>rmw_connext_dynamic_cpp</name>
   <version>0.8.0</version>
   <description>Implement the ROS middleware interface using RTI Connext DynammicData interface in C++.</description>
-  <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
+  <maintainer email="alejandro@openrobotics.org">Alejandro Hernandez Cordero</maintainer>
+  <maintainer email="michael@openrobotics.org">Michael Carroll</maintainer>
   <license>Apache License 2.0</license>
 
+  <author>Dirk Thomas</author>
+
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <build_depend>connext_cmake_module</build_depend>
diff --git a/rmw_connext_shared_cpp/package.xml b/rmw_connext_shared_cpp/package.xml
index de1ff883..464fa076 100644
--- a/rmw_connext_shared_cpp/package.xml
+++ b/rmw_connext_shared_cpp/package.xml
@@ -4,9 +4,12 @@
   <name>rmw_connext_shared_cpp</name>
   <version>1.0.2</version>
   <description>C++ types and functions shared by the ROS middleware interface to RTI Connext Static and RTI Connext Dynamic.</description>
-  <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
+  <maintainer email="alejandro@openrobotics.org">Alejandro Hernandez Cordero</maintainer>
+  <maintainer email="michael@openrobotics.org">Michael Carroll</maintainer>
   <license>Apache License 2.0</license>
 
+  <author>Dirk Thomas</author>
+
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
   <buildtool_depend>rosidl_cmake</buildtool_depend>