diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 0f721a0bda..3d7c371d28 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -72,10 +72,40 @@
       - id: ClothingMaskSterile
 
 - type: entity
+  parent: LockerWallMedical
   id: LockerWallMedicalDoctorFilled
   name: medical doctor's wall locker
   suffix: Filled
-  parent: ["LockerWallMedical", "LockerMedicalFilled"]
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandheldHealthAnalyzer
+        prob: 0.6
+      - id: ClothingHandsGlovesLatex
+      - id: ClothingHeadsetMedical
+     # - id: ClothingEyesHudMedical #Removed until working properly
+      - id: ClothingBeltMedical
+      - id: ClothingHeadHatSurgcapGreen
+        prob: 0.1
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapPurple
+        prob: 0.05
+        orGroup: Surgcaps
+      - id: ClothingHeadHatSurgcapBlue
+        prob: 0.90
+        orGroup: Surgcaps
+      - id: UniformScrubsColorBlue
+        prob: 0.5
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorGreen
+        prob: 0.1
+        orGroup: Surgshrubs
+      - id: UniformScrubsColorPurple
+        prob: 0.05
+        orGroup: Surgshrubs
+      - id: NitrousOxideTankFilled
+        prob: 0.3
+      - id: ClothingMaskSterile
 
 - type: entity
   id: LockerChemistryFilled
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 6b12337bf5..326572a3af 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -19,6 +19,14 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
   - type: MovedByPressure
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: Attach Label
+      ejectVerbText: Remove Label
+      whitelist:
+        components:
+        - Paper
+  - type: ItemSlots
   - type: DamageOnHighSpeedImpact
     damage:
       types:
@@ -42,6 +50,7 @@
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
   - type: Weldable
   - type: PlaceableSurface
     placeCentered: true