diff --git a/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
index fae43d82a2..3ef3cf5b2d 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Disposal.Unit.Components;
+using Content.Server.Disposal.Unit.Components;
 
 namespace Content.Server.Disposal.Tube.Components
 {
@@ -7,6 +7,8 @@ namespace Content.Server.Disposal.Tube.Components
     [ComponentReference(typeof(DisposalTubeComponent))]
     public sealed class DisposalBendComponent : DisposalTubeComponent
     {
+        public override string ContainerId => "DisposalBend";
+
         [DataField("sideDegrees")]
         private int _sideDegrees = -90;
 
diff --git a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
index dbc65ab25d..e6c3fcf8e2 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
@@ -13,6 +13,7 @@ namespace Content.Server.Disposal.Tube.Components
         [Dependency] private readonly IEntityManager _entMan = default!;
 
         private const string HolderPrototypeId = "DisposalHolder";
+        public override string ContainerId => "DisposalEntry";
 
         public bool TryInsert(DisposalUnitComponent from, IEnumerable<string>? tags = default)
         {
diff --git a/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
index 93c5d965fe..ba6276c028 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.Random;
 
@@ -10,6 +10,8 @@ namespace Content.Server.Disposal.Tube.Components
     [ComponentReference(typeof(DisposalTubeComponent))]
     public class DisposalJunctionComponent : DisposalTubeComponent
     {
+        public override string ContainerId => "DisposalJunction";
+
         [Dependency] private readonly IEntityManager _entMan = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
 
diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
index d3294693fd..550b5e94d6 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
@@ -14,6 +14,8 @@ namespace Content.Server.Disposal.Tube.Components
     [ComponentReference(typeof(DisposalTubeComponent))]
     public sealed class DisposalRouterComponent : DisposalJunctionComponent
     {
+        public override string ContainerId => "DisposalRouter";
+
         [Dependency] private readonly IEntityManager _entMan = default!;
 
         [ViewVariables]
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
index aab15f299a..bdef8a8b5d 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
@@ -15,6 +15,8 @@ namespace Content.Server.Disposal.Tube.Components
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
 
+        public override string ContainerId => "DisposalTagger";
+
         [ViewVariables(VVAccess.ReadWrite)]
         private string _tag = "";
 
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
index e0d2908929..984be69018 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Disposal.Unit.Components;
+using Content.Server.Disposal.Unit.Components;
 
 namespace Content.Server.Disposal.Tube.Components
 {
@@ -9,6 +9,8 @@ namespace Content.Server.Disposal.Tube.Components
     [ComponentReference(typeof(DisposalTubeComponent))]
     public class DisposalTransitComponent : DisposalTubeComponent
     {
+        public override string ContainerId => "DisposalTransit";
+
         protected override Direction[] ConnectableDirections()
         {
             var rotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).LocalRotation;
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
index 3692937930..5547157676 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Disposal.Tube.Components
 {
     public abstract class DisposalTubeComponent : Component, IDisposalTubeComponent
     {
-        public const string ContainerId = "disposal-tube";
+        public virtual string ContainerId => "DisposalTube";
 
         [Dependency] private readonly IEntityManager _entMan = default!;
 
diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index 493c705d2b..2840ddf3c3 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Disposal.Components
     [NetworkedComponent]
     public abstract class SharedDisposalUnitComponent : Component
     {
-        public const string ContainerId = "disposal-unit";
+        public const string ContainerId = "DisposalUnit";
 
         // TODO: Could maybe turn the contact off instead far more cheaply as farseer (though not box2d) had support for it?
         // Need to suss it out.
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 67bbf0d630..6578ee8f7b 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -52,8 +52,7 @@
   - type: CollideOnAnchor
   - type: ContainerContainer
     containers:
-      disposal-tube: !type:Container
-        ents: []
+      DisposalTube: !type:Container
 
 - type: entity
   id: DisposalHolder
@@ -61,6 +60,9 @@
   name: disposal holder
   components:
   - type: DisposalHolder
+  - type: ContainerContainer
+    containers:
+      DisposalHolder: !type:Container
 
 # Pipes
 
@@ -93,6 +95,9 @@
     - map: [ "pipe" ]
       state: conpipe-s
   - type: DisposalTransit
+  - type: ContainerContainer
+    containers:
+      DisposalTransit: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -116,6 +121,9 @@
     - map: [ "pipe" ]
       state: conpipe-tagger
   - type: DisposalTagger
+  - type: ContainerContainer
+    containers:
+      DisposalTagger: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -145,6 +153,9 @@
     - map: [ "pipe" ]
       state: conpipe-t
   - type: DisposalEntry
+  - type: ContainerContainer
+    containers:
+      DisposalEntry: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -179,6 +190,9 @@
     - 0
     - -90
     - 180
+  - type: ContainerContainer
+    containers:
+      DisposalRouter: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -221,6 +235,9 @@
     - 0
     - 90
     - 180
+  - type: ContainerContainer
+    containers:
+      DisposalRouter: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -255,6 +272,9 @@
     - 0
     - -90
     - 180
+  - type: ContainerContainer
+    containers:
+      DisposalJunction: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -291,6 +311,9 @@
     - 0
     - 90
     - 180
+  - type: ContainerContainer
+    containers:
+      DisposalJunction: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -324,6 +347,9 @@
     - 0
     - 90
     - -90
+  - type: ContainerContainer
+    containers:
+      DisposalJunction: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
@@ -354,6 +380,9 @@
     - map: [ "pipe" ]
       state: conpipe-c
   - type: DisposalBend
+  - type: ContainerContainer
+    containers:
+      DisposalBend: !type:Container
   - type: GenericVisualizer
     visuals:
       enum.DisposalTubeVisuals.VisualState:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 744cd5a4a2..b00409dd87 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -72,8 +72,7 @@
       type: DisposalUnitBoundUserInterface
   - type: ContainerContainer
     containers:
-      disposal-unit: !type:Container
-        ents: []
+      DisposalUnit: !type:Container
 
 - type: entity
   id: DisposalUnit