diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm
index d942fa767db..4ce5f4757da 100644
--- a/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm
+++ b/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm
@@ -1,27 +1,20 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/blacksmith,
-/turf/open/floor/stone,
-/area/space)
 "b" = (
 /obj/machinery/light/small/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_forge,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "c" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "l" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_water_basin,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "n" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/sheet/mineral/coal/ten,
@@ -34,11 +27,9 @@
 /obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith,
 /obj/item/clothing/suit/leatherapron,
 /obj/structure/cargo_shelf,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/stone,
-/area/space)
-"o" = (
-/turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "s" = (
 /obj/structure/table/wood,
 /obj/machinery/door/window/left/directional/west{
@@ -46,70 +37,79 @@
 	},
 /obj/machinery/door/window/left/directional/east,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "t" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/ash,
-/obj/item/radio/intercom/directional/west,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "u" = (
 /turf/closed/wall,
-/area/space)
+/area/mine/blacksmith)
 "y" = (
-/obj/effect/landmark/start/blacksmith,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "C" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
+"F" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/stone,
+/area/mine/blacksmith)
 "H" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/door/airlock/mining/glass{
-	req_access = list("blacksmith")
+/obj/machinery/door/airlock/maintenance{
+	name = "Blacksmith Mining Workhop Maintenance"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/open/floor/plating,
-/area/space)
+/area/mine/blacksmith)
 "L" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/structure/reagent_anvil,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "O" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/space_heater,
+/obj/machinery/camera/autoname/mine/directional/east,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "P" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/machinery/door/airlock/mining/glass{
-	req_access = list("blacksmith")
+	name = "Blacksmith Mining Workshop"
 	},
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "T" = (
 /obj/structure/reagent_crafting_bench,
 /obj/item/toy/plush/skyrat/deer{
 	name = "Noye";
 	desc = "His treasures were his tools, and the swords and knives he made. His life was at the forge."
 	},
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 "V" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/stone,
-/area/space)
+/area/mine/blacksmith)
 
 (1,1,1) = {"
 u
@@ -121,25 +121,25 @@ H
 u
 T
 t
-a
+C
 "}
 (3,1,1) = {"
 u
 b
-y
+F
 L
 "}
 (4,1,1) = {"
 V
 l
-o
+y
 C
 "}
 (5,1,1) = {"
 O
 n
 c
-a
+C
 "}
 (6,1,1) = {"
 u
diff --git a/modular_zubbers/code/game/area/areas/station.dm b/modular_zubbers/code/game/area/areas/station.dm
index 2f25fa244f9..afdeb2a2df9 100644
--- a/modular_zubbers/code/game/area/areas/station.dm
+++ b/modular_zubbers/code/game/area/areas/station.dm
@@ -2,6 +2,8 @@
 //	MODULAR AREAS	//
 */	//	//	//	//	//
 
+/**********************Station Cargo areas**************************/
+
 /area/station/cargo/blacksmith
 	name = "\improper Blacksmith Workshop"
 	icon_state = "cargo_warehouse"
@@ -18,3 +20,11 @@
 /area/station/commons/dock/secondary
 	name = "\improper Secondary Ship Dock"
 	icon_state = "hallAS"
+
+/**********************Lavaland Mine areas**************************/
+
+/area/mine/blacksmith
+	name = "\improper Blacksmith Mining Workshop"
+	icon = 'modular_zubbers/icons/areas/miningsmithy_area.dmi'
+	icon_state = "mining_smithy"
+	sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
diff --git a/modular_zubbers/icons/areas/miningsmithy_area.dmi b/modular_zubbers/icons/areas/miningsmithy_area.dmi
new file mode 100644
index 00000000000..2ef21855ded
Binary files /dev/null and b/modular_zubbers/icons/areas/miningsmithy_area.dmi differ