diff --git a/switch_model/generators/extensions/storage.py b/switch_model/generators/extensions/storage.py
index d1e9d614b..09412f92a 100644
--- a/switch_model/generators/extensions/storage.py
+++ b/switch_model/generators/extensions/storage.py
@@ -359,8 +359,6 @@ def post_solve(instance, outdir):
             "load_zone",
             "IncrementalPowerCapacityMW",
             "IncrementalEnergyCapacityMWh",
-            "OnlinePowerCapacityMW",
-            "OnlineEnergyCapacityMWh",
         ),
         values=lambda m, g, bld_yr: (
             g,
@@ -368,18 +366,29 @@ def post_solve(instance, outdir):
             m.gen_load_zone[g],
             m.BuildGen[g, bld_yr],
             m.BuildStorageEnergy[g, bld_yr],
-            (
-                m.GenCapacity[g, bld_yr]
-                if bld_yr in m.PERIODS
-                else m.BuildGen[g, bld_yr]
-            ),
-            (
-                m.StorageEnergyCapacity[g, bld_yr]
-                if bld_yr in m.PERIODS
-                else m.BuildStorageEnergy[g, bld_yr]
-            ),
         ),
     )
+ 
+    reporting.write_table(
+        instance, 
+        instance.STORAGE_GEN_PERIODS,
+        output_file=os.path.join(outdir, "storage_capacity.csv"),
+        headings=(
+            "generation_project", 
+            "period", 
+            "load_zone",
+            "OnlinePowerCapacityMW", 
+            "OnlineEnergyCapacityMWh" 
+        ),
+        values=lambda m, g, p: (
+            g, 
+            p, 
+            m.gen_load_zone[g],
+            m.GenCapacity[g, p], 
+            m.StorageEnergyCapacity[g, p]
+        )
+    )
+
     reporting.write_table(
         instance,
         instance.STORAGE_GEN_TPS,