diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml
index eebeea85ef..fac6a8739b 100644
--- a/mods/ts/rules/gdi-vehicles.yaml
+++ b/mods/ts/rules/gdi-vehicles.yaml
@@ -29,8 +29,16 @@ APC:
 		UnloadVoice: Unload
 		LoadingUpgrades: notmobile
 		EjectOnDeath: true
-	-WithVoxelBody:
-	WithVoxelWaterBody:
+	UpgradeOnTerrain:
+		Upgrades: inwater
+		TerrainTypes: Water
+	WithVoxelBody:
+		UpgradeTypes: inwater
+		UpgradeMaxEnabledLevel: 0
+	WithVoxelBody@water:
+		Sequence: water
+		UpgradeTypes: inwater
+		UpgradeMinEnabledLevel: 1
 	LeavesTrails:
 		Image: wake
 		Palette: effect