diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml
index 56ba050..dbd05cf 100644
--- a/ros2trace_analysis/package.xml
+++ b/ros2trace_analysis/package.xml
@@ -4,7 +4,7 @@
   <name>ros2trace_analysis</name>
   <version>1.0.0</version>
   <description>The trace analysis command for ROS 2 command line tools.</description>
-  <maintainer email="christophe.bedard@apex.ai">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <license>Apache 2.0</license>
   <author email="christophe.bedard@apex.ai">Christophe Bedard</author>
 
diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py
index e81e7b3..4496b5a 100644
--- a/ros2trace_analysis/setup.py
+++ b/ros2trace_analysis/setup.py
@@ -18,7 +18,7 @@ setup(
         'Christophe Bedard'
     ),
     maintainer_email=(
-        'christophe.bedard@apex.ai'
+        'bedard.christophe@gmail.com'
     ),
     author='Christophe Bedard',
     author_email='christophe.bedard@apex.ai',