diff --git a/scripts/automation/FargateRSContext.sh b/scripts/automation/FargateRSContext.sh
index dc6ad7685..7c2be7965 100644
--- a/scripts/automation/FargateRSContext.sh
+++ b/scripts/automation/FargateRSContext.sh
@@ -86,6 +86,8 @@ try() {
   python3 -m rscontext.rs_context_metrics \
     $RS_CONTEXT_DIR
 
+  if [[ $? != 0 ]]; then return 1; fi
+
   echo "======================  Final Disk space usage ======================="
   df -h
 
diff --git a/scripts/automation/FargateRSContextChannelAreaTauDEM.sh b/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
index 70f5b2fe0..faccaa693 100644
--- a/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
+++ b/scripts/automation/FargateRSContextChannelAreaTauDEM.sh
@@ -97,6 +97,13 @@ rscontext $HUC \
 if [[ $? != 0 ]]; then return 1; fi
 echo "<<RS_CONTEXT COMPLETE>>"
 
+cd /usr/local/src/riverscapes-tools/packages/rscontext
+python3 -m rscontext.rs_context_metrics \
+  $RS_CONTEXT_DIR
+  
+if [[ $? != 0 ]]; then return 1; fi
+echo "<<RS_CONTEXT METRICS COMPLETE>>"
+
 # Upload the HUC into the warehouse
 cd $RSCONTEXT_DIR
 # If this is a user upload then we need to use the user's id