diff --git a/ros2trace/package.xml b/ros2trace/package.xml
index c9b0ee3..5f9e1e2 100644
--- a/ros2trace/package.xml
+++ b/ros2trace/package.xml
@@ -4,7 +4,7 @@
   <name>ros2trace</name>
   <version>0.2.5</version>
   <description>The trace command for ROS 2 command line tools.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
diff --git a/ros2trace/setup.py b/ros2trace/setup.py
index e117939..80a1be0 100644
--- a/ros2trace/setup.py
+++ b/ros2trace/setup.py
@@ -12,7 +12,7 @@ setup(
         'Ingo Lütkebohle'
     ),
     maintainer_email=(
-        'fixed-term.christophe.bourquebedard@de.bosch.com, '
+        'bedard.christophe@gmail.com, '
         'ingo.luetkebohle@de.bosch.com'
     ),
     author='Christophe Bedard',
diff --git a/tracetools/package.xml b/tracetools/package.xml
index ae15b80..934cb41 100644
--- a/tracetools/package.xml
+++ b/tracetools/package.xml
@@ -4,7 +4,7 @@
   <name>tracetools</name>
   <version>0.2.5</version>
   <description>Tracing wrapper for ROS 2.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</author>
diff --git a/tracetools_launch/package.xml b/tracetools_launch/package.xml
index 2fc1eba..1b75895 100644
--- a/tracetools_launch/package.xml
+++ b/tracetools_launch/package.xml
@@ -4,7 +4,7 @@
   <name>tracetools_launch</name>
   <version>0.2.5</version>
   <description>Launch integration for tracing.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
diff --git a/tracetools_launch/setup.py b/tracetools_launch/setup.py
index 67fa7be..fe4b4ec 100644
--- a/tracetools_launch/setup.py
+++ b/tracetools_launch/setup.py
@@ -19,7 +19,7 @@ setup(
         'Ingo Lütkebohle'
     ),
     maintainer_email=(
-        'fixed-term.christophe.bourquebedard@de.bosch.com, '
+        'bedard.christophe@gmail.com, '
         'ingo.luetkebohle@de.bosch.com'
     ),
     author='Christophe Bedard',
diff --git a/tracetools_read/package.xml b/tracetools_read/package.xml
index c52fb16..cc7dc27 100644
--- a/tracetools_read/package.xml
+++ b/tracetools_read/package.xml
@@ -4,7 +4,7 @@
   <name>tracetools_read</name>
   <version>0.2.5</version>
   <description>Tools for reading traces.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
diff --git a/tracetools_read/setup.py b/tracetools_read/setup.py
index cc42fd3..dcfd3e1 100644
--- a/tracetools_read/setup.py
+++ b/tracetools_read/setup.py
@@ -16,7 +16,7 @@ setup(
         'Ingo Lütkebohle'
     ),
     maintainer_email=(
-        'fixed-term.christophe.bourquebedard@de.bosch.com, '
+        'bedard.christophe@gmail.com, '
         'ingo.luetkebohle@de.bosch.com'
     ),
     author='Christophe Bedard',
diff --git a/tracetools_test/package.xml b/tracetools_test/package.xml
index d600735..8e3b97f 100644
--- a/tracetools_test/package.xml
+++ b/tracetools_test/package.xml
@@ -4,7 +4,7 @@
   <name>tracetools_test</name>
   <version>0.2.5</version>
   <description>Testing utilities and tests for the tracetools package.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
diff --git a/tracetools_trace/package.xml b/tracetools_trace/package.xml
index ebd37cf..e08da08 100644
--- a/tracetools_trace/package.xml
+++ b/tracetools_trace/package.xml
@@ -4,7 +4,7 @@
   <name>tracetools_trace</name>
   <version>0.2.5</version>
   <description>Tools for setting up tracing sessions.</description>
-  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
diff --git a/tracetools_trace/setup.py b/tracetools_trace/setup.py
index 367d3de..698c840 100644
--- a/tracetools_trace/setup.py
+++ b/tracetools_trace/setup.py
@@ -16,7 +16,7 @@ setup(
         'Ingo Lütkebohle'
     ),
     maintainer_email=(
-        'fixed-term.christophe.bourquebedard@de.bosch.com, '
+        'bedard.christophe@gmail.com, '
         'ingo.luetkebohle@de.bosch.com'
     ),
     author='Christophe Bedard',