diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 720ac83777..e1a1e0b211 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -67,7 +67,7 @@
     supplyRampTolerance: 500
     supplyRampRate: 500
   - type: SolarPanel
-    maxSupply: 1000
+    maxSupply: 2000
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_panel_plasma
@@ -107,7 +107,7 @@
     supplyRampTolerance: 500
     supplyRampRate: 500
   - type: SolarPanel
-    maxSupply: 1500
+    maxSupply: 3000
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_panel_uranium
@@ -147,6 +147,7 @@
     supplyRampTolerance: 500
     supplyRampRate: 500
   - type: SolarPanel
+    maxSupply: 1000
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index b7778a611a..445fd863a9 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -34,7 +34,7 @@
     - type: Appearance
     - type: Battery
       startingCharge: 0
-      maxCharge: 8000000
+      maxCharge: 120000000
     - type: ExaminableBattery
     - type: NodeContainer
       examinable: true
@@ -59,10 +59,10 @@
       voltage: High
       node: input
     - type: PowerNetworkBattery
-      maxSupply: 150000
-      maxChargeRate: 5000
-      supplyRampTolerance: 5000
-      supplyRampRate: 1000
+      maxSupply: 750000
+      maxChargeRate: 25000
+      supplyRampTolerance: 25000
+      supplyRampRate: 5000
     - type: PointLight
       radius: 1.5
       energy: 1.6
@@ -124,11 +124,11 @@
 - type: entity
   parent: BaseSMES
   id: SMESBasic
-  suffix: Basic, 8MW
+  suffix: Basic, 120MJ, 25%
   components:
   - type: Battery
-    maxCharge: 8000000
-    startingCharge: 8000000
+    maxCharge: 120000000
+    startingCharge: 30000000
 
 - type: entity
   parent: SMESBasic
@@ -141,7 +141,7 @@
 - type: entity
   parent: BaseSMES
   id: SMESAdvanced
-  suffix: Advanced, 16MJ
+  suffix: Advanced, 480MJ
   name: advanced SMES
   description: An even-higher-capacity superconducting magnetic energy storage (SMES) unit.
   components:
@@ -165,8 +165,8 @@
   - type: Machine
     board: SMESAdvancedMachineCircuitboard
   - type: Battery
-    maxCharge: 16000000
-    startingCharge: 16000000
+    maxCharge: 240000000
+    startingCharge: 240000000
   - type: PowerMonitoringDevice
     group: SMES
     sourceNode: input
diff --git a/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml b/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml
index 9ddf074990..5d966dbd31 100644
--- a/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml
+++ b/Resources/Prototypes/_DV/Catalog/Shipyard/civilian.yml
@@ -13,7 +13,7 @@
   id: Barge
   name: NTCI-MI Barge
   description: A large shipping vessel repurposed into a salvage bar.
-  price: 59000
+  price: 69000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_barge.yml
   categories:
   - Civilian
@@ -25,7 +25,7 @@
   id: Helix
   name: NTCI-ME Helix
   description: A large mobile health clinic for servicing distant outposts.
-  price: 58500
+  price: 69000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_helix.yml
   categories:
   - Civilian
@@ -36,7 +36,7 @@
   id: Eden
   name: NTCI-ME Eden
   description: A modestly sized botanical garden with a chemistry lab for pushing the bounds of hydroponics.
-  price: 77000
+  price: 87000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_eden.yml
   categories:
   - Civilian
@@ -58,7 +58,7 @@
   id: Miriam
   name: NTCI-ME Miriam
   description: A modestly sized medical vessel with all the equipment to operate a cryogenics laboratory.
-  price: 61000
+  price: 71000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_miriam.yml
   categories:
   - Civilian
@@ -69,7 +69,7 @@
   id: Prospector
   name: NTCI-MI NT-7-Prospector
   description: A small mining vessel designed to assist salvage operations.
-  price: 29000
+  price: 40000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_prospector.yml
   categories:
   - Civilian
@@ -102,7 +102,7 @@
   id: Pulse
   name: NTCI-SH Pulse
   description: A moderately sized shuttle intended for all-purpose use. It can comfortably accomodate a crew of up to ten people.
-  price: 62000
+  price: 84000
   path: /Maps/_DV/Shuttles/Shipyard/ntsy_pulse.yml
   categories:
   - Civilian