diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..d490d00
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This file was generated by https://github.com/audrow/update-ros2-repos
+* @quarkytale
diff --git a/ament_index_cpp/package.xml b/ament_index_cpp/package.xml
index c7bf8ca..5406c81 100644
--- a/ament_index_cpp/package.xml
+++ b/ament_index_cpp/package.xml
@@ -6,11 +6,14 @@
   <description>
     C++ API to access the ament resource index.
   </description>
-  <maintainer email="audrow@openrobotics.org">Audrow Nash</maintainer>
+
+  <maintainer email="dharini@openrobotics.org">Dharini Dutia</maintainer>
+
   <license>Apache License 2.0</license>
 
-  <author>Dirk Thomas</author>
+  <author email="audrow@openrobotics.org">Audrow Nash</author>
   <author>Claire Wang</author>
+  <author>Dirk Thomas</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/ament_index_python/package.xml b/ament_index_python/package.xml
index d1c2924..1484924 100644
--- a/ament_index_python/package.xml
+++ b/ament_index_python/package.xml
@@ -6,11 +6,14 @@
   <description>
     Python API to access the ament resource index.
   </description>
-  <maintainer email="audrow@openrobotics.org">Audrow Nash</maintainer>
+
+  <maintainer email="dharini@openrobotics.org">Dharini Dutia</maintainer>
+
   <license>Apache License 2.0</license>
 
-  <author>Dirk Thomas</author>
+  <author email="audrow@openrobotics.org">Audrow Nash</author>
   <author>Claire Wang</author>
+  <author>Dirk Thomas</author>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
diff --git a/ament_index_python/setup.py b/ament_index_python/setup.py
index d30d7e3..cea80ce 100644
--- a/ament_index_python/setup.py
+++ b/ament_index_python/setup.py
@@ -20,8 +20,8 @@
     zip_safe=True,
     author='Dirk Thomas',
     author_email='dthomas@osrfoundation.org',
-    maintainer='Audrow Nash',
-    maintainer_email='audrow@openrobotics.org',
+    maintainer='Dharini Dutia',
+    maintainer_email='dharini@openrobotics.org',
     url='https://github.com/ament/ament_index',
     download_url='https://github.com/ament/ament_index/releases',
     keywords=['ROS'],