diff --git a/scripts/automation/FargateAllTools.sh b/scripts/automation/FargateAllTools.sh
index e26539172..9ee2dd2cb 100644
--- a/scripts/automation/FargateAllTools.sh
+++ b/scripts/automation/FargateAllTools.sh
@@ -128,10 +128,10 @@ try() {
   ##########################################################################################
 
   channel $HUC \
-    $RSCONTEXT_DIR/hydrology/NHDFlowline.shp \
+    $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/network_intersected \
     $CHANNELAREA_DIR \
-    --flowareas $RSCONTEXT_DIR/hydrology/NHDArea.shp \
-    --waterbodies $RSCONTEXT_DIR/hydrology/NHDWaterbody.shp \
+    --flowareas $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDAreaSplit \
+    --waterbodies $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDWaterbodySplit \
     --bankfull_function "0.177 * (a ** 0.397) * (p ** 0.453)" \
     --bankfull_function_params "a=TotDASqKm" \
     --reach_code_field FCode \
@@ -139,7 +139,7 @@ try() {
     --flowarea_reach_codes "53700,46100,48400,31800,34300,34305,34306,4600,46003,46006,46007", \
     --waterbody_reach_codes "49300,3900,39001,39004,39005,39006,39009,39010,39011,39012,43600,43601,43603,43604,43605,43606,43607,43608,43609,43610,43611,43612,43613,43614,43615,43618,43619,43621,43623,43624,43625,43626,46600,46601,46602", \
     --prism_data $RSCONTEXT_DIR/climate/precipitation.tif \
-    --huc8boundary $RSCONTEXT_DIR/hydrology/WBDHU8.shp \
+    --huc8boundary $RSCONTEXT_DIR/hydrology/nhdplushr.gpkg/WBDHU8 \
     --meta "Runner=Cybercastor" \
     --verbose
 
diff --git a/scripts/automation/FargateChannel.sh b/scripts/automation/FargateChannel.sh
index 48e3c6a18..f569dbc7d 100644
--- a/scripts/automation/FargateChannel.sh
+++ b/scripts/automation/FargateChannel.sh
@@ -68,10 +68,10 @@ rscli download $RS_CONTEXT_DIR --id $RSCONTEXT_ID \
 try() {
 
 channel $HUC \
-  $RS_CONTEXT_DIR/hydrology/nhdplushr.gpkg/NHDFlowline \
+  $RS_CONTEXT_DIR/hydrology/hydro_derivatives.gpkg/network_intersected \
   $CHANNELAREA_DIR \
   --flowareas $RS_CONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDAreaSplit \
-  --waterbodies $RS_CONTEXT_DIR/hydrology/nhdplushr.gpkg/NHDWaterbody \
+  --waterbodies $RS_CONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDWaterbodySplit \
   --bankfull_function "0.177 * (a ** 0.397) * (p ** 0.453)" \
   --bankfull_function_params "a=TotDASqKm" \
   --reach_code_field FCode \
diff --git a/scripts/automation/FargateRSContextChannelAreaTauDEM.sh b/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
index 88596bdee..70f5b2fe0 100644
--- a/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
+++ b/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
@@ -128,10 +128,10 @@ rm -fr $RSCONTEXT_SCRATCH
 ##########################################################################################
 
 channel $HUC \
-  $RSCONTEXT_DIR/hydrology/nhdplushr.gpkg/NHDFlowline \
+  $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/network_intersected  \
   $CHANNELAREA_DIR \
   --flowareas $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDAreaSplit \
-  --waterbodies $RSCONTEXT_DIR/hydrology/nhdplushr.gpkg/NHDWaterbody \
+  --waterbodies $RSCONTEXT_DIR/hydrology/hydro_derivatives.gpkg/NHDWaterbodySplit \
   --bankfull_function "0.177 * (a ** 0.397) * (p ** 0.453)" \
   --bankfull_function_params "a=TotDASqKm" \
   --reach_code_field FCode \