diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index b4ac113fdc..31da3c9ea0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -172,10 +172,14 @@
     size: 24
     sprite: Objects/Fun/Instruments/saxophone.rsi
   - type: Extractable
-    grindableSolution:
-      reagents:
-        - ReagentId: Saxoite
-          Quantity: 10
+    grindableSolutionName: sax
+  - type: SolutionContainerManager
+    solutions:
+      sax:
+        reagents:
+          - ReagentId: Saxoite
+            Quantity: 10
+
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index d8378ab4be..4d7c6f9fc1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -28,10 +28,13 @@
     sprite: Objects/Fun/toys.rsi
     state: plushie_h
   - type: Extractable
-    grindableSolution:
-      reagents:
-      - ReagentId: GroundBee
-        Quantity: 10
+    grindableSolutionName: bee
+  - type: SolutionContainerManager
+    solutions:
+      bee:
+        reagents:
+          - ReagentId: GroundBee
+            Quantity: 10
 
 - type: entity
   parent: BasePlushie