diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
index 865f68db815..befb96c7dcf 100644
--- a/Content.IntegrationTests/Tests/Round/JobTest.cs
+++ b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round;
 public sealed class JobTest
 {
     private static readonly ProtoId<JobPrototype> Passenger = "Contractor"; // Frontier: use job prototypes that exist
-    private static readonly ProtoId<JobPrototype> Engineer = "Pilot"; // Frontier
+    private static readonly ProtoId<JobPrototype> Engineer = "Prisoner"; // Frontier
     private static readonly ProtoId<JobPrototype> Captain = "StationRepresentative"; // Frontier
 
     private static string _map = "JobTestMap";
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index 64622172a9c..a685f27b714 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -15,7 +15,6 @@
   canBeAntag: false
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-prisoner
-  weight: 10 # Frontier
   displayWeight: 10 # Frontier
   special:
   - !type:AddImplantSpecial
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 1fc9b4b2e91..2b151e88215 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -12,7 +12,7 @@
   name: department-Civilian
   description: department-NFCivilian-description # Frontier
   color: "#9FED58"
-  weight: 0 # Frontier: -10<0 accounted for in jobs
+  weight: -10
   roles:
   # - Bartender # Frontier
   # - Botanist # Frontier
@@ -79,7 +79,7 @@
   - Sheriff  # Frontier
   - StationTrafficController # Frontier
   primary: false
-  weight: 2 # Frontier: 100<2 - accounted for in jobs
+  weight: 100
 
 - type: department
   id: Engineering
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml
index e7c7e1374cc..8b6876c9a08 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml
@@ -6,7 +6,6 @@
   startingGear: ContractorGear
   icon: "JobIconContractor"
   supervisors: job-supervisors-hire
-  weight: -1 # Prioritize station & department jobs
   displayWeight: 40 # Top
   accessGroups: # Frontier
   - GeneralAccess # Frontier
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml
index 7f433199fd7..47820530de6 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml
@@ -10,7 +10,7 @@
   canBeAntag: true
   icon: "JobIconMercenary"
   supervisors: job-supervisors-hire
-  weight: -1 # Prioritize station & department jobs
+  weight: 3 # Prioritize station & department jobs
   displayWeight: 20 # Second from the bottom
   setPreference: true
   access:
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml
index e65a9a10086..5b44c5ff5f6 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml
@@ -9,7 +9,7 @@
   startingGear: PilotGear
   icon: "JobIconPilot" 
   supervisors: job-supervisors-hire
-  weight: -1 # Prioritize station & department jobs
+  weight: 2 # Prioritize station & department jobs
   displayWeight: 30 # Second from the top
   accessGroups: # Frontier
   - GeneralAccess
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
index 9057f9c8c93..d431d2a6c87 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
@@ -3,7 +3,7 @@
   name: department-Frontier
   description: department-NF-description
   color: "#334E6D"
-  weight: 1 # accounted for in jobs
+  weight: 50 # accounted for in jobs
   roles:
   - StationRepresentative
   - StationTrafficController
@@ -17,7 +17,7 @@
   name: department-Antag
   description: department-NFAntag-description
   color: "#DE3A3A"
-  weight: -1 # accounted for in jobs
+  weight: -20 # accounted for in jobs
   roles:
   - PirateCaptain
   - PirateFirstMate