diff --git a/env/AWSPW.env b/env/AWSPW.env
index 7fe17d2492..e366128a1d 100755
--- a/env/AWSPW.env
+++ b/env/AWSPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    export APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing AWSPW.env"
     exit 2
@@ -53,7 +53,7 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
@@ -71,7 +71,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -79,25 +79,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/AZUREPW.env b/env/AZUREPW.env
index 706c659e95..9e246a9cb4 100755
--- a/env/AZUREPW.env
+++ b/env/AZUREPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing AZUREPW.env"
     exit 2
@@ -46,7 +46,7 @@ if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
diff --git a/env/GAEA.env b/env/GAEA.env
index be5e9f0ca7..7736e0f1ea 100755
--- a/env/GAEA.env
+++ b/env/GAEA.env
@@ -28,7 +28,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
     # This may be useful when Gaea is fully ported, so ignore SC warning
     # shellcheck disable=SC2034
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing GAEA.env"
     exit 2
@@ -51,7 +51,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -69,7 +69,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "fcst" ]]; then
 
@@ -82,7 +82,7 @@ elif [[ "${step}" = "fcst" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -96,6 +96,6 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/GOOGLEPW.env b/env/GOOGLEPW.env
index 7d912eaf8b..c3b5ec806a 100755
--- a/env/GOOGLEPW.env
+++ b/env/GOOGLEPW.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing GOOGLEPW.env"
     exit 2
@@ -57,7 +57,7 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN}"
+    export APRUN_NP="${APRUN_default}"
 
     export NTHREADS_DWN=${threads_per_task_dwn:-1}
     [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
@@ -75,7 +75,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -83,21 +83,21 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
diff --git a/env/HERA.env b/env/HERA.env
index 272c6773f9..0d77547b5b 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -39,7 +39,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing HERA.env"
     exit 2
@@ -54,11 +54,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -70,95 +70,95 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
 
 elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
 
 elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -170,7 +170,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -188,7 +188,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -196,7 +196,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -222,7 +222,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -236,7 +236,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -244,28 +244,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${threads_per_task_esfc:-${max_threads_per_task}}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -274,7 +274,7 @@ elif [[ "${step}" = "postsnd" ]]; then
 elif [[ "${step}" = "awips" ]]; then
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
 elif [[ "${step}" = "gempak" ]]; then
 
@@ -286,6 +286,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/HERCULES.env b/env/HERCULES.env
index 62b579dda3..0138e33645 100755
--- a/env/HERCULES.env
+++ b/env/HERCULES.env
@@ -36,7 +36,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing HERCULES.env"
     exit 2
@@ -52,11 +52,11 @@ case ${step} in
  ;;
  "prepsnowobs")
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
  ;;
  "prep_emissions")
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
@@ -69,61 +69,61 @@ case ${step} in
  "atmanlvar")
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
  ;;
  "atmanlfv3inc")
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
  ;;
  "atmensanlobs")
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
  ;;
  "atmensanlsol")
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
  ;;
  "atmensanlletkf")
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
  ;;
  "atmensanlfv3inc")
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
  ;;
  "aeroanlvar")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
  ;;
   "aeroanlgenb")
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
  ;;
  "prepobsaero")
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 ;;
  "snowanl")
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
  ;;
  "esnowrecen")
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
  ;;
@@ -131,12 +131,12 @@ case ${step} in
  "marinebmat")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
  ;;
  "ocnanalrun")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
  ;;
 "ocnanalecen")
 
@@ -153,7 +153,7 @@ case ${step} in
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN} --cpus-per-task=${NTHREADS_OCNANAL}"
+    export APRUN_OCNANAL="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
  ;;
  "anal" | "analcalc")
 
@@ -166,7 +166,7 @@ case ${step} in
 
 
     export NTHREADS_GSI=${threads_per_task_anal:-${max_threads_per_task}}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -185,7 +185,7 @@ case ${step} in
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
  ;;
  "eobs")
 
@@ -199,7 +199,7 @@ case ${step} in
 
     export NTHREADS_GSI=${NTHREADSmax}
     [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
  ;;
  "eupd")
 
@@ -225,7 +225,7 @@ case ${step} in
  "upp")
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
  ;;
 
  "atmos_products")
@@ -242,7 +242,7 @@ case ${step} in
  "ecen")
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -250,23 +250,23 @@ case ${step} in
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
  ;;
  "esfc")
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
  ;;
  "epos")
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
  ;;
  "postsnd")
@@ -274,7 +274,7 @@ case ${step} in
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -284,7 +284,7 @@ case ${step} in
  "awips")
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
  ;;
  "gempak")
@@ -295,7 +295,7 @@ case ${step} in
  "fit2obs")
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
  ;;
  *)
diff --git a/env/JET.env b/env/JET.env
index 52730fc74c..f2b018d2d7 100755
--- a/env/JET.env
+++ b/env/JET.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing JET.env"
     exit 2
@@ -58,17 +58,17 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
 	
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
@@ -83,48 +83,48 @@ elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export APRUN_AEROANL="${APRUN_default}"
 
 elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -136,7 +136,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${threads_per_task_anal:-${max_threads_per_task}}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -154,7 +154,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -162,7 +162,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -188,7 +188,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN}"
+    export APRUN_UPP="${APRUN_default}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -202,7 +202,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -210,28 +210,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN}"
+    export APRUN_POSTSND="${APRUN_default}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -248,6 +248,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/ORION.env b/env/ORION.env
index 638764908f..e8c1bcbf58 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -34,7 +34,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing ORION.env"
     exit 2
@@ -66,92 +66,92 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN} --cpus-per-task=${NTHREADS_ATMANLVAR}"
+    export APRUN_ATMANLVAR="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLVAR}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
+    export APRUN_ATMENSANLOBS="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLOBS}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
+    export APRUN_ATMENSANLSOL="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLSOL}"
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLLETKF}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMENSANLFV3INC}"
 
 elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN} --cpus-per-task=${NTHREADS_AEROANL}"
+    export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
 
 elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN} --cpus-per-task=${NTHREADS_SNOWANL}"
+    export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
+    export APRUN_ATMANLFV3INC="${APRUN_default} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_MARINEBMAT=${NTHREADSmax}
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN} --cpus-per-task=${NTHREADS_OCNANAL}"
+    export APRUN_OCNANAL="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -163,7 +163,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -181,7 +181,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -194,7 +194,7 @@ elif [[ "${step}" = "eobs" ]]; then
 
     export NTHREADS_GSI=${NTHREADSmax}
     [[ ${NTHREADS_GSI} -gt ${max_threads_per_task} ]] && export NTHREADS_GSI=${max_threads_per_task}
-    export APRUN_GSI="${APRUN} --cpus-per-task=${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"
 
 elif [[ "${step}" = "eupd" ]]; then
 
@@ -216,7 +216,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} --cpus-per-task=${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -230,7 +230,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} --cpus-per-task=${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -238,28 +238,28 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN} --cpus-per-task=${NTHREADS_CALCINC}"
+    export APRUN_CALCINC="${APRUN_default} --cpus-per-task=${NTHREADS_CALCINC}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} --cpus-per-task=${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} --cpus-per-task=${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} --cpus-per-task=${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} --cpus-per-task=${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} --cpus-per-task=${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then
 
     export CFP_MP="YES"
 
     export NTHREADS_POSTSND=${NTHREADS1}
-    export APRUN_POSTSND="${APRUN} --cpus-per-task=${NTHREADS_POSTSND}"
+    export APRUN_POSTSND="${APRUN_default} --cpus-per-task=${NTHREADS_POSTSND}"
 
     export NTHREADS_POSTSNDCFP=${threads_per_task_postsndcfp:-1}
     [[ ${NTHREADS_POSTSNDCFP} -gt ${max_threads_per_task} ]] && export NTHREADS_POSTSNDCFP=${max_threads_per_task}
@@ -268,7 +268,7 @@ elif [[ "${step}" = "postsnd" ]]; then
 elif [[ "${step}" = "awips" ]]; then
 
     export NTHREADS_AWIPS=${NTHREADS1}
-    export APRUN_AWIPSCFP="${APRUN} ${mpmd_opt}"
+    export APRUN_AWIPSCFP="${APRUN_default} ${mpmd_opt}"
 
 elif [[ "${step}" = "gempak" ]]; then
 
@@ -277,6 +277,6 @@ elif [[ "${step}" = "gempak" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN} --cpus-per-task=${NTHREADS_FIT2OBS}"
+    export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"
 
 fi
diff --git a/env/S4.env b/env/S4.env
index dd852afa0f..5d5ffd23b1 100755
--- a/env/S4.env
+++ b/env/S4.env
@@ -27,7 +27,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing S4.env"
     exit 2
@@ -42,11 +42,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -58,63 +58,63 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs" ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export APRUN_AEROANL="${APRUN_default}"
 
 elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN} --cpus-per-task=${NTHREADS_AEROANLGENB}"
+    export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
+    export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "marinebmat" ]]; then
      echo "WARNING: ${step} is not enabled on S4!"
@@ -132,7 +132,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -151,7 +151,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -159,7 +159,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export MKL_CBWR=AUTO
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN}"
+    export APRUN_GSI="${APRUN_default}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -186,7 +186,7 @@ elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
     export OMP_NUM_THREADS="${NTHREADS_UPP}"
-    export APRUN_UPP="${APRUN}"
+    export APRUN_UPP="${APRUN_default}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -200,7 +200,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -208,25 +208,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index 2640f85de2..d2dae3ba93 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -21,7 +21,7 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
     NTHREADS1=${threads_per_task:-1}
     [[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
     [[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
-    APRUN="${launcher} -n ${ntasks}"
+    APRUN_default="${launcher} -n ${ntasks}"
 else
     echo "ERROR config.resources must be sourced before sourcing WCOSS2.env"
     exit 2
@@ -36,11 +36,11 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
-    export APRUN_CALCFIMS="${APRUN}"
+    export APRUN_CALCFIMS="${APRUN_default}"
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN="${APRUN}"
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll"  ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -51,90 +51,90 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 elif [[ "${step}" = "atmanlvar" ]]; then
 
     export NTHREADS_ATMANLVAR=${NTHREADSmax}
-    export APRUN_ATMANLVAR="${APRUN}"
+    export APRUN_ATMANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlobs"  ]]; then
 
     export NTHREADS_ATMENSANLOBS=${NTHREADSmax}
-    export APRUN_ATMENSANLOBS="${APRUN}"
+    export APRUN_ATMENSANLOBS="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
-    export APRUN_ATMENSANLSOL="${APRUN}"
+    export APRUN_ATMENSANLSOL="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
-    export APRUN_ATMENSANLLETKF="${APRUN}"
+    export APRUN_ATMENSANLLETKF="${APRUN_default}"
 
 elif [[ "${step}" = "atmensanlfv3inc" ]]; then
 
     export NTHREADS_ATMENSANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMENSANLFV3INC="${APRUN}"
+    export APRUN_ATMENSANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "aeroanlvar" ]]; then
 
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
     export NTHREADS_AEROANL=${NTHREADSmax}
-    export APRUN_AEROANL="${APRUN}"
+    export APRUN_AEROANL="${APRUN_default}"
 
 elif [[ "${step}" = "aeroanlgenb" ]]; then
 
     export NTHREADS_AEROANLGENB=${NTHREADSmax}
-    export APRUN_AEROANLGENB="${APRUN}"
+    export APRUN_AEROANLGENB="${APRUN_default}"
 
 elif [[ "${step}" = "prepobsaero" ]]; then
 
     export NTHREADS_PREPOBSAERO=${NTHREADS1}
-    export APRUN_PREPOBSAERO="${APRUN} --ppn ${tasks_per_node}--cpu-bind depth --depth=${NTHREADS_PREPOBSAERO}"
+    export APRUN_PREPOBSAERO="${APRUN_default} --ppn ${tasks_per_node}--cpu-bind depth --depth=${NTHREADS_PREPOBSAERO}"
 
 elif [[ "${step}" = "snowanl" ]]; then
 
     export NTHREADS_SNOWANL=${NTHREADSmax}
-    export APRUN_SNOWANL="${APRUN}"
+    export APRUN_SNOWANL="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "esnowrecen" ]]; then
 
     export NTHREADS_ESNOWRECEN=${NTHREADSmax}
-    export APRUN_ESNOWRECEN="${APRUN}"
+    export APRUN_ESNOWRECEN="${APRUN_default}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 
 elif [[ "${step}" = "marinebmat" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN}"
+    export APRUN_MARINEBMAT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
 
-    export APRUN_OCNANAL="${APRUN}"
+    export APRUN_OCNANAL="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
 elif [[ "${step}" = "marineanalletkf" ]]; then
 
     export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
     
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 
     export NTHREADS_ATMANLFV3INC=${NTHREADSmax}
-    export APRUN_ATMANLFV3INC="${APRUN}"
+    export APRUN_ATMANLFV3INC="${APRUN_default}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
@@ -147,7 +147,7 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     fi
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
@@ -174,7 +174,7 @@ elif [[ "${step}" = "sfcanl" ]]; then
 
     export NTHREADS_CYCLE=${threads_per_task:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "eobs" ]]; then
 
@@ -183,7 +183,7 @@ elif [[ "${step}" = "eobs" ]]; then
     export FI_OFI_RXM_SAR_LIMIT=3145728
 
     export NTHREADS_GSI=${NTHREADSmax}
-    export APRUN_GSI="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
+    export APRUN_GSI="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export CFP_MP=${CFP_MP:-"NO"}
     export USE_CFP=${USE_CFP:-"YES"}
@@ -224,7 +224,7 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}
-    export APRUN_UPP="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_UPP}"
+    export APRUN_UPP="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_UPP}"
 
 elif [[ "${step}" = "atmos_products" ]]; then
 
@@ -238,7 +238,7 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ECEN}"
+    export APRUN_ECEN="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-14}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
@@ -246,25 +246,25 @@ elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ESFC}"
+    export APRUN_ESFC="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
+    export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_EPOS}"
+    export APRUN_EPOS="${APRUN_default} -ppn ${tasks_per_node} --cpu-bind depth --depth ${NTHREADS_EPOS}"
 
 elif [[ "${step}" = "postsnd" ]]; then