diff --git a/Resources/Prototypes/Corvax/Body/Organs/vulpkanin.yml b/Resources/Prototypes/Corvax/Body/Organs/vulpkanin.yml
index 90eb4e6deaa..f1e64d5d839 100644
--- a/Resources/Prototypes/Corvax/Body/Organs/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Body/Organs/vulpkanin.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: OrganVulpkaninStomach
   parent: OrganAnimalStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stomach
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml
index b95e950a1b8..dd3b7ecd60c 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetCBURNLeader
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: cburn commander helmet
   description: A pressure resistant and fireproof hood worn by special cleanup units.
   components:
diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/framestationrandom.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/framestationrandom.yml
index f52d7194337..299da5963c9 100644
--- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/framestationrandom.yml
+++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/Random/framestationrandom.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: FrameStationRandomSpawner
   parent: MarkerBase
-  noSpawn: true # Used only for CorvaxFrame
+  categories: [ HideSpawnMenu, Spawner ] # Used only for CorvaxFrame
   components:
     - type: RandomSpawner
       rarePrototypes:
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
index 5f81271b4c1..6d6e2ef06f1 100644
--- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
@@ -66,7 +66,7 @@
   name: Urist McHands
   parent: MobHumanDummy
   id: MobVulpkaninDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: A dummy vulpkanin meant to be used in character setup.
   components:
   - type: HumanoidAppearance
diff --git a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
index f087f2d5856..550fc2c5bd5 100644
--- a/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
@@ -17,7 +17,7 @@
     - BaseStationSiliconLawCrewsimov
     - BaseStationAllEventsEligible
     - BaseStationNanotrasen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
     - type: GridSpawn
diff --git a/Resources/Prototypes/Corvax/Objectives/traitorObjectives.yml b/Resources/Prototypes/Corvax/Objectives/traitorObjectives.yml
index a619e7b6d01..54ac0a1c229 100644
--- a/Resources/Prototypes/Corvax/Objectives/traitorObjectives.yml
+++ b/Resources/Prototypes/Corvax/Objectives/traitorObjectives.yml
@@ -1,5 +1,4 @@
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: HijackShuttleObjective
   name: Hijack emergency shuttle
@@ -13,7 +12,6 @@
     - type: HijackShuttleCondition
 
 - type: entity
-  noSpawn: true
   parent: BaseCaptainObjective
   id: NukeDiskStealObjective
   components:
@@ -36,4 +34,4 @@
   - type: NotCommandRequirement
   - type: StealCondition
     stealGroup: NukeDisk
-    owner: objective-condition-steal-station
\ No newline at end of file
+    owner: objective-condition-steal-station
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index a5381c75aa1..b126a16c220 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -282,7 +282,6 @@
 
 # Corvax-MRP-Start: Make nuke disk objective separate
 # - type: entity
-  # noSpawn: true
   # parent: BaseCaptainObjective
   # id: NukeDiskStealObjective
   # components:
@@ -295,4 +294,4 @@
   # - type: StealCondition
     # stealGroup: NukeDisk
     # owner: objective-condition-steal-station
-# Corvax-MRP-End
\ No newline at end of file
+# Corvax-MRP-End