diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 1f0a7e8cad..9a2be187b4 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -61298,11 +61298,6 @@ entities:
     - pos: 30.398613,6.824299
       parent: 2
       type: Transform
-  - uid: 8696
-    components:
-    - pos: 30.500324,29.913876
-      parent: 2
-      type: Transform
 - proto: LampBanana
   entities:
   - uid: 9601
@@ -61398,6 +61393,13 @@ entities:
     - pos: 37.37405,43.99462
       parent: 2
       type: Transform
+- proto: LampInterrogator
+  entities:
+  - uid: 8436
+    components:
+    - pos: 30.526884,29.884686
+      parent: 2
+      type: Transform
 - proto: LargeBeaker
   entities:
   - uid: 5323
@@ -71338,14 +71340,14 @@ entities:
       type: Transform
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 8436
-    components:
-    - pos: 38.5,19.5
-      parent: 2
-      type: Transform
   - uid: 8437
     components:
-    - pos: 39.5,19.5
+    - pos: 34.5,27.5
+      parent: 2
+      type: Transform
+  - uid: 8696
+    components:
+    - pos: 34.5,26.5
       parent: 2
       type: Transform
 - proto: SpawnPointSecurityOfficer
@@ -71365,6 +71367,34 @@ entities:
     - pos: 37.5,18.5
       parent: 2
       type: Transform
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 12852
+    components:
+    - pos: 24.5,-32.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 12849
+    components:
+    - pos: 35.5,27.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 12851
+    components:
+    - pos: 73.5,7.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 12850
+    components:
+    - pos: 55.5,23.5
+      parent: 2
+      type: Transform
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 12792
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
index f0af3b7288..d11b8590f1 100644
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -3,7 +3,7 @@
   mapName: 'Packed'
   mapPath: /Maps/packed.yml
   minPlayers: 5
-  maxPlayers: 50
+  maxPlayers: 40
   stations:
     Packed:
       stationProto: StandardNanotrasenStation
@@ -17,37 +17,48 @@
           overflowJobs:
             - Passenger
           availableJobs:
-            CargoTechnician: [ 2, 3 ]
-            Passenger: [ -1, -1 ]
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
-            Clown: [ 1, 1 ]
             Janitor: [ 1, 2 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 3, 3 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 3 ]
-            Chemist: [ 2, 2 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 3 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
             Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 3, 3 ]
+            TechnicalAssistant: [ 3, 3 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            MedicalDoctor: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ]
+            Paramedic: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 3, 3 ]
+            ResearchAssistant: [ 2, 2 ] 
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 2, 2 ]
+            Lawyer: [ 1, 1 ]
+            #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
+            CargoTechnician: [ 2, 2 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
-            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2 ]
-            Paramedic: [ 1, 1 ]
\ No newline at end of file