diff --git a/husarion_utils/healthcheck.cpp b/husarion_utils/healthcheck.cpp
index 0d09668..5fc0c43 100644
--- a/husarion_utils/healthcheck.cpp
+++ b/husarion_utils/healthcheck.cpp
@@ -2,6 +2,7 @@
 #include "nav_msgs/msg/odometry.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "sensor_msgs/msg/imu.hpp"
+#include "sensor_msgs/msg/joint_state.hpp"
 #include <cstdlib>
 
 using namespace std::chrono;
@@ -13,52 +14,51 @@ using namespace std::chrono_literals;
 class HealthCheckNode : public rclcpp::Node {
 public:
   HealthCheckNode()
-      : Node("healthcheck_rosbot"), last_controller_msg_(steady_clock::now()),
-        last_ekf_msg_(steady_clock::now()), last_imu_msg_(steady_clock::now()) {
-
-    sub_controller_ = create_subscription<nav_msgs::msg::Odometry>(
-        "rosbot_base_controller/odom",
-        rclcpp::SystemDefaultsQoS().keep_last(1).transient_local(),
-        std::bind(&HealthCheckNode::controllerCallback, this,
-                  std::placeholders::_1));
+      : Node("healthcheck_rosbot"), last_ekf_msg_(steady_clock::duration(0)),
+        last_imu_msg_(steady_clock::duration(0)),
+        last_motors_msg_(steady_clock::duration(0)) {
 
     sub_ekf_ = create_subscription<nav_msgs::msg::Odometry>(
         "odometry/filtered", rclcpp::SystemDefaultsQoS().keep_last(1),
         std::bind(&HealthCheckNode::ekfCallback, this, std::placeholders::_1));
 
     sub_imu_ = create_subscription<sensor_msgs::msg::Imu>(
-        "imu_broadcaster/imu",
-        rclcpp::SystemDefaultsQoS().keep_last(1).transient_local(),
+        "/_imu/data_raw", rclcpp::SystemDefaultsQoS().keep_last(1),
         std::bind(&HealthCheckNode::imuCallback, this, std::placeholders::_1));
 
+    sub_motors_ = create_subscription<sensor_msgs::msg::JointState>(
+        "/_motors_response", rclcpp::SystemDefaultsQoS().keep_last(1),
+        std::bind(&HealthCheckNode::motorsCallback, this,
+                  std::placeholders::_1));
+
     healthcheck_timer_ = create_wall_timer(
         HEALTHCHECK_PERIOD, std::bind(&HealthCheckNode::healthyCheck, this));
   }
 
 private:
-  steady_clock::time_point last_controller_msg_;
   steady_clock::time_point last_ekf_msg_;
   steady_clock::time_point last_imu_msg_;
+  steady_clock::time_point last_motors_msg_;
 
-  rclcpp::Subscription<nav_msgs::msg::Odometry>::SharedPtr sub_controller_;
   rclcpp::Subscription<nav_msgs::msg::Odometry>::SharedPtr sub_ekf_;
   rclcpp::Subscription<sensor_msgs::msg::Imu>::SharedPtr sub_imu_;
+  rclcpp::Subscription<sensor_msgs::msg::JointState>::SharedPtr sub_motors_;
   rclcpp::TimerBase::SharedPtr healthcheck_timer_;
 
   bool isMsgValid(steady_clock::time_point current_time,
                   steady_clock::time_point last_msg) {
-    duration<double> elapsed_time = current_time - last_controller_msg_;
+    duration<double> elapsed_time = current_time - last_msg;
     return elapsed_time < MSG_VALID_TIME;
   }
 
   void healthyCheck() {
     auto current_time = steady_clock::now();
 
-    bool is_controller = isMsgValid(current_time, last_ekf_msg_);
     bool is_ekf = isMsgValid(current_time, last_ekf_msg_);
     bool is_imu = isMsgValid(current_time, last_imu_msg_);
+    bool is_motors = isMsgValid(current_time, last_motors_msg_);
 
-    if (is_controller && is_ekf && is_imu) {
+    if (is_ekf && is_imu && is_motors) {
       writeHealthStatus("healthy");
     } else {
       writeHealthStatus("unhealthy");
@@ -70,19 +70,19 @@ class HealthCheckNode : public rclcpp::Node {
     healthFile << status;
   }
 
-  void controllerCallback(const nav_msgs::msg::Odometry::SharedPtr msg) {
-    RCLCPP_DEBUG_ONCE(get_logger(), "Map msg arrived");
-    last_controller_msg_ = steady_clock::now();
-  }
-
   void ekfCallback(const nav_msgs::msg::Odometry::SharedPtr msg) {
-    RCLCPP_DEBUG_ONCE(get_logger(), "Map msg arrived");
-    last_controller_msg_ = steady_clock::now();
+    RCLCPP_DEBUG_ONCE(get_logger(), "EKF msg arrived");
+    last_ekf_msg_ = steady_clock::now();
   }
 
   void imuCallback(const sensor_msgs::msg::Imu::SharedPtr msg) {
-    RCLCPP_DEBUG_ONCE(get_logger(), "Map msg arrived");
-    last_controller_msg_ = steady_clock::now();
+    RCLCPP_DEBUG_ONCE(get_logger(), "IMU msg arrived");
+    last_imu_msg_ = steady_clock::now();
+  }
+
+  void motorsCallback(const sensor_msgs::msg::JointState::SharedPtr msg) {
+    RCLCPP_DEBUG_ONCE(get_logger(), "Motors msg arrived");
+    last_motors_msg_ = steady_clock::now();
   }
 };