diff --git a/ecflow/ecf/scripts/gdas/jgdas_forecast.ecf b/ecflow/ecf/scripts/gdas/jgdas_forecast.ecf
index 280bb53f68..f40a270a3a 100755
--- a/ecflow/ecf/scripts/gdas/jgdas_forecast.ecf
+++ b/ecflow/ecf/scripts/gdas/jgdas_forecast.ecf
@@ -4,9 +4,9 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 1:00
-#BSUB -n 576
-#BSUB -R affinity[core(7)]
-#BSUB -R span[ptile=4]
+#BSUB -n 833
+#BSUB -R affinity[core(4)]
+#BSUB -R span[ptile=7]
 #BSUB -cwd /tmp
 
 %include <head.h>
@@ -14,10 +14,10 @@
 
 set -x
 
-export NODES=144
-export ntasks=576
-export ptile=4
-export threads=7
+export NODES=119
+export ntasks=833
+export ptile=7
+export threads=4
 
 export NET=%NET:gfs%
 export RUN=%RUN%
diff --git a/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf b/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf
index b0e86763ca..8fc18335e9 100755
--- a/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf
+++ b/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf
@@ -4,7 +4,7 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 2:30
-#BSUB -n 2344
+#BSUB -n 2424
 #BSUB -R affinity[core(7)]
 #BSUB -R span[ptile=4]
 #BSUB -cwd /tmp
@@ -14,8 +14,8 @@
 
 set -x
 
-export NODES=586
-export ntasks=2344
+export NODES=606
+export ntasks=2424
 export ptile=4
 export threads=7
 
diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static
index 07b3b15f4d..a6a2c88c0a 100755
--- a/parm/config/config.resources.nco.static
+++ b/parm/config/config.resources.nco.static
@@ -22,19 +22,9 @@ step=$1
 
 echo "BEGIN: config.resources"
 
-if [[ "$machine" = "WCOSS_DELL_P3" ]]; then
-   export npe_node_max=28
-   if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5
-     export npe_node_max=40
-   fi
-elif [[ "$machine" = "WCOSS_C" ]]; then
-   export npe_node_max=24
-elif [[ "$machine" = "JET" ]]; then
-   export npe_node_max=24
-elif [[ "$machine" = "HERA" ]]; then
-   export npe_node_max=40
-elif [[ "$machine" = "ORION" ]]; then
-   export npe_node_max=40
+export npe_node_max=28
+if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5
+  export npe_node_max=40
 fi
 
 if [ $step = "prep" -o $step = "prepbufr" ]; then
@@ -47,23 +37,26 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
 elif [ $step = "waveinit" ]; then
 
     export wtime_waveinit="00:10:00"
-    export npe_waveinit=10
+    export npe_waveinit=12
     export nth_waveinit=1
     export npe_node_waveinit=$(echo "$npe_node_max / $nth_waveinit" | bc)
     export NTASKS=${npe_waveinit}
 
 elif [ $step = "waveprep" ]; then
 
-    export wtime_waveprep="00:30:00"
-    export npe_waveprep=65
+    export wtime_waveprep="00:10:00"
+    export wtime_waveprep_gfs="00:30:00"
+    export npe_waveprep=84
     export nth_waveprep=1
     export npe_node_waveprep=$(echo "$npe_node_max / $nth_waveprep" | bc)
     export NTASKS=${npe_waveprep}
 
 elif [ $step = "wavepostsbs" ]; then
 
-    export wtime_wavepostsbs="06:00:00"
-    export npe_wavepostsbs=10
+    export wtime_wavepostsbs="00:20:00"
+    export wtime_wavepostsbs_gfs="03:00:00"
+    export npe_wavepostsbs=28
+    export npe_wavepostsbs_gfs=280
     export nth_wavepostsbs=1
     export npe_node_wavepostsbs=$(echo "$npe_node_max / $nth_wavepostsbs" | bc)
     export NTASKS=${npe_wavepostsbs}
@@ -78,7 +71,8 @@ elif [ $step = "wavepostbndpnt" ]; then
 
 elif [ $step = "wavepostpnt" ]; then
 
-    export wtime_wavepostpnt="01:30:00"
+    export wtime_wavepostpnt="00:12:00"
+    export wtime_wavepostpnt_gfs="01:30:00"
     export npe_wavepostpnt=280
     export nth_wavepostpnt=1
     export npe_node_wavepostpnt=$(echo "$npe_node_max / $nth_wavepostpnt" | bc)
@@ -110,19 +104,13 @@ elif [ $step = "waveawipsgridded" ]; then
 
 elif [ $step = "anal" ]; then
 
-    export wtime_anal="00:45:00"
+    export wtime_anal="01:00:00"
+    export wtime_anal_gfs="00:40:00"
     export npe_anal=1000
-    export nth_anal=4  
     export npe_anal_gfs=1000
-    if [ $CASE = "C384" ]; then
-      export npe_anal=160
-      export nth_anal=10
-    fi
-    if [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then export npe_anal=84; fi
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_anal=7; fi
+    export nth_anal=7
     export npe_node_anal=$(echo "$npe_node_max / $nth_anal" | bc)
     export nth_cycle=$npe_node_max
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_anal="3072M"; fi
 
 elif [ $step = "analcalc" ]; then
 
@@ -130,7 +118,6 @@ elif [ $step = "analcalc" ]; then
     export npe_analcalc=127
     export nth_analcalc=1
     export npe_node_analcalc=$npe_node_max
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_analcalc=127 ; fi
 
 elif [ $step = "analdiag" ]; then
 
@@ -138,40 +125,36 @@ elif [ $step = "analdiag" ]; then
     export npe_analdiag=112
     export nth_analdiag=1
     export npe_node_analdiag=$npe_node_max
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_analdiag="3072M"; fi
 
 elif [ $step = "gldas" ]; then
 
-    export wtime_gldas="00:10:00"
-    export npe_gldas=96  
+    export wtime_gldas="00:20:00"
+    export npe_gldas=112
     export nth_gldas=1 
     export npe_node_gldas=$npe_node_max
     export npe_gaussian=96  
     export nth_gaussian=1 
     export npe_node_gaussian=24           
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_gldas=112 ; fi
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_gldas="3072M"; fi
 
 elif [ $step = "fcst" ]; then
 
-    export wtime_fcst="00:30:00"
+    export wtime_fcst="01:00:00"
     export wtime_fcst_gfs="02:30:00"
     export npe_fcst=$(echo "$layout_x * $layout_y * 6" | bc)
     export npe_fcst_gfs=$(echo "$layout_x_gfs * $layout_y_gfs * 6" | bc)
     export nth_fcst=${nth_fv3:-2}
     export npe_node_fcst=$(echo "$npe_node_max / $nth_fcst" | bc)
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_fcst="1024M"; fi
 
 elif [ $step = "post" ]; then
 
-    export wtime_post="02:00:00"
-    export wtime_post_gfs="06:00:00"
-    export npe_post=96
+    export wtime_post="00:12:00"
+    export wtime_post_gfs="00:20:00"
+    export npe_post=98
+    export npe_post_gfs=112
     export nth_post=1
-    export npe_node_post=12
+    export npe_node_post=14
+    export npe_node_post_gfs=28
     export npe_node_dwn=$npe_node_max
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_node_post=14 ; fi
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_post="3072M"; fi
 
 elif [ $step = "wafs" ]; then
 
@@ -224,11 +207,6 @@ elif [ $step = "vrfy" ]; then
     export npe_node_vrfy=1
     export npe_vrfy_gfs=1
     export npe_node_vrfy_gfs=1
-    if [[ "$machine" == "WCOSS_C" ]]; then
-	    export memory_vrfy="3072M"
-    elif [[ "$machine" == "HERA" ]]; then
-	    export memory_vrfy="16384M"
-    fi
 
 elif [ $step = "metp" ]; then
     
@@ -239,11 +217,6 @@ elif [ $step = "metp" ]; then
     export wtime_metp_gfs="06:00:00"
     export npe_metp_gfs=4
     export npe_node_metp_gfs=4
-    if [[ "$machine" == "WCOSS_C" ]]; then
-            export memory_metp="3072M"
-    elif [[ "$machine" == "THEIA" ]]; then
-            export memory_metp="16384M"
-    fi
 
 elif [ $step = "echgres" ]; then
 
@@ -265,19 +238,9 @@ elif [ $step = "eobs" -o $step = "eomg" ]; then
 
     export wtime_eobs="00:10:00"
     export wtime_eomg="01:00:00"
-    if [ $CASE = "C768" ]; then
-      export npe_eobs=480
-    elif [ $CASE = "C384" ]; then
-      export npe_eobs=42
-    elif [ $CASE = "C192" ]; then
-      export npe_eobs=28
-    elif [ $CASE = "C96" -o $CASE = "C48" ]; then
-      export npe_eobs=14
-    fi
-    export nth_eobs=2
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_eobs=7; fi
+    export npe_eobs=480
+    export nth_eobs=7
     export npe_node_eobs=$(echo "$npe_node_max / $nth_eobs" | bc)
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_eobs="3072M"; fi
 
 elif [ $step = "ediag" ]; then
 
@@ -285,46 +248,21 @@ elif [ $step = "ediag" ]; then
     export npe_ediag=56
     export nth_ediag=1
     export npe_node_ediag=$npe_node_max
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_ediag="3072M"; fi
 
 elif [ $step = "eupd" ]; then
 
     export wtime_eupd="00:30:00"
-    if [ $CASE = "C768" ]; then
-      export npe_eupd=960
-      export nth_eupd=6
-      if [[ "$machine" = "WCOSS_DELL_P3" ]]; then
-        export nth_eupd=7
-      fi
-    elif [ $CASE = "C384" ]; then
-      export npe_eupd=270
-      export nth_eupd=2
-      if [[ "$machine" = "WCOSS_DELL_P3" ]]; then
-        export nth_eupd=9
-      fi
-      if [[ "$machine" = "HERA" ]]; then
-        export npe_eupd=84
-        export nth_eupd=10
-      fi
-    elif [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then
-      export npe_eupd=42
-      export nth_eupd=2
-    fi
+    export npe_eupd=960
+    export nth_eupd=7
     export npe_node_eupd=$(echo "$npe_node_max / $nth_eupd" | bc)
-    if [[ "$machine" == "WCOSS_C" ]]; then
-        export memory_eupd="3072M"
-    fi
 
 elif [ $step = "ecen" ]; then
 
     export wtime_ecen="00:10:00"
     export npe_ecen=80
-    export nth_ecen=6
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_ecen=7; fi
-    if [ $CASE = "C384" -o $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then export nth_ecen=2; fi
+    export nth_ecen=7
     export npe_node_ecen=$(echo "$npe_node_max / $nth_ecen" | bc)
     export nth_cycle=$nth_ecen
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_ecen="3072M"; fi
 
 elif [ $step = "esfc" ]; then
 
@@ -333,7 +271,6 @@ elif [ $step = "esfc" ]; then
     export npe_node_esfc=$npe_node_max
     export nth_esfc=1
     export nth_cycle=$nth_esfc
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_esfc="3072M"; fi
 
 elif [ $step = "efcs" ]; then
 
@@ -341,16 +278,13 @@ elif [ $step = "efcs" ]; then
     export npe_efcs=$(echo "$layout_x * $layout_y * 6" | bc)
     export nth_efcs=${nth_fv3:-2}
     export npe_node_efcs=$(echo "$npe_node_max / $nth_efcs" | bc)
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_efcs="254M"; fi
 
 elif [ $step = "epos" ]; then
 
     export wtime_epos="00:15:00"
     export npe_epos=80
-    export nth_epos=6
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_epos=7; fi
+    export nth_epos=7
     export npe_node_epos=$(echo "$npe_node_max / $nth_epos" | bc)
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_epos="254M"; fi
 
 elif [ $step = "postsnd" ]; then
 
@@ -364,21 +298,13 @@ elif [ $step = "postsnd" ]; then
         export npe_postsnd=13
         export npe_node_postsnd=4
     fi
-    if [[ "$machine" = "HERA" ]]; then export npe_node_postsnd=2; fi
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_postsnd="254M"; fi
 
 elif [ $step = "awips" ]; then
 
     export wtime_awips="03:30:00"
-    export npe_awips=4
-    export npe_node_awips=4
-    export nth_awips=2
-    if [[ "$machine" == "WCOSS_DELL_P3" ]]; then
-        export npe_awips=2
-        export npe_node_awips=2
-        export nth_awips=1
-    fi
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_awips="2048M"; fi
+    export npe_awips=2
+    export npe_node_awips=2
+    export nth_awips=1
 
 elif [ $step = "gempak" ]; then
 
@@ -386,7 +312,6 @@ elif [ $step = "gempak" ]; then
     export npe_gempak=17
     export npe_node_gempak=4
     export nth_gempak=3
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_gempak="254M"; fi
 
 else
 
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index 0d829b246f..afb65ecab2 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -343,6 +343,7 @@ cd $pwd/../parm/config
 [[ -s config.base ]] && rm -f config.base 
 if [ $RUN_ENVIR = nco ] ; then
  cp -p config.base.nco.static config.base
+ cp -p config.resources.nco.static config.resources
 else
  cp -p config.base.emc.dyn config.base
 fi