diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm
index 330d703ac0..1acffac70d 100644
--- a/code/game/area/Space Station 13 areas_vr.dm	
+++ b/code/game/area/Space Station 13 areas_vr.dm	
@@ -248,3 +248,13 @@
 /area/engineering/engine_gas
 	name = "\improper Engine Gas Storage"
 	icon_state = "engine_waste"
+
+//CHOMPStation Addition Start - TFF 24/11/19 - New areas for Chapel Maint.
+/area/maintenance/chapel_aft
+	name = "Chapel Maintenance - Aft"
+	icon_state = "maint_chapel"
+
+/area/maintenance/chapel_fore
+	name = "Chapel Maintenance - Fore"
+	icon_state = "maint_chapel"
+//CHOMPStation Addition End
\ No newline at end of file
diff --git a/code/modules/events/boss.dm b/code/modules/events/boss.dm
index 31bc9dd09c..a20599a8e9 100644
--- a/code/modules/events/boss.dm
+++ b/code/modules/events/boss.dm
@@ -2,7 +2,7 @@
 #define LOC_CHAPEL 1
 #define LOC_LIBRARY 2
 #define LOC_GARDEN 3
-#define LOC_MAINTENANCE 4 
+#define LOC_MAINTENANCE 4
 #define LOC_CONSTR 5
 
 #define BOSS_METROID 0
@@ -42,7 +42,7 @@
 			spawn_area_type = /area/hydroponics/garden
 			locstring = "the public garden"
 		if(LOC_MAINTENANCE)
-			spawn_area_type = /area/maintenance/locker
+			spawn_area_type = /area/maintenance/chapel_fore
 			locstring = "far northern maintenance tunnels"
 		if(LOC_CONSTR)
 			spawn_area_type = /area/construction
@@ -102,7 +102,7 @@
 #undef LOC_CHAPEL
 #undef LOC_LIBRARY
 #undef LOC_GARDEN
-#undef LOC_MAINTENANCE 
+#undef LOC_MAINTENANCE
 #undef LOC_CONSTR
 
 #undef BOSS_METROID
@@ -113,4 +113,4 @@
 #undef BOSS_DRAGON
 #undef BOSS_PANTHER
 #undef BOSS_MOTHER
-#undef BOSS_CHUNGUS
\ No newline at end of file
+#undef BOSS_CHUNGUS
diff --git a/maps/northern_star/northern_star_areas.dm b/maps/northern_star/northern_star_areas.dm
index a2aefa226c..b83c762aba 100644
--- a/maps/northern_star/northern_star_areas.dm
+++ b/maps/northern_star/northern_star_areas.dm
@@ -26,14 +26,6 @@
 	name = "Mining Outpost Emergency Storage"
 
 //TFF 28/9/19 - Add more areas. Again.
-/area/maintenance/chapel_aft
-	name = "Chapel Maintenance - Aft"
-	icon_state = "maint_chapel"
-
-/area/maintenance/chapel_fore
-	name = "Chapel Maintenance - Fore"
-	icon_state = "maint_chapel"
-
 /area/crew_quarters/bar_backroom
 	name = "Bar Backroom"
 	icon_state = "bar"