diff --git a/dev/parm/config/gfs/config.resources b/dev/parm/config/gfs/config.resources
index f6bd3ab387f..0a63608e6f1 100644
--- a/dev/parm/config/gfs/config.resources
+++ b/dev/parm/config/gfs/config.resources
@@ -69,8 +69,7 @@ case ${machine} in
     export PARTITION_BATCH="compute"
     npe_node_max=48
     max_tasks_per_node=48
-    # TODO Supply a max mem/node value for AWS
-    mem_node_max=""
+    mem_node_max="192GB"
     ;;
   "AZUREPW")
     export PARTITION_BATCH="compute"
diff --git a/dev/parm/config/gfs/config.resources.AWSPW b/dev/parm/config/gfs/config.resources.AWSPW
index c76f50bf0ce..45b19dd296f 100644
--- a/dev/parm/config/gfs/config.resources.AWSPW
+++ b/dev/parm/config/gfs/config.resources.AWSPW
@@ -68,7 +68,7 @@ case ${step} in
 
   "esfc")
     export is_exclusive="True"
-    export tasks_per_node=40
+    export tasks_per_node=${max_tasks_per_node}
     ;;
 
   "upp")