diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 3972dd11a11..0e3ee42a601 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -233,8 +233,6 @@
   - type: Tag
     tags:
     - CannotSuicide
-  - type: ReplacementAccent
-    accent: genericAggressive
 
 - type: entity
   name: Ravager
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index eb57e32ec2a..57c4ab0309a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -158,3 +158,4 @@
     spawned:
     - id: FoodMeatDragon
       amount: 1
+  - type: SalvageMobRestrictions
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
index 74757697f20..67363f9aaca 100644
--- a/Resources/Prototypes/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -32,7 +32,7 @@
   configs:
     DefenseStructure: XenoWardingTower
     Mining: Xenos
-    Megafauna: MobXenoQueen
+    Megafauna: MobXenoQueenDungeon
 
 - type: salvageFaction
   id: Carps
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index e13a9bad96d..5afe73d68d0 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -8,8 +8,8 @@
     CrateMaterialSteel: 1.0
     # things the station might want
     CrateEngineeringAMEJar: 0.25
-    CrateFoodPizzaLarge: 0.25
-    CrateFoodSoftdrinks: 0.25
+    #CrateFoodPizzaLarge: 0.25
+    #CrateFoodSoftdrinks: 0.25
     CrateFunATV: 0.25
     CrateFunInstrumentsVariety: 0.25
     CrateSalvageEquipment: 0.25
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml
new file mode 100644
index 00000000000..89a1482b633
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml
@@ -0,0 +1,11 @@
+- type: entity
+  name: Queen
+  parent: MobXenoQueen
+  id: MobXenoQueenDungeon
+  components:
+  - type: Tag
+    tags:
+    - CannotSuicide
+  - type: SalvageMobRestrictions
+  - type: ReplacementAccent
+    accent: xeno