diff --git a/CHANGELOG.md b/CHANGELOG.md
index e28b7a4cb..a8f3747e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
 - Add support for slice notation in technology connections to allow users to connect between variables of different shapes. [PR 774](https://github.com/NatLabRockies/H2Integrate/pull/774)
 - Updated `commodity_sell_price` input to `ProFastNPV` to be per year of the plant life. Also updated `BasicProFASTParameterConfig.as_dict()` so explicitly input escalation values are not overwritten to the general inflation rate [PR 799](https://github.com/NatLabRockies/H2Integrate/pull/799)
 - Added `calc_azimuth_angle()` to `PYSAMSolarPlantPerformanceModel` to provide default azimuth angle based on whether the site is in the northern or southern hemisphere [PR 806](https://github.com/NatLabRockies/H2Integrate/pull/806)
+- Corrected water rate units in pipe feedstock from galUS to galUS/h [PR 813](https://github.com/NatLabRockies/H2Integrate/pull/813)
 
 ## 0.8 [April 15, 2026]
 
diff --git a/examples/21_iron_examples/iron_dri/tech_config.yaml b/examples/21_iron_examples/iron_dri/tech_config.yaml
index 4e8056f34..f919d80ef 100644
--- a/examples/21_iron_examples/iron_dri/tech_config.yaml
+++ b/examples/21_iron_examples/iron_dri/tech_config.yaml
@@ -109,7 +109,7 @@ technologies:
     model_inputs:
       shared_parameters:
         commodity: water
-        commodity_rate_units: galUS  # galUS/h
+        commodity_rate_units: galUS/h
       performance_parameters:
         rated_capacity: 40000.  # need 38710.49649 galUS/h
       cost_parameters:
@@ -200,7 +200,7 @@ technologies:
     model_inputs:
       shared_parameters:
         commodity: water
-        commodity_rate_units: galUS  # galUS/h
+        commodity_rate_units: galUS/h
       performance_parameters:
         rated_capacity: 10000.  # need 9083.687924154146 galUS/h
       cost_parameters:
diff --git a/examples/21_iron_examples/iron_mapping/tech_config.yaml b/examples/21_iron_examples/iron_mapping/tech_config.yaml
index 468f658de..0605323bb 100644
--- a/examples/21_iron_examples/iron_mapping/tech_config.yaml
+++ b/examples/21_iron_examples/iron_mapping/tech_config.yaml
@@ -109,7 +109,7 @@ technologies:
     model_inputs:
       shared_parameters:
         commodity: water
-        commodity_rate_units: galUS  # galUS/h
+        commodity_rate_units: galUS/h
       performance_parameters:
         rated_capacity: 40000.  # need 38710.49649 galUS/h
       cost_parameters:
diff --git a/h2integrate/converters/iron/iron_dri_plant.py b/h2integrate/converters/iron/iron_dri_plant.py
index cc2b8df5b..1080f80c8 100644
--- a/h2integrate/converters/iron/iron_dri_plant.py
+++ b/h2integrate/converters/iron/iron_dri_plant.py
@@ -66,7 +66,7 @@ def setup(self):
         self.product = "h2_dri"
         self.feedstocks_to_units = {
             "natural_gas": "MMBtu/h",
-            "water": "galUS",  # "galUS/h"
+            "water": "galUS/h",
             "iron_ore": "t/h",
             "electricity": "kW",
             "hydrogen": "t/h",
@@ -93,7 +93,7 @@ class NaturalGasIronReductionPlantPerformanceComponent(IronReductionPlantBasePer
     def setup(self):
         self.feedstocks_to_units = {
             "natural_gas": "MMBtu/h",
-            "water": "galUS",  # "galUS/h"
+            "water": "galUS/h",
             "iron_ore": "t/h",
             "electricity": "kW",
             "reformer_catalyst": "(m**3)",  # "(m**3)/h"
diff --git a/h2integrate/converters/iron/test/test_rosner_dri.py b/h2integrate/converters/iron/test/test_rosner_dri.py
index 7f16791cd..ba6d3c5a7 100644
--- a/h2integrate/converters/iron/test/test_rosner_dri.py
+++ b/h2integrate/converters/iron/test/test_rosner_dri.py
@@ -47,7 +47,7 @@ def ng_feedstock_availability_costs():
         },
         "water": {
             "rated_capacity": 40000.0,  # need 38071.049649 galUS/h
-            "units": "galUS",
+            "units": "galUS/h",
             "price": 1670.0,  # cost is $0.441167535/t, equal to $1670.0004398318847/galUS
         },
         "iron_ore": {
@@ -80,7 +80,7 @@ def h2_feedstock_availability_costs():
         },
         "water": {
             "rated_capacity": 24000.0,  # need 23066.4878077501 galUS/h
-            "units": "galUS",
+            "units": "galUS/h",
             "price": 1670.0,  # TODO: update cost is $0.441167535/t, equal to $1670.0004398318847/galUS
         },
         "iron_ore": {
diff --git a/h2integrate/converters/steel/steel_eaf_plant.py b/h2integrate/converters/steel/steel_eaf_plant.py
index bad7bbbdc..779bd0f3e 100644
--- a/h2integrate/converters/steel/steel_eaf_plant.py
+++ b/h2integrate/converters/steel/steel_eaf_plant.py
@@ -63,7 +63,7 @@ def setup(self):
         self.product = "h2_eaf"
         self.feedstocks_to_units = {
             "natural_gas": "MMBtu/h",
-            "water": "galUS",  # "galUS/h"
+            "water": "galUS/h",
             "carbon": "t/h",
             "lime": "t/h",
             "sponge_iron": "t/h",
@@ -90,7 +90,7 @@ class NaturalGasEAFPlantPerformanceComponent(ElectricArcFurnacePlantBasePerforma
     def setup(self):
         self.feedstocks_to_units = {
             "natural_gas": "MMBtu/h",
-            "water": "galUS",  # "galUS/h"
+            "water": "galUS/h",
             "sponge_iron": "t/h",
             "electricity": "kW",
         }
diff --git a/h2integrate/converters/steel/test/test_rosner_eaf.py b/h2integrate/converters/steel/test/test_rosner_eaf.py
index 42bb1153d..5e7c18f6e 100644
--- a/h2integrate/converters/steel/test/test_rosner_eaf.py
+++ b/h2integrate/converters/steel/test/test_rosner_eaf.py
@@ -62,7 +62,7 @@ def ng_feedstock_availability_costs():
         },
         "water": {
             "rated_capacity": 10000.0,  # need 9082.97025163801 galUS/h
-            "units": "galUS",
+            "units": "galUS/h",
             "price": 1670.0,  # cost is $0.441167535/t, equal to $1670.0004398318847/galUS
         },
         "sponge_iron": {
@@ -100,7 +100,7 @@ def h2_feedstock_availability_costs():
         },
         "water": {
             "rated_capacity": 6000.0,  # need 5766.528266260271 galUS/h
-            "units": "galUS",
+            "units": "galUS/h",
             "price": 1670.0,  # TODO: update cost is $0.441167535/t, equal to $1670.0004398318847/galUS
         },
         "sponge_iron": {
diff --git a/h2integrate/feedstocks/test/test_feedstocks.py b/h2integrate/feedstocks/test/test_feedstocks.py
index b862b08bb..6018f2721 100644
--- a/h2integrate/feedstocks/test/test_feedstocks.py
+++ b/h2integrate/feedstocks/test/test_feedstocks.py
@@ -325,13 +325,13 @@ def test_multiple_different_type_feedstocks(plant_config):
     )
 
     # Electricity feedstock
-    ec_units = "MW*h"
+    ec_units = "MW"
     elec_config, _ = create_basic_feedstock_config(
         feedstock_type="electricity", units=ec_units, rated_capacity=50.0, price=0.05
     )
 
     # Water feedstock
-    h2o_units = "galUS"
+    h2o_units = "galUS/h"
     water_config, _ = create_basic_feedstock_config(
         feedstock_type="water", units=h2o_units, rated_capacity=1000.0, price=0.001
     )
diff --git a/h2integrate/transporters/pipe.py b/h2integrate/transporters/pipe.py
index 423fb7709..5ad3a92c1 100644
--- a/h2integrate/transporters/pipe.py
+++ b/h2integrate/transporters/pipe.py
@@ -38,7 +38,7 @@ def setup(self):
         if transport_item == "natural_gas":
             units = "MMBtu/h"
         elif transport_item == "water":
-            units = "galUS"
+            units = "galUS/h"
         elif transport_item == "co2":
             units = "kg/h"
         else: