diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..e041d06
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This file was generated by https://github.com/audrow/update-ros2-repos
+* @ivanpauno
diff --git a/rmw_dds_common/package.xml b/rmw_dds_common/package.xml
index d9ffe1b..ec8620e 100644
--- a/rmw_dds_common/package.xml
+++ b/rmw_dds_common/package.xml
@@ -4,9 +4,12 @@
   <name>rmw_dds_common</name>
   <version>1.7.1</version>
   <description>Define a common interface between DDS implementations of ROS middleware.</description>
+
   <maintainer email="ivanpauno@ekumenlabs.com">Ivan Paunovic</maintainer>
-  <maintainer email="brandon@openrobotics.org">Brandon Ong</maintainer>
+
   <license>Apache License 2.0</license>
+
+  <author email="brandon@openrobotics.org">Brandon Ong</author>
   <author email="michel@ekumenlabs.com">Michel Hidalgo</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>