diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml
index 07195a21ff9..967f443c53d 100644
--- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml
+++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml
@@ -5,59 +5,55 @@
   equipment:
     id: SurgeonPDA
 
-# Clothing
-
-- type: loadoutGroup
-  id: SurgeonHead
-  name: loadout-group-surgeon-head
-  loadouts:
-  - BlueSurgeryCap
-  - GreenSurgeryCap
-  - PurpleSurgeryCap
-
-- type: loadoutGroup
-  id: SurgeonScrubs
-  name: loadout-group-surgeon-scrubs
-  loadouts:
-  - MedicalBlueScrubs
-  - MedicalGreenScrubs
-  - MedicalPurpleScrubs
-
-- type: loadoutGroup
-  id: SurgeonPDA
-  name: loadout-group-surgeon-id
-  loadouts:
-  - SurgeonPDA
-
-- type: loadoutGroup
-  id: SurgeonGloves
-  name: loadout-group-surgeon-gloves
-  loadouts:
-  - LatexGloves
-  - NitrileGloves
-
-- type: loadoutGroup
-  id: SurgeonMask
-  name: loadout-group-surgeon-mask
-  loadouts:
-  - SterileMask
-
-# Loadout
-
-- type: roleLoadout
-  id: JobSurgeon
-  groups:
-  - GroupTankHarness
-  - SurgeonHead
-  - MedicalDoctorNeck
-  - SurgeonMask
-  - SurgeonScrubs
-  - SurgeonGloves
-  - MedicalBackpack
-  - MedicalDoctorOuterClothing
-  - MedicalShoes
-  - SurgeonPDA
-  - Glasses
-  - SurvivalMedical
-  - Trinkets
-  - GroupSpeciesBreathToolMedical
+# Head
+- type: loadout
+  id: BlackSurgeryCap
+  equipment:
+    head: ClothingHeadHatSurgcapBlack
+
+- type: loadout
+  id: CyanSurgeryCap
+  equipment:
+    head: ClothingHeadHatSurgcapCyan
+
+- type: loadout
+  id: PinkSurgeryCap
+  equipment:
+    head: ClothingHeadHatSurgcapPink
+
+- type: loadout
+  id: WhiteSurgeryCap
+  equipment:
+    head: ClothingHeadHatSurgcapWhite
+
+- type: loadout
+  id: RainbowSurgeryCap
+  equipment:
+    head: ClothingHeadHatSurgcapRainbow
+
+# Jumpsuit
+- type: loadout
+  id: MedicalBlackScrubs
+  equipment:
+    jumpsuit: UniformScrubsColorBlack
+
+- type: loadout
+  id: MedicalCyanScrubs
+  equipment:
+    jumpsuit: UniformScrubsColorCyan
+
+- type: loadout
+  id: MedicalPinkScrubs
+  equipment:
+    jumpsuit: UniformScrubsColorPink
+
+- type: loadout
+  id: MedicalWhiteScrubs
+  equipment:
+    jumpsuit: UniformScrubsColorWhite
+
+- type: loadout
+  id: MedicalRainbowScrubs
+  equipment:
+    jumpsuit: UniformScrubsColorRainbow
+
diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
index 7df19865851..d873d4df00c 100644
--- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
@@ -461,6 +461,52 @@
   - ChemistWinterBoots
   - ChemistShoes
 
+## Surgeon
+- type: loadoutGroup
+  id: SurgeonHead
+  name: loadout-group-surgeon-head
+  loadouts:
+  - BlueSurgeryCap
+  - GreenSurgeryCap
+  - PurpleSurgeryCap
+  - BlackSurgeryCap
+  - CyanSurgeryCap
+  - PinkSurgeryCap
+  - WhiteSurgeryCap
+  - RainbowSurgeryCap
+
+- type: loadoutGroup
+  id: SurgeonScrubs
+  name: loadout-group-surgeon-scrubs
+  loadouts:
+  - MedicalBlueScrubs
+  - MedicalGreenScrubs
+  - MedicalPurpleScrubs
+  - MedicalBlackScrubs
+  - MedicalCyanScrubs
+  - MedicalPinkScrubs
+  - MedicalWhiteScrubs
+  - MedicalRainbowScrubs
+
+- type: loadoutGroup
+  id: SurgeonMask
+  name: loadout-group-surgeon-mask
+  loadouts:
+  - SterileMask
+
+- type: loadoutGroup
+  id: SurgeonGloves
+  name: loadout-group-surgeon-gloves
+  loadouts:
+  - LatexGloves
+  - NitrileGloves
+
+- type: loadoutGroup
+  id: SurgeonPDA
+  name: loadout-group-surgeon-id
+  loadouts:
+  - SurgeonPDA
+
 # Justice
 ## Chief Justice
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
index 488f4977ad9..3f96b614927 100644
--- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
@@ -45,6 +45,25 @@
   - SecurityFirearm
   - SecurityFirearmAmmo
 
+# Medical
+- type: roleLoadout
+  id: JobSurgeon
+  groups:
+  - GroupTankHarness
+  - SurgeonHead
+  - MedicalDoctorNeck
+  - SurgeonMask
+  - SurgeonScrubs
+  - SurgeonGloves
+  - MedicalBackpack
+  - MedicalDoctorOuterClothing
+  - MedicalShoes
+  - SurgeonPDA
+  - Glasses
+  - SurvivalMedical
+  - Trinkets
+  - GroupSpeciesBreathToolMedical
+
 # Justice
 - type: roleLoadout
   id: JobChiefJustice