diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 9d6733edca..c98a1cbb6d 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -967,6 +967,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
 							Console.WriteLine("Please check if your aircraft behave as intended or need manual adjustments.");
 							node.Value.Nodes.Add(new MiniYamlNode("TakeOffOnResupply", "true"));
 						}
+
+						// Upgrade rule for setting VTOL to true for CanHover actors
+						if (isHeli)
+							node.Value.Nodes.Add(new MiniYamlNode("VTOL", "true"));
 					}
 				}
 
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 92b9bfed37..5a38389d5e 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -273,6 +273,7 @@
 		CruisingCondition: cruising
 		CanHover: True
 		TakeOffOnResupply: true
+		VTOL: true
 	HiddenUnderFog:
 		Type: GroundPosition
 	ActorLostNotification:
@@ -944,6 +945,7 @@
 		ZOffset: -129
 	Aircraft:
 		CanHover: True
+		VTOL: true
 	FallsToEarth:
 		Spins: True
 		Moves: False
diff --git a/mods/d2k/maps/atreides-05/rules.yaml b/mods/d2k/maps/atreides-05/rules.yaml
index 1da8afca2a..f99e9d4d91 100644
--- a/mods/d2k/maps/atreides-05/rules.yaml
+++ b/mods/d2k/maps/atreides-05/rules.yaml
@@ -26,7 +26,7 @@ carryall.reinforce:
 frigate:
 	Aircraft:
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete
-		CanHover: true # The frigate would teleport to land otherwise
+		VTOL: true # The frigate would teleport to land otherwise
 
 barracks.harkonnen:
 	Inherits: barracks
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index d76068434e..b2e6caae47 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -18,6 +18,7 @@ carryall.reinforce:
 		LandWhenIdle: False
 		AirborneCondition: airborne
 		CanHover: True
+		VTOL: true
 	Targetable@GROUND:
 		TargetTypes: Ground, Vehicle
 		RequiresCondition: !airborne
@@ -86,6 +87,7 @@ ornithopter:
 		Repulsable: False
 		CanHover: True
 		CruiseAltitude: 1920
+		VTOL: true
 	AmmoPool:
 		Ammo: 5
 	Tooltip:
@@ -113,5 +115,6 @@ carryall.husk:
 		TurnSpeed: 4
 		Speed: 144
 		CanHover: True
+		VTOL: true
 	RenderSprites:
 		Image: carryall
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index a9e660176a..7ac0cfa982 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -549,6 +549,7 @@
 		CruisingCondition: cruising
 		WaitDistanceFromResupplyBase: 4c0
 		TakeOffOnResupply: true
+		VTOL: true
 	GpsDot:
 		String: Helicopter
 	Hovers@CRUISING:
@@ -913,6 +914,7 @@
 		GenericName: Destroyed Helicopter
 	Aircraft:
 		CanHover: True
+		VTOL: true
 	FallsToEarth:
 	BodyOrientation:
 		UseClassicFacingFudge: True
diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 60626dba35..a42f9b270c 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -345,6 +345,7 @@ HUNTER:
 		CruiseAltitude: 256
 		CanHover: True
 		CruisingCondition: cruising
+		VTOL: true
 	Targetable:
 		TargetTypes: Ground, Vehicle
 	HiddenUnderFog:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 6adf8b67c4..eea9373ce0 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -821,6 +821,7 @@
 		CanHover: True
 		CruisingCondition: cruising
 		TakeOffOnResupply: true
+		VTOL: true
 	Hovers@CRUISING:
 		RequiresCondition: cruising
 
diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml
index eae093798c..7e9112e2a0 100644
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -168,6 +168,7 @@ JUMPJET.Husk:
 	Aircraft:
 		Speed: 186
 		CanHover: True
+		VTOL: true
 	RenderSprites:
 		Image: jumpjet
 	AutoSelectionSize: