diff --git a/Dockerfile.hardware b/Dockerfile.hardware
index dd40b9f..7aa6faf 100644
--- a/Dockerfile.hardware
+++ b/Dockerfile.hardware
@@ -92,11 +92,10 @@ RUN apt-get update && apt-get install -y \
 	# Create health check package
     cd src/ && \
 	source /opt/$MYDISTRO/$ROS_DISTRO/setup.bash && \
-    ros2 pkg create healthcheck_pkg --build-type ament_cmake --dependencies rclcpp std_msgs && \
-    sed -i '/find_package(std_msgs REQUIRED)/a \
-            find_package(nav_msgs REQUIRED)\n \
+    ros2 pkg create healthcheck_pkg --build-type ament_cmake --dependencies rclcpp nav_msgs && \
+    sed -i '/find_package(nav_msgs REQUIRED)/a \
             add_executable(healthcheck_node src/healthcheck.cpp)\n \
-            ament_target_dependencies(healthcheck_node rclcpp std_msgs nav_msgs)\n \
+            ament_target_dependencies(healthcheck_node rclcpp nav_msgs)\n \
             install(TARGETS healthcheck_node DESTINATION lib/${PROJECT_NAME})' \
             /ros2_ws/src/healthcheck_pkg/CMakeLists.txt && \
     mv /healthcheck.cpp /ros2_ws/src/healthcheck_pkg/src/ && \
diff --git a/Dockerfile.simulation b/Dockerfile.simulation
index ba15d2e..5c1adb1 100644
--- a/Dockerfile.simulation
+++ b/Dockerfile.simulation
@@ -40,11 +40,10 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
     # Create health check package
     cd src/ && \
 	source /opt/$MYDISTRO/$ROS_DISTRO/setup.bash && \
-    ros2 pkg create healthcheck_pkg --build-type ament_cmake --dependencies rclcpp std_msgs && \
-    sed -i '/find_package(std_msgs REQUIRED)/a \
-            find_package(nav_msgs REQUIRED)\n \
+    ros2 pkg create healthcheck_pkg --build-type ament_cmake --dependencies rclcpp nav_msgs && \
+    sed -i '/find_package(nav_msgs REQUIRED)/a \
             add_executable(healthcheck_node src/healthcheck.cpp)\n \
-            ament_target_dependencies(healthcheck_node rclcpp std_msgs nav_msgs)\n \
+            ament_target_dependencies(healthcheck_node rclcpp nav_msgs)\n \
             install(TARGETS healthcheck_node DESTINATION lib/${PROJECT_NAME})' \
             /ros2_ws/src/healthcheck_pkg/CMakeLists.txt && \
     mv /healthcheck.cpp /ros2_ws/src/healthcheck_pkg/src/ && \