diff --git a/moveit_configs_utils/package.xml b/moveit_configs_utils/package.xml
index 30f172778c..8587d926bd 100644
--- a/moveit_configs_utils/package.xml
+++ b/moveit_configs_utils/package.xml
@@ -7,7 +7,7 @@
   <maintainer email="moveit_releasers@googlegroups.com">MoveIt Release Team</maintainer>
   <license>BSD-3-Clause</license>
   <author email="jafar@picknik.ai">Jafar Abdi</author>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <exec_depend>ament_index_python</exec_depend>
   <exec_depend>launch_param_builder</exec_depend>
diff --git a/moveit_setup_assistant/moveit_setup_app_plugins/package.xml b/moveit_setup_assistant/moveit_setup_app_plugins/package.xml
index dfb639f637..4c6bcc2b3f 100644
--- a/moveit_setup_assistant/moveit_setup_app_plugins/package.xml
+++ b/moveit_setup_assistant/moveit_setup_app_plugins/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_app_plugins</name>
   <version>2.14.1</version>
   <description>Various specialty plugins for MoveIt Setup Assistant</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
diff --git a/moveit_setup_assistant/moveit_setup_assistant/package.xml b/moveit_setup_assistant/moveit_setup_assistant/package.xml
index cf9ecfc6ca..b39423d9a5 100644
--- a/moveit_setup_assistant/moveit_setup_assistant/package.xml
+++ b/moveit_setup_assistant/moveit_setup_assistant/package.xml
@@ -8,7 +8,7 @@
   <maintainer email="tyler@picknik.ai">Tyler Weaver</maintainer>
   <maintainer email="rhaschke@techfak.uni-bielefeld.de">Robert Haschke</maintainer>
   <maintainer email="moveit_releasers@googlegroups.com">MoveIt Release Team</maintainer>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
 
   <license>BSD-3-Clause</license>
 
@@ -16,7 +16,7 @@
   <url type="bugtracker">https://github.com/moveit/moveit2/issues</url>
   <url type="repository">https://github.com/moveit/moveit2</url>
 
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
   <author email="dave@picknik.ai">Dave Coleman</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
diff --git a/moveit_setup_assistant/moveit_setup_controllers/package.xml b/moveit_setup_assistant/moveit_setup_controllers/package.xml
index 49a44b0507..175b0ba95e 100644
--- a/moveit_setup_assistant/moveit_setup_controllers/package.xml
+++ b/moveit_setup_assistant/moveit_setup_controllers/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_controllers</name>
   <version>2.14.1</version>
   <description>MoveIt Setup Steps for ROS 2 Control</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/package.xml b/moveit_setup_assistant/moveit_setup_core_plugins/package.xml
index 5bf5f469d6..622b24bf1c 100644
--- a/moveit_setup_assistant/moveit_setup_core_plugins/package.xml
+++ b/moveit_setup_assistant/moveit_setup_core_plugins/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_core_plugins</name>
   <version>2.14.1</version>
   <description>Core (meta) plugins for MoveIt Setup Assistant</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
diff --git a/moveit_setup_assistant/moveit_setup_framework/package.xml b/moveit_setup_assistant/moveit_setup_framework/package.xml
index cae5e0cdf3..79e5114134 100644
--- a/moveit_setup_assistant/moveit_setup_framework/package.xml
+++ b/moveit_setup_assistant/moveit_setup_framework/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_framework</name>
   <version>2.14.1</version>
   <description>C++ Interface for defining setup steps for MoveIt Setup Assistant</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
   <depend>ament_index_cpp</depend>
diff --git a/moveit_setup_assistant/moveit_setup_simulation/package.xml b/moveit_setup_assistant/moveit_setup_simulation/package.xml
index 72036f5b79..f6fb34422b 100644
--- a/moveit_setup_assistant/moveit_setup_simulation/package.xml
+++ b/moveit_setup_assistant/moveit_setup_simulation/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_simulation</name>
   <version>2.5.1</version>
   <description>MoveIt Setup Steps for Simulation</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
diff --git a/moveit_setup_assistant/moveit_setup_srdf_plugins/package.xml b/moveit_setup_assistant/moveit_setup_srdf_plugins/package.xml
index b444b2854c..e35a41fca8 100644
--- a/moveit_setup_assistant/moveit_setup_srdf_plugins/package.xml
+++ b/moveit_setup_assistant/moveit_setup_srdf_plugins/package.xml
@@ -4,9 +4,9 @@
   <name>moveit_setup_srdf_plugins</name>
   <version>2.14.1</version>
   <description>SRDF-based plugins for MoveIt Setup Assistant</description>
-  <maintainer email="davidvlu@gmail.com">David V. Lu!!</maintainer>
+  <maintainer email="david@metrorobots.com">David V. Lu!!</maintainer>
   <license>BSD-3-Clause</license>
-  <author email="davidvlu@gmail.com">David V. Lu!!</author>
+  <author email="david@metrorobots.com">David V. Lu!!</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>