diff --git a/yasmin_demos/package.xml b/yasmin_demos/package.xml
index afccc86..2492357 100644
--- a/yasmin_demos/package.xml
+++ b/yasmin_demos/package.xml
@@ -17,13 +17,14 @@
   <depend>yasmin_viewer</depend>
   <depend>nav_msgs</depend>
   <depend>example_interfaces</depend>
-  <depend>ros-environment</depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
   <test_depend>python3-pytest</test_depend>
 
+  <build_depend>ros_environment</build_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>
diff --git a/yasmin_ros/package.xml b/yasmin_ros/package.xml
index 1e7b267..4e3ff95 100644
--- a/yasmin_ros/package.xml
+++ b/yasmin_ros/package.xml
@@ -14,7 +14,6 @@
   <depend>rclcpp</depend>
   <depend>rclcpp_action</depend>
   <depend>yasmin</depend>
-  <depend>ros-environment</depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
@@ -22,6 +21,8 @@
   <test_depend>python3-pytest</test_depend>
   <test_depend>python3-pytest-cov</test_depend>
 
+  <build_depend>ros_environment</build_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>