diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index 6cc1fc7981..5bdefb8bfc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -67,7 +67,7 @@
 - type: entity
   parent: TelecomServer
   id: TelecomServerFilled
-  suffix: Filled
+  suffix: Filled All
   components:
   - type: ContainerFill
     containers:
@@ -80,3 +80,83 @@
       - EncryptionKeySecurity
       - EncryptionKeyService
       - EncryptionKeyCommand
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCommon
+  suffix: Common
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCargo
+  suffix: Cargo
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCargo
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledEngineering
+  suffix: Engineering
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyEngineering
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledMedical
+  suffix: Medical
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyMedical
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledScience
+  suffix: Science
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyScience
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledSecurity
+  suffix: Security
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySecurity
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledService
+  suffix: Service
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyService
+
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledCommand
+  suffix: Command
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommand