diff --git a/Resources/Prototypes/_NF/Shipyard/ghost.yml b/Resources/Prototypes/_NF/Shipyard/ghost.yml
new file mode 100644
index 00000000000..703c4838354
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/ghost.yml
@@ -0,0 +1,36 @@
+# Author Info
+# GitHub: ThatOneGoblin25
+# Discord: thedaarkgoblin
+
+# Maintainer Info
+# GitHub: ThatOneGoblin25
+# Discord: thedaarkgoblin
+
+# Shuttle Notes:
+# Intended for any science mothership console.
+- type: vessel
+  id: Ghost
+  name: NX Ghost
+  description: A small, experimental design for Xenoarcheology. Completely solar-powered, this vessel is intended for the safe and meticulous study of troublesome artifacts.
+  price: 18500
+  category: Small
+  group: None
+  shuttlePath: /Maps/_NF/Shuttles/ghost.yml
+
+- type: gameMap
+  id: Ghost
+  mapName: 'NX Ghost'
+  mapPath: /Maps/_NF/Shuttles/ghost.yml
+  minPlayers: 0
+  stations:
+    Ghost:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Ghost {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs: {}
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml
index f1378ee259b..12d9a2a3611 100644
--- a/Resources/Prototypes/_NF/Shipyard/spectre.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml
@@ -1,15 +1,25 @@
+# Author Info
+# GitHub: Wolfhauler
+# Discord: wolfhauler
+
+# Maintainer Info
+# GitHub: ThatOneGoblin25 
+# Discord: thedaarkgoblin
+
+# Shuttle Notes:
+#
 - type: vessel
   id: Spectre
-  name: NSS Spectre
-  description: A large research mothership designed to be flown nexto a small fleet of other ships including salvage and food services.
-  price: 195000
+  name: NR Spectre
+  description: A large, attractive but dated vessel with a pure focus on research and development. It is capable of generating anomalies.
+  price: 185000
   category: Large
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/spectre.yml
 
 - type: gameMap
   id: Spectre
-  mapName: 'NSSSpectre'
+  mapName: 'NR Spectre'
   mapPath: /Maps/_NF/Shuttles/spectre.yml
   minPlayers: 0
   stations:
@@ -24,7 +34,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Scientist: [ 0, 0 ]
             Bartender: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
             ResearchDirector: [ 0, 0 ]
+            Scientist: [ 0, 0 ]
+            StationEngineer: [ 0, 0 ]