diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index 55d9b5aec76..fc9f2902ad0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -1,3 +1,4 @@
+# Delta V specific roles
 - type: entity
   parent: AirlockScience
   id: AirlockMantisLocked
@@ -37,3 +38,221 @@
   components:
     - type: GridFill
       path: /Maps/Shuttles/DeltaV/sub_escape_pod.yml
+
+- type: entity
+  parent: Airlock
+  id: AirlockBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalSalvageLocked
+  suffix: External, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedical
+  id: AirlockPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+# Glass Airlocks
+- type: entity
+  parent: AirlockGlass
+  id: AirlockBoxerGlassLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockClownGlassLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMimeGlassLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMusicianGlassLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockReporterGlassLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockLibraryGlassLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockZookeeperGlassLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassSalvageLocked
+  suffix: External, Glass, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockPsychologistGlassLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+# Maintenance Hatches
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintSecurityLawyerLocked
+  suffix: Security/Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"], ["Lawyer"]]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 82cdcde7c05..51f121c64ff 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -374,80 +374,6 @@
   - type: AccessReader
     access: [["External"]]
 
-#Delta V: Add Airlocks
-- type: entity
-  parent: Airlock
-  id: AirlockBoxerLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockClownLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockMimeLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockMusicianLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockReporterLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockLibraryLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockZookeeperLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockExternal
-  id: AirlockExternalSalvageLocked
-  suffix: External, Salvage, Locked
-  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-
-- type: entity
-  parent: AirlockMedical
-  id: AirlockPsychologistLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-#End of Delta V
-
 # Glass Airlocks
 - type: entity
   parent: AirlockGlass
@@ -788,80 +714,6 @@
   - type: AccessReader
     access: [["NuclearOperative"]]
 
-#Delta V: Add Airlocks
-- type: entity
-  parent: AirlockGlass
-  id: AirlockBoxerGlassLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockClownGlassLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockMimeGlassLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockMusicianGlassLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockReporterGlassLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockLibraryGlassLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockZookeeperGlassLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockExternalGlass
-  id: AirlockExternalGlassSalvageLocked
-  suffix: External, Glass, Salvage, Locked
-  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-
-- type: entity
-  parent: AirlockMedicalGlass
-  id: AirlockPsychologistGlassLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-#End of Delta V
-
 # Maintenance Hatches
 - type: entity
   parent: AirlockMaint
@@ -1103,80 +955,6 @@
   - type: AccessReader
     access: [["Armory"]]
 
-#Delta V: Add Airlocks
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintBoxerLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintClownLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintMimeLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintMusicianLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintReporterLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintLibraryLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintZookeeperLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintPsychologistLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintSecurityLawyerLocked
-  suffix: Security/Lawyer, Locked
-  components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-#End of Delta V
-
 - type: entity
   parent: AirlockSyndicate
   id: AirlockSyndicateLocked