diff --git a/package.xml b/package.xml
index 301a46a..40a655d 100644
--- a/package.xml
+++ b/package.xml
@@ -4,9 +4,8 @@
   <name>tracetools_trace</name>
   <version>0.1.0</version>
   <description>Tools for setting up tracing sessions</description>
-
-  <maintainer email="bedard.christophe@gmail.com">Christophe Bedard</maintainer>
-  <author email="bedard.christophe@gmail.com">Christophe Bedard</author>
+  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
   <license>GPLv3</license>
 
   <!-- TODO consider adding python3-lttng to rosdep/python
diff --git a/setup.py b/setup.py
index 3e349ea..028b625 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,11 @@ setup(
         ('share/' + package_name, ['package.xml']),
     ],
     install_requires=['setuptools'],
+    maintainer='Christophe Bedard',
+    maintainer_email='fixed-term.christophe.bourquebedard@de.bosch.com',
+    author='Christophe Bedard',
+    author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
+    # url='',
     keywords=['ROS'],
     description='Tools for setting up tracing sessions',
     entry_points={