diff --git a/rviz2/package.xml b/rviz2/package.xml
index 06809c9aa..420074936 100644
--- a/rviz2/package.xml
+++ b/rviz2/package.xml
@@ -4,18 +4,18 @@
   <description>
     3D visualization tool for ROS.
   </description>
-  <maintainer email="scott@openrobotics.org">Scott K Logan</maintainer>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>BSD</license>
-
+  <url type="website">https://github.com/ros2/rviz/blob/ros2/README.md</url>
+  <url type="repository">https://github.com/ros2/rviz</url>
+  <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
   <author>Dave Hershberger</author>
   <author>David Gossow</author>
   <author>D. Hood</author>
   <author>Josh Faust</author>
-
-  <url type="website">https://github.com/ros2/rviz/blob/ros2/README.md</url>
-  <url type="repository">https://github.com/ros2/rviz</url>
-  <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
+  <author email="scott@openrobotics.org">Scott K Logan</author>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_assimp_vendor/package.xml b/rviz_assimp_vendor/package.xml
index 71bc7ee22..778c2f19c 100644
--- a/rviz_assimp_vendor/package.xml
+++ b/rviz_assimp_vendor/package.xml
@@ -9,11 +9,12 @@
     Wrapper around assimp, providing nothing but a dependency on assimp, on some systems.
     On others, it provides a fixed CMake module or even an ExternalProject build of assimp.
   </description>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>Apache License 2.0</license>  <!-- the contents of this package are Apache 2.0 -->
   <license>BSD</license>  <!-- assimp is BSD (http://assimp.sourceforge.net/main_license.html) -->
-
   <url type="website">http://assimp.sourceforge.net/index.html</url>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_common/package.xml b/rviz_common/package.xml
index 82a856136..80cb7f1b3 100644
--- a/rviz_common/package.xml
+++ b/rviz_common/package.xml
@@ -4,16 +4,16 @@
   <description>
     Common rviz API, used by rviz plugins and applications.
   </description>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>BSD</license>
-
-  <author>Dave Hershberger</author>
-  <author>David Gossow</author>
-  <author>Josh Faust</author>
-
   <url type="website">https://github.com/ros2/rviz/blob/ros2/README.md</url>
   <url type="repository">https://github.com/ros2/rviz</url>
   <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
+  <author>Dave Hershberger</author>
+  <author>David Gossow</author>
+  <author>Josh Faust</author>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_default_plugins/package.xml b/rviz_default_plugins/package.xml
index e21524dfa..6c36089b6 100644
--- a/rviz_default_plugins/package.xml
+++ b/rviz_default_plugins/package.xml
@@ -4,16 +4,16 @@
   <description>
     Several default plugins for rviz to cover the basic functionality.
   </description>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>BSD</license>
-
-  <author>Dave Hershberger</author>
-  <author>David Gossow</author>
-  <author>Josh Faust</author>
-
   <url type="website">https://github.com/ros2/rviz/blob/ros2/README.md</url>
   <url type="repository">https://github.com/ros2/rviz</url>
   <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
+  <author>Dave Hershberger</author>
+  <author>David Gossow</author>
+  <author>Josh Faust</author>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_ogre_vendor/package.xml b/rviz_ogre_vendor/package.xml
index 77bdbbc0c..f5ce2be1f 100644
--- a/rviz_ogre_vendor/package.xml
+++ b/rviz_ogre_vendor/package.xml
@@ -8,11 +8,12 @@
   <description>
     Wrapper around ogre3d, it provides a fixed CMake module and an ExternalProject build of ogre.
   </description>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>Apache License 2.0</license>  <!-- the contents of this package are Apache 2.0 -->
   <license>MIT</license>  <!-- ogre is MIT (https://www.ogre3d.org/licensing) -->
-
   <url type="website">https://www.ogre3d.org/</url>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_rendering/package.xml b/rviz_rendering/package.xml
index 4eef4a611..aa677b516 100644
--- a/rviz_rendering/package.xml
+++ b/rviz_rendering/package.xml
@@ -4,16 +4,16 @@
   <description>
     Library which provides the 3D rendering functionality in rviz.
   </description>
-  <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>BSD</license>
-
-  <author>Dave Hershberger</author>
-  <author>David Gossow</author>
-  <author>Josh Faust</author>
-
   <url type="website">https://github.com/ros2/rviz/blob/ros2/README.md</url>
   <url type="repository">https://github.com/ros2/rviz</url>
   <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
+  <author>Dave Hershberger</author>
+  <author>David Gossow</author>
+  <author>Josh Faust</author>
+  <author email="william@osrfoundation.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>eigen3_cmake_module</buildtool_depend>
diff --git a/rviz_rendering_tests/package.xml b/rviz_rendering_tests/package.xml
index c45e2e361..248356f24 100644
--- a/rviz_rendering_tests/package.xml
+++ b/rviz_rendering_tests/package.xml
@@ -4,11 +4,12 @@
     <description>
         Example plugin for RViz - documents and tests RViz plugin development
     </description>
-    <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
+    <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+    <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
     <license>BSD</license>
-
     <url type="repository">https://github.com/ros2/rviz</url>
     <url type="bugtracker">https://github.com/ros2/rviz/issues</url>
+    <author email="william@osrfoundation.org">William Woodall</author>
 
     <buildtool_depend>ament_cmake</buildtool_depend>
 
diff --git a/rviz_visual_testing_framework/package.xml b/rviz_visual_testing_framework/package.xml
index 73a8ea031..e129edea5 100644
--- a/rviz_visual_testing_framework/package.xml
+++ b/rviz_visual_testing_framework/package.xml
@@ -4,14 +4,14 @@
   <description>
     3D testing framework for RViz.
   </description>
-  <maintainer email="william@openrobotics.org">William Woodall</maintainer>
+  <maintainer email="jacob@openrobotics.org">Jacob Perron</maintainer>
+  <maintainer email="michael.jeronimo@openrobotics.org">Michael Jeronimo</maintainer>
   <license>BSD</license>
-
-  <author>Alessandro Bottero</author>
-
   <url type="website">http://ros.org/wiki/rviz2</url>
   <url type="repository">https://github.com/ros-visualization/rviz</url>
   <url type="bugtracker">https://github.com/ros-visualization/rviz/issues</url>
+  <author>Alessandro Bottero</author>
+  <author email="william@openrobotics.org">William Woodall</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>