diff --git a/Content.Server/_Sunrise/Shuttles/CodeEquipmentComponent.cs b/Content.Server/_Sunrise/Shuttles/CodeEquipmentComponent.cs
index d7fe6d7f45..bff68cab9f 100644
--- a/Content.Server/_Sunrise/Shuttles/CodeEquipmentComponent.cs
+++ b/Content.Server/_Sunrise/Shuttles/CodeEquipmentComponent.cs
@@ -7,12 +7,12 @@ public sealed partial class CodeEquipmentComponent : Component
 {
     public List<EntityUid> Shuttles = [];
 
-    [DataField("shuttlePath")]
-    public ResPath ShuttlePath = new("Maps/_Sunrise/Shuttles/gamma_armory.yml");
+    [DataField(required: true)]
+    public ResPath ShuttlePath;
 
-    [DataField]
-    public string TargetCode = "gamma";
+    [DataField(required: true)]
+    public string TargetCode;
 
-    [DataField]
-    public string PriorityTag = "DockGamma";
+    [DataField(required: true)]
+    public string PriorityTag;
 }
diff --git a/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml b/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml
index f474307a7c..2285da2bfe 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml
@@ -66,6 +66,9 @@
   abstract: true
   components:
     - type: CodeEquipment
+      shuttlePath: /Maps/_Sunrise/Shuttles/gamma_armory.yml
+      targetCode: gamma
+      priorityTag: DockGamma
 
 - type: entity
   id: BasePrisonStationShuttles
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index d7a7f089b1..05ea501051 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -545,7 +545,7 @@
 - type: Tag
   id: DrinkSpaceGlue
 
-- type: Tag 
+- type: Tag
   id: Dropper
 
 - type: Tag
@@ -1350,4 +1350,7 @@
 - type: Tag
   id: WriteIgnoreStamps
 
+- type: Tag
+  id: SolarAssemblyFlatpack
+
 # ALPHABETICAL