diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml
index 1cc496b..e326267 100644
--- a/ros2trace_analysis/package.xml
+++ b/ros2trace_analysis/package.xml
@@ -11,6 +11,8 @@
   <depend>ros2cli</depend>
   <depend>tracetools_analysis</depend>
 
+  <build_depend>ament_package</build_depend>
+
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_mypy</test_depend>
diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py
index f1498ea..5e6b24f 100644
--- a/ros2trace_analysis/setup.py
+++ b/ros2trace_analysis/setup.py
@@ -1,11 +1,9 @@
+from ament_package.generate_setuptools_dict import generate_setuptools_dict
 from setuptools import find_packages
 from setuptools import setup
 
 package_name = 'ros2trace_analysis'
-
-setup(
-    name=package_name,
-    version='2.0.0',
+package_info = generate_setuptools_dict(
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -14,22 +12,7 @@ setup(
     ],
     install_requires=['ros2cli'],
     zip_safe=True,
-    maintainer=(
-        'Christophe Bedard'
-    ),
-    maintainer_email=(
-        'bedard.christophe@gmail.com'
-    ),
-    author='Christophe Bedard',
-    author_email='christophe.bedard@apex.ai',
-    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
-    description='The trace-analysis command for ROS 2 command line tools.',
-    long_description=(
-        'The package provides the trace-analysis '
-        'command for the ROS 2 command line tools.'
-    ),
-    license='Apache 2.0',
     tests_require=['pytest'],
     entry_points={
         'ros2cli.command': [
@@ -44,3 +27,4 @@ setup(
         ],
     }
 )
+setup(**package_info)
diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml
index 5d9a014..60b6990 100644
--- a/tracetools_analysis/package.xml
+++ b/tracetools_analysis/package.xml
@@ -13,6 +13,8 @@
   <depend>tracetools_read</depend>
   <depend>python3-pandas</depend>
 
+  <build_depend>ament_package</build_depend>
+
   <exec_depend>jupyter-notebook</exec_depend>
 
   <test_depend>ament_copyright</test_depend>
diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py
index 3d4412d..2112bcb 100644
--- a/tracetools_analysis/setup.py
+++ b/tracetools_analysis/setup.py
@@ -1,13 +1,11 @@
 import glob
 
+from ament_package.generate_setuptools_dict import generate_setuptools_dict
 from setuptools import find_packages
 from setuptools import setup
 
 package_name = 'tracetools_analysis'
-
-setup(
-    name=package_name,
-    version='2.0.0',
+package_info = generate_setuptools_dict(
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -16,29 +14,7 @@ setup(
             ['resource/' + package_name]),
     ],
     install_requires=['setuptools'],
-    maintainer=(
-        'Christophe Bedard, '
-        'Ingo Lütkebohle'
-    ),
-    maintainer_email=(
-        'bedard.christophe@gmail.com, '
-        'ingo.luetkebohle@de.bosch.com'
-    ),
-    author=(
-        'Christophe Bedard, '
-        'Ingo Lütkebohle'
-    ),
-    author_email=(
-        'fixed-term.christophe.bourquebedard@de.bosch.com, '
-        'ingo.luetkebohle@de.bosch.com'
-    ),
-    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
-    description='Tools for analysing trace data.',
-    long_description=(
-        'This package provides tools for analysing trace data, from '
-        'building a model of the trace data to providing plotting utilities.'
-    ),
     entry_points={
         'console_scripts': [
             f'convert = {package_name}.convert:main',
@@ -48,6 +24,6 @@ setup(
             f'memory_usage = {package_name}.scripts.memory_usage:main',
         ],
     },
-    license='Apache 2.0',
     tests_require=['pytest'],
 )
+setup(**package_info)