diff --git a/ur_calibration/package.xml b/ur_calibration/package.xml
index 46a59551..70abc7a2 100644
--- a/ur_calibration/package.xml
+++ b/ur_calibration/package.xml
@@ -4,7 +4,9 @@
   <version>2.1.5</version>
   <description>Package for extracting the factory calibration from a UR robot and change it such that it can be used by ur_description to gain a correct URDF</description>
 
-  <maintainer email="exner@fzi.de">Felix Exner</maintainer>
+  <maintainer email="feex@universal-robots.com">Felix Exner</maintainer>
+  <maintainer email="rsk@universal-robots.com">Rune Søe-Knudsen</maintainer>
+  <maintainer email="ros@universal-robots.com">Universal Robots A/S</maintainer>
 
   <license>Apache-2.0</license>
 
diff --git a/ur_dashboard_msgs/package.xml b/ur_dashboard_msgs/package.xml
index 97b1c80e..124463d3 100644
--- a/ur_dashboard_msgs/package.xml
+++ b/ur_dashboard_msgs/package.xml
@@ -4,7 +4,9 @@
   <version>2.1.5</version>
   <description>Messages around the UR Dashboard server.</description>
 
-  <maintainer email="exner@FZI.de">Felix Exner</maintainer>
+  <maintainer email="feex@universal-robots.com">Felix Exner</maintainer>
+  <maintainer email="rsk@universal-robots.com">Rune Søe-Knudsen</maintainer>
+  <maintainer email="ros@universal-robots.com">Universal Robots A/S</maintainer>
 
   <license>Apache-2.0</license>
 
diff --git a/ur_robot_driver/package.xml b/ur_robot_driver/package.xml
index 5f5fe2eb..1a24f79f 100644
--- a/ur_robot_driver/package.xml
+++ b/ur_robot_driver/package.xml
@@ -9,7 +9,11 @@
   <author>Felix Exner</author>
   <author>Lea Steffen</author>
   <author>Tristan Schnell</author>
-  <maintainer email="exner@fzi.de">Felix Exner</maintainer>
+
+  <maintainer email="feex@universal-robots.com">Felix Exner</maintainer>
+  <maintainer email="rsk@universal-robots.com">Rune Søe-Knudsen</maintainer>
+  <maintainer email="ros@universal-robots.com">Universal Robots A/S</maintainer>
+
   <license>Apache-2.0</license>
   <license>BSD-2-Clause</license>
   <license>Zlib</license>