diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index 93ef0795af3..85a4910afda 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -7046,18 +7046,6 @@ entities:
     - type: Transform
       pos: 7.4719925,36.539555
       parent: 588
-- proto: NFClosetBombFilled
-  entities:
-  - uid: 1014
-    components:
-    - type: Transform
-      pos: 12.5,27.5
-      parent: 588
-  - uid: 1026
-    components:
-    - type: Transform
-      pos: 16.5,27.5
-      parent: 588
 - proto: ClosetWallMaintenanceFilledRandom
   entities:
   - uid: 499
@@ -8208,6 +8196,14 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 588
+- proto: GrilleBroken
+  entities:
+  - uid: 1302
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,39.5
+      parent: 588
 - proto: GrilleDungeon
   entities:
   - uid: 209
@@ -8287,14 +8283,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: GrilleBroken
-  entities:
-  - uid: 1302
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,39.5
-      parent: 588
 - proto: HighSecArmoryLocked
   entities:
   - uid: 1597
@@ -8517,18 +8505,6 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 588
-- proto: NFLockerSecurityFilled
-  entities:
-  - uid: 416
-    components:
-    - type: Transform
-      pos: 20.5,6.5
-      parent: 588
-  - uid: 1011
-    components:
-    - type: Transform
-      pos: 12.5,28.5
-      parent: 588
 - proto: LockerSyndicatePersonal
   entities:
   - uid: 605
@@ -8618,6 +8594,30 @@ entities:
     - type: Transform
       pos: 28.5,25.5
       parent: 588
+- proto: NFClosetBombFilled
+  entities:
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 588
+  - uid: 1026
+    components:
+    - type: Transform
+      pos: 16.5,27.5
+      parent: 588
+- proto: NFLockerSecurityFilled
+  entities:
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 20.5,6.5
+      parent: 588
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: 12.5,28.5
+      parent: 588
 - proto: OperatingTable
   entities:
   - uid: 1389
@@ -12808,24 +12808,13 @@ entities:
     - type: Transform
       pos: 16.5,24.5
       parent: 588
-- proto: WindoorSecureSecurityLockedDungeon
+- proto: WindoorSecureBrigLockedDungeon
   entities:
-  - uid: 696
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,19.5
-      parent: 588
-  - uid: 697
-    components:
-    - type: Transform
-      pos: 12.5,21.5
-      parent: 588
-  - uid: 1073
+  - uid: 339
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,25.5
+      rot: 1.5707963267948966 rad
+      pos: 29.5,2.5
       parent: 588
 - proto: WindoorSecureDungeon
   entities:
@@ -12841,14 +12830,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,47.5
       parent: 588
-- proto: WindoorSecureBrigLockedDungeon
-  entities:
-  - uid: 339
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,2.5
-      parent: 588
 - proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1569
@@ -12896,6 +12877,17 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 588
+  - uid: 696
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,19.5
+      parent: 588
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 12.5,21.5
+      parent: 588
   - uid: 698
     components:
     - type: Transform
@@ -12913,6 +12905,12 @@ entities:
     - type: Transform
       pos: 21.5,27.5
       parent: 588
+  - uid: 1073
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,25.5
+      parent: 588
 - proto: WindowDirectionalDungeon
   entities:
   - uid: 480