diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml
index 881ebf1..d90907a 100644
--- a/ros2trace_analysis/package.xml
+++ b/ros2trace_analysis/package.xml
@@ -11,11 +11,11 @@
   <url type="bugtracker">https://gitlab.com/ros-tracing/tracetools_analysis/-/issues</url>
   <author email="christophe.bedard@apex.ai">Christophe Bedard</author>
 
+  <buildtool_depend>ament_package</buildtool_depend>
+
   <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/tracetools_analysis/package.xml b/tracetools_analysis/package.xml
index 90938f5..65ec101 100644
--- a/tracetools_analysis/package.xml
+++ b/tracetools_analysis/package.xml
@@ -13,11 +13,11 @@
   <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_package</buildtool_depend>
+
   <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>