diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
index fb0895f62cb..70d4b958258 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -3,21 +3,15 @@
   id: WindoorMailLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]] # Frontier - Service<Mail
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMailCarrier ] # Frontier - Service<Mail
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureMailLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]] # Frontier - Service<Mail
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorSecureParamedicLocked
-  suffix: Paramedic, Locked
-  components:
-  - type: AccessReader
-    access: [["Paramedic"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMailCarrier ] # Frontier - Service<Mail
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
index 73781b76250..3857ecade42 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
@@ -6,29 +6,33 @@
   id: WindoorSecureMercenaryLocked
   suffix: Mercenary, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"], ["Mercenary"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureFrontierLocked
   suffix: Frontier, Locked
   components:
-  - type: AccessReader
-    access: [["Frontier"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontier ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureFrontierCommandLocked
   suffix: Frontier Command, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"], ["HeadOfPersonnel"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontierCommand ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureHeadOfSecurityLocked
   suffix: Sheriff, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
diff --git a/Resources/migration.yml b/Resources/migration.yml
index b50c5992ad0..8bc30012c98 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -20,7 +20,8 @@ WindoorSecurityLocked: WindoorSecureSecurityLocked
 WindoorScienceLocked: WindoorSecureScienceLocked
 WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked
 WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked
-WindoorParamedicLocked: WindoorSecureParamedicLocked
+WindoorParamedicLocked: WindoorSecureMedicalLocked
+WindoorSecureParamedicLocked: WindoorSecureMedicalLocked
 
 # 2023-07-03
 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic