diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
index f90a8a3f831b4ad6d33fccba1d179854e9e3ab13..7c7705804dbf3dc2e1dcc730e4f6a46815280c87 100644
--- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
+++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
@@ -53,14 +53,14 @@
  * of the size
  */
 enum class WaypointType : int {
-	position = 0,
-	velocity,
-	loiter,
-	takeoff,
-	land,
-	idle,
-	offboard, // only part of this structure due to legacy reason. It is not used within the Auto flighttasks
-	follow_target
+	position = position_setpoint_s::SETPOINT_TYPE_POSITION,
+	velocity = position_setpoint_s::SETPOINT_TYPE_VELOCITY,
+	loiter = position_setpoint_s::SETPOINT_TYPE_LOITER,
+	takeoff = position_setpoint_s::SETPOINT_TYPE_TAKEOFF,
+	land = position_setpoint_s::SETPOINT_TYPE_LAND,
+	idle = position_setpoint_s::SETPOINT_TYPE_IDLE,
+	offboard = position_setpoint_s::SETPOINT_TYPE_OFFBOARD, // only part of this structure due to legacy reason. It is not used within the Auto flighttasks
+	follow_target = position_setpoint_s::SETPOINT_TYPE_FOLLOW_TARGET,
 };
 
 enum class State {