diff --git a/Resources/Maps/Salvage/hauling-shuttle.yml b/Resources/Maps/Salvage/hauling-shuttle.yml
index d90c3c6b42e..89e09bb1067 100644
--- a/Resources/Maps/Salvage/hauling-shuttle.yml
+++ b/Resources/Maps/Salvage/hauling-shuttle.yml
@@ -666,13 +666,6 @@ entities:
     - type: Transform
       pos: 3.5,-5.5
       parent: 1
-- proto: CratePartsT3
-  entities:
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
 - proto: CratePlasma
   entities:
   - uid: 191
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 92a3eabe08a..11c5dc30f6d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -33,7 +33,7 @@
   - type: EntityTableContainerFill
     containers:
       entity_storage:
-        id: AmeControllerUnanchored
+        id: AmeControllerFlatpack
 
 # Singularity
 
@@ -116,17 +116,6 @@
 #      entity_storage:
 #        id: Singularity
 
-- type: entity
-  parent: CrateEngineering
-  id: CrateEngineeringGenerator
-  name:  generator crate
-  suffix: DEBUG
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage:
-        id: DebugGenerator # TODO change to flatpack
-
 - type: entity
   parent: CrateEngineering
   id: CrateEngineeringSolar
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 8e97d530c5c..3a4af8a045e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -207,42 +207,3 @@
     containers:
       entity_storage:
         id: ClothingNeckCloakSalvagerSupreme
-
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT3
-  name: tier 3 parts crate
-  description: Contains 5 random tier 3 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  #- type: EntityTableContainerFill
-  #  containers:
-  #    entity_storage: !type:AllSelector
-  #      id: SalvagePartsT3Spawner
-  #      amount: 5
-
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT3T4
-  name: tier 3/4 parts crate
-  description: Contains 5 random tier 3 or 4 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  #- type: EntityTableContainerFill
-  #  containers:
-  #    entity_storage:
-  #      id: SalvagePartsT3T4Spawner
-  #      amount: 5
-
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT4
-  name: tier 4 parts crate
-  description: Contains 5 random tier 4 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  #- type: EntityTableContainerFill
-  #  containers:
-  #    entity_storage:
-  #      id: SalvagePartsT4Spawner
-  #      amount: 5
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 8034dd0c667..82c3cc7131c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -50,6 +50,26 @@
   - type: StaticPrice
     price: 75
 
+- type: entity
+  parent: BaseFlatpack
+  id: AmeControllerFlatpack
+  name: AME controller flatpack
+  description: A flatpack used for constructing the terminal that controls the antimatter engine.
+  components:
+  - type: Sprite
+    layers:
+    - state: ame-part
+    - state: overlay
+      color: "#EFB341"
+  - type: Flatpack
+    entity: AmeController
+  - type: StaticPrice
+    price: 1000
+  - type: GuideHelp
+    guides:
+    - AME
+    - Power
+
 - type: entity
   parent: BaseFlatpack
   id: AmePartFlatpack
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index 984ccc26d29..d284f2804df 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -27,8 +27,6 @@
     IngotSilver: 1.0
     SheetPlasma: 1.0
     SheetUranium: 1.0
-    CratePartsT3: 1.0
-    CratePartsT3T4: 0.5
     TechnologyDiskRare: 0.5
     # cloning boards
     CloningPodMachineCircuitboard: 0.5
@@ -57,7 +55,6 @@
     # rare machinery
     AmmoTechFabCircuitboard: 1.0
     ResearchAndDevelopmentServerMachineCircuitboard: 1.0
-    CratePartsT4: 1.0
     PowerCellAntiqueProto: 0.25
     # basic weapons
     CrateArmorySMG: 1.0
diff --git a/Resources/migration.yml b/Resources/migration.yml
index a31ec9ebb05..367afbe92f3 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -831,3 +831,8 @@ CrateVendingMachineRestockDonutFilled: VendingMachineRestockDonut
 # 2026-03-28
 # The great solutions YAML nuke
 FoodMeatSnail: MobSnail
+
+# 2026-04-25
+CratePartsT3: null
+CratePartsT3T4: null
+CratePartsT4: null