diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 48bed23bc9..a6add7f4b7 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -46,7 +46,6 @@
       amount: 2
     - id: NetworkConfigurator
     - id: Binoculars
-    - id: WeaponEnergyShotgun
 
 - type: entityTable
   id: FillLockerWardenHarduit
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml b/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml
new file mode 100644
index 0000000000..34d3287e03
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml
@@ -0,0 +1,36 @@
+# Weapons
+- type: entity
+  parent: MarkerBase
+  id: SpawnPointHeadOfSecurityWeapon
+  name: head of security weapon spawner
+  components:
+  - type: EntityTableSpawner
+    offset: 0.2
+    table: !type:AllSelector
+      children:
+      - id: WeaponSubMachineGunWt550
+      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolSubMachineGunTopMounted
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+      state: icon
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnPointWardenWeapon
+  name: warden weapon spawner
+  components:
+  - type: EntityTableSpawner
+    offset: 0.2
+    table: !type:AllSelector
+      children:
+      - id: WeaponEnergyShotgun
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+      state: icon