diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index 20e810d697..4bc2c7d742 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -417,7 +417,7 @@ MECH:
 		VoiceSet: MechanicVoice
 	AutoTarget:
 	AutoTargetPriority@DEFAULT:
-		ValidTargets: Vehicle
+		ValidTargets: Vehicle, Ship
 
 EINSTEIN:
 	Inherits: ^CivInfantry
diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml
index a52a7049ff..f7b23f1ad6 100644
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -27,7 +27,7 @@ SS:
 		TargetTypes: Ground, Water, Ship, Submarine, Repair
 		RequiresCondition: !underwater
 	Targetable@UNDERWATER:
-		TargetTypes: Underwater, Submarine, Repair
+		TargetTypes: Underwater, Submarine
 		RequiresCondition: underwater
 	Cloak:
 		CloakTypes: Underwater
@@ -95,7 +95,7 @@ MSUB:
 		TargetTypes: Ground, Water, Ship, Submarine, Repair
 		RequiresCondition: !underwater
 	Targetable@UNDERWATER:
-		TargetTypes: Underwater, Submarine, Repair
+		TargetTypes: Underwater, Submarine
 		RequiresCondition: underwater
 	Cloak:
 		CloakTypes: Underwater