diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs
new file mode 100644
index 0000000000..e38d9f0b7b
--- /dev/null
+++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs
@@ -0,0 +1,35 @@
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Random;
+using Robust.Shared.IoC;
+
+namespace Content.Server.GameObjects.Components.Items.Storage.Fill
+{
+    [RegisterComponent]
+    internal sealed class MedkitFillComponent : Component, IMapInit
+    {
+        public override string Name => "MedkitFill";
+
+#pragma warning disable 649
+        [Dependency] private readonly IEntityManager _entityManager;
+#pragma warning restore 649
+
+        void IMapInit.MapInit()
+        {
+            var storage = Owner.GetComponent<IStorageComponent>();
+
+            void Spawn(string prototype)
+            {
+                storage.Insert(_entityManager.SpawnEntity(prototype));
+            }
+
+            Spawn("Brutepack");
+            Spawn("Brutepack");
+            Spawn("Brutepack");
+            Spawn("Ointment");
+            Spawn("Ointment");
+            Spawn("Ointment");
+        }
+    }
+}
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 62b310727a..7b60000d1a 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -1756,7 +1756,7 @@ entities:
         entities: []
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
-- type: Medkit
+- type: MedkitFilled
   uid: 147
   components:
   - grid: 0
@@ -1769,7 +1769,7 @@ entities:
       mask: 5
       bounds: -0.25,-0.25,0.25,0.25
     type: Collidable
-- type: Medkit
+- type: MedkitFilled
   uid: 148
   components:
   - grid: 0
@@ -8414,7 +8414,7 @@ entities:
       mask: 19
       bounds: -0.5,-0.25,0.5,0.25
     type: Collidable
-- type: Medkit
+- type: MedkitFilled
   uid: 718
   components:
   - grid: 0
@@ -8427,7 +8427,7 @@ entities:
       mask: 5
       bounds: -0.25,-0.25,0.25,0.25
     type: Collidable
-- type: Medkit
+- type: MedkitFilled
   uid: 719
   components:
   - grid: 0
diff --git a/Resources/Prototypes/Entities/items/medical.yml b/Resources/Prototypes/Entities/items/medical.yml
index fde973dc85..bcb79a9128 100644
--- a/Resources/Prototypes/Entities/items/medical.yml
+++ b/Resources/Prototypes/Entities/items/medical.yml
@@ -1,5 +1,6 @@
 - type: entity
-  name: Medkit
+  name: Emergency Medical Kit
+  description: An emergency medical kit for those serious boo-boos.
   parent: BaseItem
   id: Medkit
   components:
@@ -7,11 +8,16 @@
     texture: Objects/Medical/medkit_r.png
   - type: Icon
     texture: Objects/Medical/medkit_r.png
-  - type: Healing
-    heal: 100
-    damage: Brute
+  - type: Storage
+    Capacity: 60
   - type: Item
-    Size: 24
+    Size: 9999
+
+- type: entity
+  id: MedkitFilled
+  parent: Medkit
+  components:
+  - type: MedkitFill # 3 Ointment, 3 Roll of Gauze. TODO 1 Health Analyzer once it exists
 
 - type: entity
   name: Medical Stack
@@ -22,7 +28,6 @@
   - type: Item
   - type: Healing
 
-
 - type: entity
   name: Ointment
   description: Used to treat those nasty burns.
@@ -41,9 +46,8 @@
     count: 5
     stacktype: enum.StackType.Ointment
 
-
 - type: entity
-  name: Brutepack
+  name: Roll of Gauze
   description: Some sterile gauze to wrap around bloody stumps.
   parent: MedicalStack
   id: Brutepack