diff --git a/Resources/Prototypes/Entities/Objects/Weapons/mech.yml b/Resources/Prototypes/Entities/Objects/Weapons/mech.yml
index bc7b46e9c5f4b4..accf2e99b5eddd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/mech.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/mech.yml
@@ -68,6 +68,10 @@
   - type: Appearance
   - type: MechEquipment
   - type: UIFragment
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot 
 
 - type: entity
   name: SRM-6 Missile Launcher
@@ -93,6 +97,10 @@
     proto: CartridgeRocket
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Mounted Disabler PBT "Enforcer"
@@ -157,6 +165,10 @@
     - FullAuto
   - type: MechEquipment
   - type: UIFragment
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Carbine FNX-99 "Aid"
@@ -209,6 +221,10 @@
   - type: Appearance
   - type: MechEquipment
   - type: UIFragment
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot 
 
 - type: entity
   name: Magazine for FNX-99 Carbine
@@ -245,6 +261,10 @@
   - type: Appearance
   - type: MechEquipment
   - type: UIFragment
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Incinerator Cannon ZFI
@@ -331,6 +351,10 @@
     proto: GrenadeFlash
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Mounted fire extinguisher.
@@ -398,6 +422,10 @@
     proto: GrenadeFrag
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: AC 2 "Ultra"
@@ -429,27 +457,13 @@
     magState: mag
     steps: 4
     zeroVisible: true
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineLightRifleBoxAS29000
-        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineLightRifleBox
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeLightRifle
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeLightRifle
   - type: Appearance
   - type: MechEquipment
   - type: UIFragment
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot 
 
 - type: entity
   name: Magazine for AC 2 "Ultra".
@@ -484,6 +498,10 @@
     proto: Mousetrap
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Banana Mortar
@@ -510,6 +528,10 @@
     proto: TrashBananaPeelOneTime
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Disposable Banana Peel
@@ -644,6 +666,10 @@
     proto: LandMineExplosiveBanana
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
 
 - type: entity
   name: Banana Peel Mine