diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua
index cd2dc4aa28..7db639978a 100644
--- a/mods/cnc/maps/gdi03/gdi03.lua
+++ b/mods/cnc/maps/gdi03/gdi03.lua
@@ -73,7 +73,7 @@ WorldLoaded = function()
 
 	Trigger.OnAllKilled(SamSites, function()
 		player.MarkCompletedObjective(gdiAirSupportObjective)
-		Actor.Create("SamsDestroyed", true, { Owner = player })
+		Actor.Create("airstrike.proxy", true, { Owner = player })
 	end)
 
 	Utils.Do(Map.NamedActors, function(actor)
@@ -95,7 +95,7 @@ WorldLoaded = function()
 	end)
 
 	InitialUnitsArrived = false
-	Trigger.AfterDelay(DateTime.Seconds(1), SendReinforcements)
+	SendReinforcements()
 
 	Camera.Position = MCVwaypoint.CenterPosition
 
diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index d8fbb2dac4..71755e4144 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -823,15 +823,35 @@ Rules:
 			Amount: -10
 		-Capturable:
 	HQ:
-		AirstrikePower:
-			Prerequisites: ~airsupport
-			ChargeTime: 120
-	SamsDestroyed:
-		ProvidesCustomPrerequisite:
-			Prerequisite: airsupport
-	AirSupport:
+		Buildable:
+			Prerequisites: ~disabled
+	NOHQ:
+		Inherits: HQ
+		Buildable:
+			Prerequisites: proc
 		Tooltip:
-			Name: A10 Air Strike
+			Description: Provides an overview of the battlefield.\n  Requires power to operate.
+		-AirstrikePower:
+		RenderBuilding:
+			Image: hq
+	airstrike.proxy:
+		AirstrikePower:
+			Icon: airstrike
+			StartFullyCharged: True
+			ChargeTime: 120
+			SquadSize: 3
+			QuantizedFacings: 8
+			Description: Air Strike
+			LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
+			EndChargeSound: airredy1.aud
+			SelectTargetSound: select1.aud
+			InsufficientPowerSound: nopower1.aud
+			IncomingSound: enemya.aud
+			UnitType: a10
+			DisplayBeacon: True
+			BeaconPoster: airstrike
+			DisplayRadarPing: True
+			CameraActor: camera
 
 Sequences: