diff --git a/GameData/RP-1/Contracts/Mars/Mars Probe.cfg b/GameData/RP-1/Contracts/Mars/Mars Probe.cfg
index ade5d7079d0..e1766e37e39 100644
--- a/GameData/RP-1/Contracts/Mars/Mars Probe.cfg	
+++ b/GameData/RP-1/Contracts/Mars/Mars Probe.cfg	
@@ -49,7 +49,6 @@ CONTRACT_TYPE
 		name = VesselGroup
 		type = VesselParameterGroup
 		title = Atmospheric probe Mars
-		define = ProbeMars
 		
 		PARAMETER
 		{
diff --git a/GameData/RP-1/Contracts/Mars/Mars Rover.cfg b/GameData/RP-1/Contracts/Mars/Mars Rover.cfg
index 25a482ed833..f74e5887bda 100644
--- a/GameData/RP-1/Contracts/Mars/Mars Rover.cfg	
+++ b/GameData/RP-1/Contracts/Mars/Mars Rover.cfg	
@@ -63,10 +63,12 @@ CONTRACT_TYPE
 
 	PARAMETER
 	{
-		name = VesselGroup
+		name = VesselGroup1
 		type = VesselParameterGroup
-		title = Uncrewed rover on Mars
-		define = ProbeMars
+		title = Land near waypoint
+		define = MarsRover
+		dissassociateVesselsOnContractCompletion = true
+		resetChildrenWhenVesselDestroyed = true
 
 		PARAMETER
 		{
@@ -78,16 +80,41 @@ CONTRACT_TYPE
 			hideChildren = true
 		}
 		PARAMETER
+		{
+			name = Land
+			type = ReachState
+			situation = LANDED
+			title = Land on Mars
+			hideChildren = true
+		}
+		PARAMETER
 		{
 			name = WaypointAlpha
 			type = VisitWaypoint
 			index = 0
-			distance = 100.0
-			disableOnStateChange = true
-			title = Safely land near rover site Alpha on Mars
+			distance = 50000.0
+			title = Be within 50km of site Alpha
 			hideChildren = true
 			showMessages = true
 		}
+	}
+
+	PARAMETER
+	{
+		name = VesselGroup2
+		type = VesselParameterGroup
+		title = Visit the other 2 waypoints
+		vessel = MarsRover
+
+		PARAMETER
+		{
+			name = Crewmembers
+			type = HasCrew
+			minCrew = 0
+			maxCrew = 0
+			title = Uncrewed
+			hideChildren = true
+		}
 		PARAMETER
 		{
 			name = WaypointBravo
@@ -145,7 +172,7 @@ CONTRACT_TYPE
 			icon = marker
 			altitude = 0.0
 			waterAllowed = false
-			nearIndex = 0
+			vessel = MarsRover
 			minDistance = 500.0
 			maxDistance = 1000.0
 		}
diff --git a/GameData/RP-1/Contracts/Mars/Mars RoverRepeat.cfg b/GameData/RP-1/Contracts/Mars/Mars RoverRepeat.cfg
index 1c476edef2e..98708167003 100644
--- a/GameData/RP-1/Contracts/Mars/Mars RoverRepeat.cfg	
+++ b/GameData/RP-1/Contracts/Mars/Mars RoverRepeat.cfg	
@@ -60,13 +60,15 @@ CONTRACT_TYPE
 	}
 
 	// ************ PARAMETERS ************
-
+	
 	PARAMETER
 	{
-		name = VesselGroup
+		name = VesselGroup1
 		type = VesselParameterGroup
-		title = Uncrewed rover on Mars
-		define = ProbeMars
+		title = Land near waypoint
+		define = MarsRover
+		dissassociateVesselsOnContractCompletion = true
+		resetChildrenWhenVesselDestroyed = true
 
 		PARAMETER
 		{
@@ -78,16 +80,41 @@ CONTRACT_TYPE
 			hideChildren = true
 		}
 		PARAMETER
+		{
+			name = Land
+			type = ReachState
+			situation = LANDED
+			title = Land on Mars
+			hideChildren = true
+		}
+		PARAMETER
 		{
 			name = WaypointAlpha
 			type = VisitWaypoint
 			index = 0
-			distance = 100.0
-			disableOnStateChange = true
-			title = Safely land near rover site Alpha on Mars
+			distance = 50000.0
+			title = Be within 50km of site Alpha
 			hideChildren = true
 			showMessages = true
 		}
+	}
+
+	PARAMETER
+	{
+		name = VesselGroup2
+		type = VesselParameterGroup
+		title = Visit the other 2 waypoints
+		vessel = MarsRover
+
+		PARAMETER
+		{
+			name = Crewmembers
+			type = HasCrew
+			minCrew = 0
+			maxCrew = 0
+			title = Uncrewed
+			hideChildren = true
+		}
 		PARAMETER
 		{
 			name = WaypointBravo
@@ -145,7 +172,7 @@ CONTRACT_TYPE
 			icon = marker
 			altitude = 0.0
 			waterAllowed = false
-			nearIndex = 0
+			vessel = MarsRover
 			minDistance = 500.0
 			maxDistance = 1000.0
 		}