diff --git a/example/package.xml b/example/package.xml
index 831b1af..012c786 100644
--- a/example/package.xml
+++ b/example/package.xml
@@ -4,9 +4,11 @@
   <name>generate_parameter_library_example</name>
   <version>0.5.0</version>
   <description>Example usage of generate_parameter_library.</description>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
   <author email="paul.gesel@picknik.ai">Paul Gesel</author>
 
diff --git a/example_cmake_python/package.xml b/example_cmake_python/package.xml
index 5422f5b..8358f93 100644
--- a/example_cmake_python/package.xml
+++ b/example_cmake_python/package.xml
@@ -4,9 +4,11 @@
   <name>cmake_generate_parameter_module_example</name>
   <version>0.5.0</version>
   <description>Example usage of generate_parameter_library for a python module with cmake.</description>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
   <author email="paul.gesel@picknik.ai">Paul Gesel</author>
 
diff --git a/example_external/package.xml b/example_external/package.xml
index 76d0a48..0db8300 100644
--- a/example_external/package.xml
+++ b/example_external/package.xml
@@ -4,9 +4,11 @@
   <name>generate_parameter_library_example_external</name>
   <version>0.5.0</version>
   <description>Example usage of a parameter header generated in another package.</description>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
   <author email="auguste@forssea-robotics.fr">Auguste Bourgois</author>
 
diff --git a/example_python/package.xml b/example_python/package.xml
index 5164f5b..6b98152 100644
--- a/example_python/package.xml
+++ b/example_python/package.xml
@@ -4,9 +4,11 @@
   <name>generate_parameter_module_example</name>
   <version>0.5.0</version>
   <description>Example usage of generate_parameter_library for a python module</description>
-  <maintainer email="paulgesel@gmail.com">paul</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paulgesel@gmail.com">paul</maintainer>
   <license>BSD-3-Clause</license>
 
   <depend>generate_parameter_library</depend>
diff --git a/generate_parameter_library/package.xml b/generate_parameter_library/package.xml
index 55233ec..d1311a8 100644
--- a/generate_parameter_library/package.xml
+++ b/generate_parameter_library/package.xml
@@ -4,9 +4,11 @@
   <name>generate_parameter_library</name>
   <version>0.5.0</version>
   <description>CMake to generate ROS parameter library.</description>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
   <author email="paul.gesel@picknik.ai">Paul Gesel</author>
 
diff --git a/generate_parameter_library_py/package.xml b/generate_parameter_library_py/package.xml
index 4ea6afd..5bc6853 100644
--- a/generate_parameter_library_py/package.xml
+++ b/generate_parameter_library_py/package.xml
@@ -4,9 +4,11 @@
   <name>generate_parameter_library_py</name>
   <version>0.5.0</version>
   <description>Python to generate ROS parameter library.</description>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
   <author email="paul.gesel@picknik.ai">Paul Gesel</author>
 
diff --git a/parameter_traits/package.xml b/parameter_traits/package.xml
index 17c4211..d8934c2 100644
--- a/parameter_traits/package.xml
+++ b/parameter_traits/package.xml
@@ -4,10 +4,11 @@
   <name>parameter_traits</name>
   <version>0.5.0</version>
   <description>Functions and types for rclcpp::Parameter</description>
-  <maintainer email="maybe@tylerjw.dev">Tyler Weaver</maintainer>
-  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
+  <maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
+  <maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
   <maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
   <maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
+  <maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
   <license>BSD-3-Clause</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>