diff --git a/ros2trace/package.xml b/ros2trace/package.xml
index f1e844e..5010bf5 100644
--- a/ros2trace/package.xml
+++ b/ros2trace/package.xml
@@ -3,9 +3,7 @@
 <package format="2">
   <name>ros2trace</name>
   <version>0.1.0</version>
-  <description>
-    The trace command for ROS 2 command line tools.
-  </description>
+  <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="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
diff --git a/ros2trace/setup.py b/ros2trace/setup.py
index 1682ece..82259b8 100644
--- a/ros2trace/setup.py
+++ b/ros2trace/setup.py
@@ -17,11 +17,13 @@ setup(
     ),
     author='Christophe Bedard',
     author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
-    # url=',
+    url='https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing',
     keywords=[],
-    description='The run command for ROS 2 command line tools.',
-    long_description="""\
-The package provides the trace command for the ROS 2 command line tools.""",
+    description='The trace command for ROS 2 command line tools.',
+    long_description=(
+        'The package provides the trace command '
+        'for the ROS 2 command line tools.'
+    ),
     license='Apache 2.0',
     tests_require=['pytest'],
     entry_points={
diff --git a/tracetools/package.xml b/tracetools/package.xml
index cf65ed4..8de2266 100644
--- a/tracetools/package.xml
+++ b/tracetools/package.xml
@@ -3,11 +3,11 @@
 <package format="2">
   <name>tracetools</name>
   <version>0.1.0</version>
-  <description>ROS 2 wrapper for instrumentation</description>
+  <description>Tracing wrapper for ROS 2.</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
-  <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Luetkebohle</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 Luetkebohle</author>
+  <author email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</author>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
diff --git a/tracetools_launch/package.xml b/tracetools_launch/package.xml
index 33ed50d..159820a 100644
--- a/tracetools_launch/package.xml
+++ b/tracetools_launch/package.xml
@@ -3,7 +3,7 @@
 <package format="2">
   <name>tracetools_launch</name>
   <version>0.1.0</version>
-  <description>Launch integration for tracing</description>
+  <description>Launch integration for tracing.</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
diff --git a/tracetools_launch/setup.py b/tracetools_launch/setup.py
index ea19746..00199ec 100644
--- a/tracetools_launch/setup.py
+++ b/tracetools_launch/setup.py
@@ -24,9 +24,13 @@ setup(
     ),
     author='Christophe Bedard',
     author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
-    # url='',
-    keywords=['ROS'],
-    description='Launch integration for tracing',
+    url='https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing',
+    keywords=[],
+    description='Launch integration for tracing.',
+    long_description=(
+        'This package provides a trace action to '
+        'launch tracing through a launch file.'
+    ),
     license='Apache 2.0',
     tests_require=['pytest'],
 )
diff --git a/tracetools_read/package.xml b/tracetools_read/package.xml
index 9e50445..7f2b3cb 100644
--- a/tracetools_read/package.xml
+++ b/tracetools_read/package.xml
@@ -3,7 +3,7 @@
 <package format="2">
   <name>tracetools_read</name>
   <version>0.1.0</version>
-  <description>Tools for reading traces</description>
+  <description>Tools for reading traces.</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
diff --git a/tracetools_read/setup.py b/tracetools_read/setup.py
index 66bd5a5..fef52a7 100644
--- a/tracetools_read/setup.py
+++ b/tracetools_read/setup.py
@@ -21,9 +21,9 @@ setup(
     ),
     author='Christophe Bedard',
     author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
-    # url='',
-    keywords=['ROS'],
-    description='Tools for reading trace',
+    url='https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing',
+    keywords=[],
+    description='Tools for reading traces.',
     license='Apache 2.0',
     tests_require=['pytest'],
 )
diff --git a/tracetools_test/package.xml b/tracetools_test/package.xml
index 411fe3a..13f90f4 100644
--- a/tracetools_test/package.xml
+++ b/tracetools_test/package.xml
@@ -3,9 +3,9 @@
 <package format="2">
   <name>tracetools_test</name>
   <version>0.1.0</version>
-  <description>Separate test package for tracetools</description>
+  <description>Testing utilities and tests for the tracetools package.</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
-  <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Luetkebohle</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 051cf0f..00cfc4b 100644
--- a/tracetools_trace/package.xml
+++ b/tracetools_trace/package.xml
@@ -3,7 +3,7 @@
 <package format="2">
   <name>tracetools_trace</name>
   <version>0.1.0</version>
-  <description>Tools for setting up tracing sessions</description>
+  <description>Tools for setting up tracing sessions.</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
   <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
   <license>Apache 2.0</license>
diff --git a/tracetools_trace/setup.py b/tracetools_trace/setup.py
index 4186e21..4a20adc 100644
--- a/tracetools_trace/setup.py
+++ b/tracetools_trace/setup.py
@@ -21,9 +21,13 @@ setup(
     ),
     author='Christophe Bedard',
     author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
-    # url='',
-    keywords=['ROS'],
-    description='Tools for setting up tracing sessions',
+    url='https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing',
+    keywords=[],
+    description='Tools for setting up tracing sessions.',
+    long_description=(
+        'This package provides tools for setting up tracing sessions. '
+        'It also provides basic utilities to provide CLI functionality.'
+    ),
     entry_points={
         'console_scripts': [
             f'trace = {package_name}.trace:main',