diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml
index 1d493a7e4d..eebdac31b5 100644
--- a/Resources/Maps/packedstation.yml
+++ b/Resources/Maps/packedstation.yml
@@ -64815,6 +64815,48 @@ entities:
   - pos: 13.5,-12.5
     parent: 0
     type: Transform
+- uid: 6804
+  type: AirlockArmoryLocked
+  components:
+  - name: Armory
+    type: MetaData
+  - pos: 40.5,25.5
+    parent: 0
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 6805
+  type: AirlockArmoryLocked
+  components:
+  - name: Armory
+    type: MetaData
+  - pos: 39.5,25.5
+    parent: 0
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 6806
+  type: LockerWardenFilled
+  components:
+  - pos: 38.5,24.5
+    parent: 0
+    type: Transform
+  - isPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 6807
+  type: SpawnPointWarden
+  components:
+  - pos: 29.5,25.5
+    parent: 0
+    type: Transform
 - uid: 6808
   type: WallReinforced
   components:
@@ -109273,26 +109315,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-- uid: 11202
-  type: AirlockVaultLocked
-  components:
-  - pos: 39.5,25.5
-    parent: 0
-    type: Transform
-  - containers:
-      board: !type:Container
-        ents: []
-    type: ContainerContainer
-- uid: 11203
-  type: AirlockVaultLocked
-  components:
-  - pos: 40.5,25.5
-    parent: 0
-    type: Transform
-  - containers:
-      board: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 11204
   type: PowerCellMediumStandard
   components:
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 4c8f7dabda..5267c40d53 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -6095,7 +6095,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 575
-  type: AirlockVaultLocked
+  type: AirlockArmoryLocked
   components:
   - name: Armory
     type: MetaData
@@ -35308,6 +35308,12 @@ entities:
     type: Physics
   - color: '#7F007FFF'
     type: AtmosPipeColor
+- uid: 3170
+  type: SpawnPointWarden
+  components:
+  - pos: -5.5,14.5
+    parent: 853
+    type: Transform
 - uid: 3171
   type: CableApcExtension
   components:
@@ -35601,6 +35607,18 @@ entities:
     type: Sprite
   - canCollide: False
     type: Physics
+- uid: 3199
+  type: LockerWardenFilled
+  components:
+  - pos: -11.5,13.5
+    parent: 853
+    type: Transform
+  - isPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3200
   type: CableApcExtension
   components:
diff --git a/Resources/Prototypes/AccessLevels/security.yml b/Resources/Prototypes/AccessLevels/security.yml
index 4302263634..b72a4e45bf 100644
--- a/Resources/Prototypes/AccessLevels/security.yml
+++ b/Resources/Prototypes/AccessLevels/security.yml
@@ -10,3 +10,6 @@
 
 #- type: accessLevel
 #  id: Detective
+
+- type: accessLevel
+  id: Armory
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 1008a00b24..27858f8943 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -284,17 +284,17 @@
       - state: green
       - state: hos
 
-# - type: entity
-#   id: SpawnPointWarden
-#   parent: SpawnPointJobBase
-#   name: warden
-#   components:
-#   - type: SpawnPoint
-#     job_id: Warden
-#   - type: Sprite
-#     layers:
-#       - state: green
-#       - state: warden
+- type: entity
+  id: SpawnPointWarden
+  parent: SpawnPointJobBase
+  name: warden
+  components:
+  - type: SpawnPoint
+    job_id: Warden
+  - type: Sprite
+    layers:
+      - state: green
+      - state: warden
 
 - type: entity
   id: SpawnPointSecurityOfficer
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index a30d3942db..5a7f6a420e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -54,7 +54,7 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
-    
+
 - type: entity
   parent: AirlockChemistry
   id: AirlockChemistryLocked
@@ -95,6 +95,14 @@
   - type: AccessReader
     access: [["Security", "Command"]]
 
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockArmoryLocked
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
 - type: entity
   parent: AirlockCommand
   id: AirlockEVALocked
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index cc36613a58..4bd85c9a1d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -251,7 +251,7 @@
     - type: StorageVisualizer
       state: warden
   - type: AccessReader
-    access: [["Security"]] # TODO access [["Brig"]]
+    access: [["Security", "Armory"]] # TODO access [["Brig"]]
 
 # Security Officer
 - type: entity
diff --git a/Resources/Prototypes/Maps/game.yml b/Resources/Prototypes/Maps/game.yml
index ac8bcc66bc..70fc87385d 100644
--- a/Resources/Prototypes/Maps/game.yml
+++ b/Resources/Prototypes/Maps/game.yml
@@ -64,6 +64,7 @@
     HeadOfSecurity: [ 1, 1 ]
     SecurityOfficer: [ 2, 3 ]
     Chaplain: [ 1, 1 ]
+    Warden: [ 1, 1 ]
 
 - type: gameMap
   id: knightship
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index da9d0f6f78..a16e51a240 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -19,6 +19,7 @@
   - HeadOfPersonnel
   - Command
   - Security
+  - Armory
  # - Brig
   - Engineering
   - Medical
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index b8aeaeb579..21f4d37eb7 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -14,6 +14,7 @@
   - Command
 #  - Brig
   - Security
+  - Armory
   - Maintenance
   - Service
 
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 4e870d14ee..b191277408 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -6,9 +6,10 @@
   - Security
   icon: "Warden"
   supervisors: "the head of security"
+  canBeAntag: false
   access:
   - Security
- # - Brig
+  - Armory
   - Maintenance
   - Service