diff --git a/code/modules/vehicles/blackfoot/blackfoot.dm b/code/modules/vehicles/blackfoot/blackfoot.dm
index 89b7af605868..5c9294a6325e 100644
--- a/code/modules/vehicles/blackfoot/blackfoot.dm
+++ b/code/modules/vehicles/blackfoot/blackfoot.dm
@@ -46,7 +46,6 @@
 	hardpoints_allowed = list(
 		/obj/item/hardpoint/locomotion/blackfoot_thrusters,
 		/obj/item/hardpoint/primary/blackfoot_launchers,
-		/obj/item/hardpoint/secondary/doorgun,
 	)
 
 	entrances = list(
@@ -111,6 +110,72 @@
 	var/datum/tacmap/tacmap
 	var/minimap_type = MINIMAP_FLAG_USCM
 
+/obj/effect/vehicle_spawner/blackfoot
+	name = "Plain AD-71E Blackfoot Spawner"
+	icon = 'icons/obj/vehicles/blackfoot.dmi'
+	icon_state = "stowed"
+	pixel_x = -64
+	pixel_y = -32
+
+	var/obj/vehicle/multitile/blackfoot/vehicle_type = /obj/vehicle/multitile/blackfoot
+
+/obj/effect/vehicle_spawner/blackfoot/Initialize()
+	. = ..()
+	spawn_vehicle()
+	qdel(src)
+
+/obj/effect/vehicle_spawner/blackfoot/spawn_vehicle()
+	var/obj/vehicle/multitile/blackfoot/blackfoot = new vehicle_type(loc)
+
+	load_misc(blackfoot)
+	load_hardpoints(blackfoot)
+	handle_direction(blackfoot)
+	blackfoot.update_icon()
+
+/obj/effect/vehicle_spawner/blackfoot/doorgun
+	name = "Doorgun AD-71E Blackfoot Spawner"
+	icon = 'icons/obj/vehicles/blackfoot.dmi'
+	icon_state = "doorgun_stowed"
+
+	vehicle_type = /obj/vehicle/multitile/blackfoot/doorgun
+
+/obj/effect/vehicle_spawner/blackfoot/doorgun/load_hardpoints(obj/vehicle/multitile/blackfoot/doorgun/blackfoot)
+	blackfoot.add_hardpoint(new /obj/item/hardpoint/secondary/doorgun)
+
+/obj/effect/vehicle_spawner/blackfoot/recon
+	name = "Recon AD-71E Blackfoot Spawner"
+	icon = 'icons/obj/vehicles/blackfoot.dmi'
+	icon_state = "recon_stowed"
+
+	vehicle_type = /obj/vehicle/multitile/blackfoot/recon
+
+/obj/effect/vehicle_spawner/blackfoot/recon/load_hardpoints(obj/vehicle/multitile/blackfoot/recon/blackfoot)
+	blackfoot.add_hardpoint(new /obj/item/hardpoint/secondary/doorgun)
+	blackfoot.add_hardpoint(new /obj/item/hardpoint/support/recon_system)
+
+/obj/vehicle/multitile/blackfoot/doorgun
+	icon_state = "doorgun_stowed"
+
+	hardpoints_allowed = list(
+		/obj/item/hardpoint/locomotion/blackfoot_thrusters,
+		/obj/item/hardpoint/primary/blackfoot_launchers,
+		/obj/item/hardpoint/secondary/doorgun,
+	)
+
+	interior_map = /datum/map_template/interior/blackfoot_doorgun
+
+/obj/vehicle/multitile/blackfoot/recon
+	icon_state = "recon_stowed"
+
+	hardpoints_allowed = list(
+		/obj/item/hardpoint/locomotion/blackfoot_thrusters,
+		/obj/item/hardpoint/primary/blackfoot_launchers,
+		/obj/item/hardpoint/secondary/doorgun,
+		/obj/item/hardpoint/support/recon_system,
+	)
+	// change this when/if updated map is ready
+	interior_map = /datum/map_template/interior/blackfoot_doorgun
+
 /datum/tacmap/drawing/blackfoot/ui_status(mob/user)
 	var/obj/vehicle/multitile/blackfoot/blackfoot_owner = owner
 
diff --git a/code/modules/vehicles/hardpoints/secondary/doorgun.dm b/code/modules/vehicles/hardpoints/secondary/doorgun.dm
index 3974b219226f..01a68c313962 100644
--- a/code/modules/vehicles/hardpoints/secondary/doorgun.dm
+++ b/code/modules/vehicles/hardpoints/secondary/doorgun.dm
@@ -23,20 +23,6 @@
 
 	origins = list(0, 2)
 
-	var/interior_type = /datum/map_template/interior/blackfoot_doorgun
-
-/obj/item/hardpoint/secondary/doorgun/on_install(obj/vehicle/multitile/vehicle)
-	if(!istype(vehicle, /obj/vehicle/multitile/blackfoot))
-		return
-
-	var/obj/vehicle/multitile/blackfoot/blackfoot = vehicle
-
-	QDEL_NULL(blackfoot.interior)
-	blackfoot.interior = new(blackfoot)
-	blackfoot.interior_map = interior_type
-	INVOKE_ASYNC(blackfoot, TYPE_PROC_REF(/obj/vehicle/multitile, do_create_interior))
-	blackfoot.update_icon()
-
 /obj/item/hardpoint/secondary/doorgun/reset_rotation()
 	rotate(turning_angle(dir, NORTH))
 
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index cee940e4e250..4913f4f8ef97 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -43559,7 +43559,7 @@
 	dir = 4;
 	layer = 2.9
 	},
-/obj/vehicle/multitile/blackfoot,
+/obj/effect/vehicle_spawner/blackfoot/doorgun,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/operations)
 "eqm" = (