diff --git a/abb_egm_hardware_interface/package.xml b/abb_egm_hardware_interface/package.xml
index b1b8fa8..b0efc8b 100644
--- a/abb_egm_hardware_interface/package.xml
+++ b/abb_egm_hardware_interface/package.xml
@@ -10,7 +10,7 @@
     A ROS node implementation is also provided for starting a ros_control controller manager, which drives a single
     instance of the EGM hardware interface toward an ABB robot controller.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>
 
diff --git a/abb_egm_state_controller/package.xml b/abb_egm_state_controller/package.xml
index 9d741ec..2c2692e 100644
--- a/abb_egm_state_controller/package.xml
+++ b/abb_egm_state_controller/package.xml
@@ -8,7 +8,7 @@
     Externally Guided Motion (EGM) communication channels that has been set up between an ABB robot controller
     and external EGM servers.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>
 
diff --git a/abb_robot_bringup_examples/package.xml b/abb_robot_bringup_examples/package.xml
index 6099fde..0aceaea 100644
--- a/abb_robot_bringup_examples/package.xml
+++ b/abb_robot_bringup_examples/package.xml
@@ -6,7 +6,7 @@
   <description>
     Provides some basic examples of how the ABB robot controller driver's components can be launched in ROS.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>
 
diff --git a/abb_robot_cpp_utilities/package.xml b/abb_robot_cpp_utilities/package.xml
index 78db47c..a9b402a 100644
--- a/abb_robot_cpp_utilities/package.xml
+++ b/abb_robot_cpp_utilities/package.xml
@@ -10,7 +10,7 @@
     - Mapping between ROS messages, and robot controller messages.
     - Retrieval of mandatory and optional ROS parameters.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>
 
diff --git a/abb_rws_service_provider/package.xml b/abb_rws_service_provider/package.xml
index 7af5622..f7183ac 100644
--- a/abb_rws_service_provider/package.xml
+++ b/abb_rws_service_provider/package.xml
@@ -12,7 +12,7 @@
     - Starting/stopping the RAPID program.
     - Reading/writing IO-signals or RAPID variables.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>
 
diff --git a/abb_rws_state_publisher/package.xml b/abb_rws_state_publisher/package.xml
index 3f1146d..0c79b68 100644
--- a/abb_rws_state_publisher/package.xml
+++ b/abb_rws_state_publisher/package.xml
@@ -7,7 +7,7 @@
     Provides a ROS node implementation that periodically publishes ROS messages, containing an
     ABB robot controller's current state collected via Robot Web Services (RWS) communication.
   </description>
-  <maintainer email="jon.tjerngren@se.abb.com">Jon Tjerngren</maintainer>
+  <maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD-3-Clause</license>
   <author>Jon Tjerngren</author>