diff --git a/src/modules/rover_mecanum/RoverMecanum.cpp b/src/modules/rover_mecanum/RoverMecanum.cpp
index 5c1d662de6c1..2bb3d23c3f16 100644
--- a/src/modules/rover_mecanum/RoverMecanum.cpp
+++ b/src/modules/rover_mecanum/RoverMecanum.cpp
@@ -160,6 +160,19 @@ void RoverMecanum::Run()
 				rover_mecanum_setpoint.yaw_rate_setpoint_normalized = NAN;
 				rover_mecanum_setpoint.yaw_setpoint = NAN;
 
+				// Reset cruise control if the manual input changes
+				if (_yaw_ctl && (!(fabsf(manual_control_setpoint.throttle - _prev_throttle) > STICK_DEADZONE)
+						 || !(fabsf(manual_control_setpoint.roll - _prev_roll) > STICK_DEADZONE))) {
+					_yaw_ctl = false;
+					_prev_throttle = manual_control_setpoint.throttle;
+					_prev_roll = manual_control_setpoint.roll;
+
+				} else if (!_yaw_ctl) {
+					_prev_throttle = manual_control_setpoint.throttle;
+					_prev_roll = manual_control_setpoint.roll;
+				}
+
+
 				if (fabsf(rover_mecanum_setpoint.yaw_rate_setpoint) > FLT_EPSILON
 				    || (fabsf(rover_mecanum_setpoint.forward_speed_setpoint) < FLT_EPSILON
 					&& fabsf(rover_mecanum_setpoint.lateral_speed_setpoint) < FLT_EPSILON)) { // Closed loop yaw rate control
@@ -168,12 +181,30 @@ void RoverMecanum::Run()
 					rover_mecanum_setpoint.yaw_setpoint = NAN;
 					_yaw_ctl = false;
 
-				} else { // Closed loop yaw control // TODO: Add cruise control
+				} else { // Cruise control
+					const Vector3f velocity = Vector3f(rover_mecanum_setpoint.forward_speed_setpoint,
+									   rover_mecanum_setpoint.lateral_speed_setpoint, 0.f);
+					const float desired_velocity_magnitude = velocity.norm();
+
 					if (!_yaw_ctl) {
 						_desired_yaw = _vehicle_yaw;
 						_yaw_ctl = true;
+						_pos_ctl_start_position_ned = _curr_pos_ned;
+						const Vector3f pos_ctl_course_direction_local = _vehicle_attitude_quaternion.rotateVector(velocity.normalized());
+						_pos_ctl_course_direction = Vector2f(pos_ctl_course_direction_local(0), pos_ctl_course_direction_local(1));
+
 					}
 
+					// Construct a 'target waypoint' for course control s.t. it is never within the maximum lookahead of the rover
+					const float vector_scaling = sqrtf(powf(_param_pp_lookahd_max.get(),
+										2) + powf(_posctl_pure_pursuit.getCrosstrackError(), 2)) + _posctl_pure_pursuit.getDistanceOnLineSegment();
+					const Vector2f target_waypoint_ned = _pos_ctl_start_position_ned + vector_scaling * _pos_ctl_course_direction;
+					const float desired_heading = _posctl_pure_pursuit.calcDesiredHeading(target_waypoint_ned, _pos_ctl_start_position_ned,
+								      _curr_pos_ned, desired_velocity_magnitude);
+					const float heading_error = matrix::wrap_pi(desired_heading - _vehicle_yaw);
+					const Vector2f desired_velocity = desired_velocity_magnitude * Vector2f(cosf(heading_error), sinf(heading_error));
+					rover_mecanum_setpoint.forward_speed_setpoint = desired_velocity(0);
+					rover_mecanum_setpoint.lateral_speed_setpoint = desired_velocity(1);
 					rover_mecanum_setpoint.yaw_setpoint = _desired_yaw;
 					rover_mecanum_setpoint.yaw_rate_setpoint = NAN;
 				}
diff --git a/src/modules/rover_mecanum/RoverMecanum.hpp b/src/modules/rover_mecanum/RoverMecanum.hpp
index 40b766c9a4ac..e76124aca9a1 100644
--- a/src/modules/rover_mecanum/RoverMecanum.hpp
+++ b/src/modules/rover_mecanum/RoverMecanum.hpp
@@ -39,6 +39,7 @@
 #include <px4_platform_common/module.h>
 #include <px4_platform_common/module_params.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
+#include <lib/pure_pursuit/PurePursuit.hpp>
 
 // uORB includes
 #include <uORB/Publication.hpp>
@@ -65,7 +66,7 @@ static constexpr float YAW_RATE_THRESHOLD =
 static constexpr float SPEED_THRESHOLD =
 	0.1f; // [m/s] Threshold for the speed measurement to cut off measurement noise when the rover is standing still
 static constexpr float STICK_DEADZONE =
-	0.1f; // [0, 1] Percentage of stick input range that will be interpreted as zero around the stick centered value
+	0.3f; // [0, 1] Percentage of stick input range that will be interpreted as zero around the stick centered value
 
 using namespace time_literals;
 
@@ -112,6 +113,7 @@ class RoverMecanum : public ModuleBase<RoverMecanum>, public ModuleParams,
 	// Instances
 	RoverMecanumGuidance _rover_mecanum_guidance{this};
 	RoverMecanumControl _rover_mecanum_control{this};
+	PurePursuit _posctl_pure_pursuit{this}; // Pure pursuit library
 
 	// Variables
 	matrix::Quatf _vehicle_attitude_quaternion{};
@@ -123,11 +125,17 @@ class RoverMecanum : public ModuleBase<RoverMecanum>, public ModuleParams,
 	int _nav_state{0};
 	bool _yaw_ctl{false}; // Indicates if the rover is doing yaw or yaw rate control in position mode
 	float _desired_yaw{0.f}; // Yaw setpoint for position mode
+	Vector2f _pos_ctl_start_position_ned{};
+	Vector2f _pos_ctl_course_direction{};
+	Vector2f _curr_pos_ned{};
+	float _prev_throttle{0.f};
+	float _prev_roll{0.f};
 	bool _armed{false};
 
 	DEFINE_PARAMETERS(
 		(ParamFloat<px4::params::RM_MAX_SPEED>) _param_rm_max_speed,
 		(ParamFloat<px4::params::RM_MAN_YAW_SCALE>) _param_rm_man_yaw_scale,
-		(ParamFloat<px4::params::RM_MAX_YAW_RATE>) _param_rm_max_yaw_rate
+		(ParamFloat<px4::params::RM_MAX_YAW_RATE>) _param_rm_max_yaw_rate,
+		(ParamFloat<px4::params::PP_LOOKAHD_MAX>) _param_pp_lookahd_max
 	)
 };