diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index f89bb5f4ff6..6b18f5132c8 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -9222,6 +9222,13 @@ entities:
     - pos: 5.5,7.5
       parent: 2
       type: Transform
+- proto: AirlockMaintReporterLocked
+  entities:
+  - uid: 425
+    components:
+    - pos: -15.5,21.5
+      parent: 2
+      type: Transform
 - proto: AirlockMaintRnDLocked
   entities:
   - uid: 356
@@ -9436,6 +9443,13 @@ entities:
     - pos: 5.5,-14.5
       parent: 2
       type: Transform
+- proto: AirlockReporterLocked
+  entities:
+  - uid: 424
+    components:
+    - pos: -14.5,24.5
+      parent: 2
+      type: Transform
 - proto: AirlockResearchDirectorLocked
   entities:
   - uid: 390
@@ -9713,20 +9727,8 @@ entities:
     - pos: 23.5,-12.5
       parent: 2
       type: Transform
-  - uid: 424
-    components:
-    - pos: -14.5,24.5
-      parent: 2
-      type: Transform
 - proto: AirlockServiceLocked
   entities:
-  - uid: 425
-    components:
-    - name: maintenance hatch
-      type: MetaData
-    - pos: -15.5,21.5
-      parent: 2
-      type: Transform
   - uid: 426
     components:
     - rot: 1.5707963267948966 rad
@@ -79105,7 +79107,7 @@ entities:
     - pos: -38.5,11.5
       parent: 2
       type: Transform
-- proto: LockerParamedicFilled
+- proto: LockerParamedicFilledHardsuit
   entities:
   - uid: 11809
     components:
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index b3d012833ff..679e4441e33 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -5032,6 +5032,13 @@ entities:
     - pos: 12.5,-41.5
       parent: 34
       type: Transform
+- proto: AirlockMaintReporterLocked
+  entities:
+  - uid: 6235
+    components:
+    - pos: 15.5,-39.5
+      parent: 34
+      type: Transform
 - proto: AirlockMaintRnDLocked
   entities:
   - uid: 258
@@ -5073,13 +5080,6 @@ entities:
     - pos: 33.5,-0.5
       parent: 34
       type: Transform
-- proto: AirlockMaintServiceLocked
-  entities:
-  - uid: 10775
-    components:
-    - pos: 15.5,-39.5
-      parent: 34
-      type: Transform
 - proto: AirlockMaintTheatreLocked
   entities:
   - uid: 3088
@@ -5159,6 +5159,13 @@ entities:
     - pos: -14.5,-37.5
       parent: 34
       type: Transform
+- proto: AirlockReporterLocked
+  entities:
+  - uid: 4003
+    components:
+    - pos: 19.5,-36.5
+      parent: 34
+      type: Transform
 - proto: AirlockResearchDirectorLocked
   entities:
   - uid: 555
@@ -5443,13 +5450,6 @@ entities:
     - pos: -17.5,1.5
       parent: 34
       type: Transform
-- proto: AirlockServiceLocked
-  entities:
-  - uid: 4003
-    components:
-    - pos: 19.5,-36.5
-      parent: 34
-      type: Transform
 - proto: AirlockTheatreLocked
   entities:
   - uid: 1021
@@ -56364,14 +56364,14 @@ entities:
       type: Transform
 - proto: LockerParamedicFilled
   entities:
-  - uid: 6235
+  - uid: 10750
     components:
-    - pos: 13.5,-38.5
+    - pos: 12.5,-38.5
       parent: 34
       type: Transform
-  - uid: 10750
+  - uid: 10775
     components:
-    - pos: 12.5,-38.5
+    - pos: 13.5,-38.5
       parent: 34
       type: Transform
 - proto: LockerQuarterMasterFilled