diff --git a/etc/lmod-setup.csh b/etc/lmod-setup.csh
index e78a1ce59c..c8e1fc5ae2 100644
--- a/etc/lmod-setup.csh
+++ b/etc/lmod-setup.csh
@@ -12,6 +12,8 @@ EOF_USAGE
 else
    set L_MACHINE=$1
 endif
+
+source /etc/csh.login
    
 if ( "$L_MACHINE" == macos ) then
    set ENV="/opt/homebrew/opt/lmod/init/csh"
diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh
index 909a324bd9..91e9228a9f 100644
--- a/etc/lmod-setup.sh
+++ b/etc/lmod-setup.sh
@@ -14,6 +14,14 @@ else
    L_MACHINE=$1
 fi
 
+[[ ${SHELLOPTS} =~ nounset ]] && has_mu=true || has_mu=false
+[[ ${SHELLOPTS} =~ errexit ]] && has_me=true || has_me=false
+$has_mu && set +u
+$has_me && set +e
+source /etc/profile
+$has_mu && set -u
+$has_me && set -e
+
 if [ "$L_MACHINE" = macos ]; then
    export BASH_ENV="/opt/homebrew/opt/lmod/init/bash"
    # export BASH_ENV="/usr/local/opt/lmod/init/bash"
diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh
index b7aa768f13..03428475fd 100755
--- a/tests/WE2E/setup_WE2E_tests.sh
+++ b/tests/WE2E/setup_WE2E_tests.sh
@@ -82,24 +82,7 @@ exec_subdir="install_${compiler}/exec"
 #-----------------------------------------------------------------------
 
 # Load Python Modules
-env_path="${SRW_APP_DIR}/modulefiles"
-env_file="wflow_${machine}"
-echo "-- Load environment =>" $env_file
-source ${SRW_APP_DIR}/etc/lmod-setup.sh ${machine}
-module use ${env_path}
-module load ${env_file}
-
-if [[ "${machine}" == 'cheyenne' ]]; then
-    conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
-else
-    if [[ "${machine}" == 'noaacloud' && -z "${PROJ_LIB-}" ]]; then
-        PROJ_LIB=''
-    fi
-
-    conda activate regional_workflow
-fi
-
-module list
+source ${SRW_APP_DIR}/ush/load_modules_wflow.sh ${machine}
 
 # Run the E2E Workflow tests
 ./run_WE2E_tests.sh \
diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
index c3d1608e9f..40843b0937 100644
--- a/ush/config_defaults.yaml
+++ b/ush/config_defaults.yaml
@@ -322,10 +322,9 @@ platform:
   DOMAIN_PREGEN_BASEDIR: ""
   #
   #-----------------------------------------------------------------------
-  # Scripts and commands needed by workflow and tasks
+  # Pre task commands such as "ulimit" needed by tasks
   #-----------------------------------------------------------------------
   #
-  ENV_INIT_SCRIPTS_FPS: []
   PRE_TASK_CMDS: ""
   #
   #-----------------------------------------------------------------------
@@ -1103,6 +1102,7 @@ task_make_orog:
   OMP_NUM_THREADS_MAKE_OROG: 6
   OMP_STACKSIZE_MAKE_OROG: "2048m"
   OROG_DIR: ""
+  TOPO_DIR: ""
 
 #----------------------------
 # MAKE SFC CLIMO config parameters
@@ -1117,6 +1117,7 @@ task_make_sfc_climo:
   OMP_NUM_THREADS_MAKE_SFC_CLIMO: 1
   OMP_STACKSIZE_MAKE_SFC_CLIMO: "1024m"
   SFC_CLIMO_DIR: ""
+  SFC_CLIMO_INPUT_DIR: ""
 
 #----------------------------
 # EXTRN ICS config parameters
@@ -1628,14 +1629,6 @@ task_run_fcst:
   # FIXlut:
   # System directory where the lookup tables for optics properties are located
   #
-  # TOPO_DIR:
-  # The location on disk of the static input files used by the make_orog
-  # task (orog.x and shave.x). Can be the same as FIXgsm.
-  #
-  # SFC_CLIMO_INPUT_DIR:
-  # The location on disk of the static surface climatology input fields, used by 
-  # sfc_climo_gen. These files are only used if RUN_TASK_MAKE_SFC_CLIMO=TRUE
-  #
   # FNGLAC, ..., FNMSKH:
   # Names of (some of the) global data files that are assumed to exist in 
   # a system directory specified (this directory is machine-dependent; 
@@ -1691,8 +1684,6 @@ task_run_fcst:
   FIXgsm: ""
   FIXaer: ""
   FIXlut: ""
-  TOPO_DIR: ""
-  SFC_CLIMO_INPUT_DIR: ""
   
   FNGLAC: &FNGLAC "global_glacier.2x2.grb"
   FNMXIC: &FNMXIC "global_maxice.2x2.grb"
diff --git a/ush/init_env.sh b/ush/init_env.sh
deleted file mode 100644
index 368cf9818c..0000000000
--- a/ush/init_env.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#-----------------------------------------------------------------------
-#
-# This file defines a function that sources scripts (usually system 
-# scripts) to initialize various commands in the environment, e.g. the 
-# "module" command.  The full paths to these scripts are specified in 
-# the machine files in the array ENV_INIT_SCRIPTS_FPS.
-#
-# env_init_scripts_fps:
-# Full paths to the system scripts to source.
-# 
-#-----------------------------------------------------------------------
-#
-function init_env() { 
-
-  { save_shell_opts; . ${USHdir}/preamble.sh; } > /dev/null 2>&1
-
-  local valid_args=( \
-    "env_init_scripts_fps" \
-    )
-  process_args valid_args "$@"
-  print_input_args "valid_args"
-
-  local num_scripts \
-        n \
-        fp
-
-  num_scripts="${#env_init_scripts_fps[@]}"
-  for (( n=0; n<${num_scripts}; n++ )); do
-    fp="${env_init_scripts_fps[$n]}"
-    print_info_msg "$DEBUG" "\
-Attempting to source script:
-  fp = \"$fp\""
-    if [ -f "$fp" ]; then
-      # The scripts being sourced here may have undefined variables, but since
-      # they are system scripts outside of the SRW App, they cannot be changed.
-      # Thus, we allow for undefined variables by temporarily using "set +u".
-      set +eu
-      source "$fp" && print_info_msg "$DEBUG" "Succeeded."
-      set -eu
-    else
-      print_err_msg_exit "\
-The script to source does not exist or is not a regular file:
-  fp = \"$fp\""
-    fi
-
-  done
-
-  { restore_shell_opts; } > /dev/null 2>&1
-
-}
diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh
index 78e751e303..43b1321c11 100755
--- a/ush/launch_FV3LAM_wflow.sh
+++ b/ush/launch_FV3LAM_wflow.sh
@@ -96,7 +96,6 @@ fi
 #
 . $exptdir/var_defns.sh
 . $USHdir/source_util_funcs.sh
-. $USHdir/init_env.sh
 #
 #-----------------------------------------------------------------------
 #
@@ -122,16 +121,6 @@ called_from_cron=$(boolify "${called_from_cron}")
 #
 #-----------------------------------------------------------------------
 #
-# Initialize the environment, e.g. by making the "module" command as well
-# as others available.
-#
-#-----------------------------------------------------------------------
-#
-env_init_scripts_fps_str="( "$(printf "\"%s\" " "${ENV_INIT_SCRIPTS_FPS[@]}")")"
-init_env env_init_scripts_fps="${env_init_scripts_fps_str}"
-#
-#-----------------------------------------------------------------------
-#
 # Set the name of the experiment.  We take this to be the name of the 
 # experiment subdirectory (i.e. the string after the last "/" in the 
 # full path to the experiment directory).
@@ -146,31 +135,9 @@ expt_name="${EXPT_SUBDIR}"
 #
 #-----------------------------------------------------------------------
 #
-# source version file (run) only if it is specified in versions directory
-VERSION_FILE="${HOMEdir}/versions/${RUN_VER_FN}"
-if [ -f ${VERSION_FILE} ]; then
-  . ${VERSION_FILE}
-fi  
-module use "${HOMEdir}/modulefiles"
-module load "${WFLOW_MOD_FN}" > /dev/null 2>&1 || print_err_msg_exit "\
-Loading of platform-specific module file (WFLOW_MOD_FN) for the workflow 
-task failed:
-  WFLOW_MOD_FN = \"${WFLOW_MOD_FN}\""
+machine=$(echo_lowercase $MACHINE)
 
-#
-#-----------------------------------------------------------------------
-#
-# Hack for Cheyenne since system python3 version is 3.4.10.
-# SRW app requires at least 3.6 so crontab deletion doesn't work with it.
-# Here we switch to using the python3 in conda that satisfies the requirement.
-# In the future, we could do conda activate on all systems here, to get rid
-# of the system python requirement.
-#
-#-----------------------------------------------------------------------
-#
-if [ "$MACHINE" = "CHEYENNE" ]; then
-    conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
-fi
+. ${USHdir}/load_modules_wflow.sh ${machine}
 
 #
 #-----------------------------------------------------------------------
diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
index b0772d698f..708541c5a3 100755
--- a/ush/load_modules_run_task.sh
+++ b/ush/load_modules_run_task.sh
@@ -9,7 +9,6 @@
 #
 . ${GLOBAL_VAR_DEFNS_FP}
 . $USHdir/source_util_funcs.sh
-. $USHdir/init_env.sh
 #
 #-----------------------------------------------------------------------
 #
@@ -66,16 +65,6 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-# Initialize the environment, e.g. by making available the "module" 
-# command as well as others.
-#
-#-----------------------------------------------------------------------
-#
-env_init_scripts_fps_str="( "$(printf "\"%s\" " "${ENV_INIT_SCRIPTS_FPS[@]}")")"
-init_env env_init_scripts_fps="${env_init_scripts_fps_str}"
-#
-#-----------------------------------------------------------------------
-#
 # Get the task name and the name of the J-job script.
 #
 #-----------------------------------------------------------------------
@@ -195,6 +184,10 @@ module list
 if [ -n "${SRW_ENV:-}" ] ; then
   set +u
   conda activate ${SRW_ENV}
+  if [ $machine = "gaea" ]; then
+     conda deactivate
+     conda activate ${SRW_ENV}
+  fi
   set -u
 fi
 
diff --git a/ush/load_modules_wflow.sh b/ush/load_modules_wflow.sh
new file mode 100755
index 0000000000..51a85de46c
--- /dev/null
+++ b/ush/load_modules_wflow.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#
+#-----------------------------------------------------------------------
+#
+# This script loads the workflow modulefile for a given machine.
+# It is a central place for all other scripts so that this is the only
+# place workflow module loading can be modified.
+#
+#-----------------------------------------------------------------------
+#
+
+function usage() {
+  cat << EOF_USAGE
+Usage: source $0 PLATFORM
+
+OPTIONS:
+   PLATFORM - name of machine you are on
+      (e.g. cheyenne | hera | jet | orion | wcoss2 )
+EOF_USAGE
+}
+
+# Make sure machine name is passed as first argument
+if [ $# -eq 0 ]; then
+  usage
+  exit 1
+fi
+
+# help message
+if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
+  usage
+  exit 0
+fi
+
+# Set machine name to lowercase
+machine=${1,,}
+
+# Get home directory
+scrfunc_fp=$( readlink -f "${BASH_SOURCE[0]}" )
+scrfunc_dir=$( dirname "${scrfunc_fp}" )
+HOMEdir=$( dirname "${scrfunc_dir}" )
+
+# source version file (run) only if it is specified in versions directory
+RUN_VER_FN="run_ver.${machine}"
+VERSION_FILE="${HOMEdir}/versions/${RUN_VER_FN}"
+if [ -f ${VERSION_FILE} ]; then
+  . ${VERSION_FILE}
+fi
+
+# Source modulefile for this machine
+WFLOW_MOD_FN="wflow_${machine}"
+source "${HOMEdir}/etc/lmod-setup.sh" ${machine}
+module use "${HOMEdir}/modulefiles"
+module load "${WFLOW_MOD_FN}" > /dev/null 2>&1 || { echo "ERROR:
+Loading of platform-specific module file (WFLOW_MOD_FN) for the workflow 
+task failed:
+  WFLOW_MOD_FN = \"${WFLOW_MOD_FN}\""; exit 1; }
+
+# Activate conda
+[[ ${SHELLOPTS} =~ nounset ]] && has_mu=true || has_mu=false
+
+$has_mu && set +u
+if [[ "${machine}" == 'cheyenne' ]]; then
+    conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
+else
+    if [ ! -z $(command -v conda) ]; then
+        conda activate regional_workflow
+    fi
+fi
+$has_mu && set -u
+
+# List loaded modulefiles
+module list
+
diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml
index 184a5f64c9..ffb27f2759 100644
--- a/ush/machine/cheyenne.yaml
+++ b/ush/machine/cheyenne.yaml
@@ -16,18 +16,18 @@ platform:
   RUN_CMD_POST: mpirun -np $nprocs
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpirun -np $nprocs
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /glade/p/ral/jntp/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /glade/p/ral/jntp/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /glade/p/ral/jntp/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /glade/p/ral/jntp/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /glade/p/ral/jntp/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   FV3GFS: /glade/p/ral/jntp/UFS_CAM/COMGFS/gfs.${yyyymmdd}/${hh}
diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml
index 4eeca9dcf2..aa16540124 100644
--- a/ush/machine/gaea.yaml
+++ b/ush/machine/gaea.yaml
@@ -16,19 +16,18 @@ platform:
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: srun --mpi=pmi2 -n $nprocs
   SCHED_NATIVE_CMD: -M c3
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
-    - /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   FV3GFS: /lustre/f2/dev/Mark.Potts/EPIC/SRW/model_data/FV3GFS/${yyyymmdd}${hh}
diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml
index cb17092f7f..e2f2ac12f7 100644
--- a/ush/machine/hera.yaml
+++ b/ush/machine/hera.yaml
@@ -19,13 +19,15 @@ platform:
   RUN_CMD_POST: srun
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: srun
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /scratch2/BMC/det/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /scratch2/BMC/det/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /scratch2/BMC/det/UFS_SRW_app/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /scratch2/BMC/det/UFS_SRW_app/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: hpss aws nomads
 task_get_extrn_lbcs:
@@ -34,5 +36,3 @@ task_run_fcst:
   FIXaer: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/fix/fix_sfc_climo
diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml
index c9ac57fac4..c5aa0ca398 100644
--- a/ush/machine/jet.yaml
+++ b/ush/machine/jet.yaml
@@ -19,13 +19,15 @@ platform:
   RUN_CMD_POST: srun
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: srun
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: hpss aws nomads
 task_get_extrn_lbcs:
@@ -34,8 +36,6 @@ task_run_fcst:
   FIXaer: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   FV3GFS:
     - nemsio: /public/data/grids/gfs/nemsio
diff --git a/ush/machine/linux.yaml b/ush/machine/linux.yaml
index 2b5e95d4fc..f447cf4dda 100644
--- a/ush/machine/linux.yaml
+++ b/ush/machine/linux.yaml
@@ -6,14 +6,14 @@ platform:
   RUN_CMD_POST: 'mpirun -n 4 '
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpirun -n 4
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -a; }'
+task_make_orog:
+  TOPO_DIR: /home/username/DATA/UFS/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /home/username/DATA/UFS/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /home/username/DATA/UFS/fix/fix_aer
   FIXgsm: /home/username/DATA/UFS/fix/fix_am
   FIXlut: /home/username/DATA/UFS/fix/fix_lut
-  TOPO_DIR: /home/username/DATA/UFS/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /home/username/DATA/UFS/fix/fix_sfc_climo
 data:
   FV3GFS: /home/username/DATA/UFS/FV3GFS
diff --git a/ush/machine/macos.yaml b/ush/machine/macos.yaml
index c8fbd0c992..97ec29bf90 100644
--- a/ush/machine/macos.yaml
+++ b/ush/machine/macos.yaml
@@ -6,14 +6,14 @@ platform:
   RUN_CMD_POST: 'mpirun -n 4 '
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpirun -n 4
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -a; }'
+task_make_orog:
+  TOPO_DIR: /Users/username/DATA/UFS/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /Users/username/DATA/UFS/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /Users/username/DATA/UFS/fix/fix_aer
   FIXgsm: /Users/username/DATA/UFS/fix/fix_am
   FIXlut: /Users/username/DATA/UFS/fix/fix_lut
-  TOPO_DIR: /Users/username/DATA/UFS/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /Users/username/DATA/UFS/fix/fix_sfc_climo
 data:
   FV3GFS: /Users/username/DATA/UFS/FV3GFS
diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml
index 306cf7adc0..ffa371ba2d 100644
--- a/ush/machine/noaacloud.yaml
+++ b/ush/machine/noaacloud.yaml
@@ -12,14 +12,16 @@ platform:
   RUN_CMD_POST: mpiexec -np $nprocs
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpiexec -np $nprocs
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   BUILD_MOD_FN: wflow_noaacloud
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /contrib/EPIC/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /contrib/EPIC/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /contrib/EPIC/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: aws nomads
 task_get_extrn_lbcs:
@@ -28,7 +30,5 @@ task_run_fcst:
   FIXaer: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /contrib/EPIC/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   FV3GFS: /contrib/GST/model_data/FV3GFS/${yyyymmdd}${hh}
diff --git a/ush/machine/odin.yaml b/ush/machine/odin.yaml
index 6547be3fb0..67a2fb49f1 100644
--- a/ush/machine/odin.yaml
+++ b/ush/machine/odin.yaml
@@ -13,18 +13,19 @@ platform:
   RUN_CMD_POST: srun -n 1
   RUN_CMD_SERIAL: srun -n 1
   RUN_CMD_UTILS: srun -n $nprocs
-  ENV_INIT_SCRIPTS_FPS: []
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /scratch/ywang/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /scratch/ywang/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /scratch/ywang/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /scratch/ywang/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /scratch/ywang/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /scratch/ywang/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /scratch/ywang/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /scratch/ywang/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /scratch/ywang/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /scratch/ywang/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /scratch/ywang/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   GSMGFS: /scratch/ywang/UFS_SRW_App/develop/input_model_data/GFS
   FV3GFS: /scratch/ywang/UFS_SRW_App/develop/input_model_data/FV3GFS
diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml
index 4a75f3f1c2..b57a563cd2 100644
--- a/ush/machine/orion.yaml
+++ b/ush/machine/orion.yaml
@@ -19,11 +19,13 @@ platform:
   RUN_CMD_POST: srun
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: srun
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/FV3LAM_pregen
+task_make_orog:
+  TOPO_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: aws nomads
 task_get_extrn_lbcs:
@@ -32,5 +34,3 @@ task_run_fcst:
   FIXaer: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/fix/fix_sfc_climo
diff --git a/ush/machine/singularity.yaml b/ush/machine/singularity.yaml
index 886962cccd..40f3a3915a 100644
--- a/ush/machine/singularity.yaml
+++ b/ush/machine/singularity.yaml
@@ -13,9 +13,11 @@ platform:
   RUN_CMD_POST: mpirun -np $nprocs --oversubscribe
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpirun -np $nprocs --oversubscribe
-  ENV_INIT_SCRIPTS_FPS:
-    - /usr/share/lmod/6.6/init/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
+task_make_orog:
+  TOPO_DIR: /contrib/global/glopara/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /contrib/global/glopara/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: aws nomads
 task_get_extrn_lbcs:
@@ -24,5 +26,3 @@ task_run_fcst:
   FIXaer: /contrib/global/glopara/fix/fix_aer
   FIXgsm: /contrib/global/glopara/fix/fix_am
   FIXlut: /contrib/global/glopara/fix/fix_lut
-  TOPO_DIR: /contrib/global/glopara/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /contrib/global/glopara/fix/fix_sfc_climo
diff --git a/ush/machine/stampede.yaml b/ush/machine/stampede.yaml
index 42d31ffc73..64ed089377 100644
--- a/ush/machine/stampede.yaml
+++ b/ush/machine/stampede.yaml
@@ -13,18 +13,19 @@ platform:
   RUN_CMD_POST: ibrun -np $nprocs
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: ibrun -np $nprocs
-  ENV_INIT_SCRIPTS_FPS: []
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/FV3LAM_pregen
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
   TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/dummy_FV3GFS_sys_dir
+task_make_orog:
+  TOPO_DIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_run_fcst:
   FIXaer: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/fix/fix_sfc_climo
 data:
   GSMGFS: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/input_model_data/GFS
   FV3GFS: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/input_model_data/FV3GFS
diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml
index 07ff573e4f..059dc0776c 100644
--- a/ush/machine/wcoss2.yaml
+++ b/ush/machine/wcoss2.yaml
@@ -17,11 +17,13 @@ platform:
   RUN_CMD_SERIAL: mpiexec
   RUN_CMD_UTILS: mpiexec -n ${nprocs}
   SCHED_NATIVE_CMD: -l place=excl
-  ENV_INIT_SCRIPTS_FPS:
-    - /etc/profile
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/input_model_data
   TEST_PREGEN_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/FV3LAM_pregen
+task_make_orog:
+  TOPO_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_orog
+task_make_sfc_climo:
+  SFC_CLIMO_INPUT_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_sfc_climo
 task_get_extrn_ics:
   EXTRN_MDL_DATA_STORES: hpss aws nomads
 task_get_extrn_lbcs:
@@ -30,5 +32,3 @@ task_run_fcst:
   FIXaer: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_aer
   FIXgsm: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_am
   FIXlut: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_lut
-  TOPO_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_orog
-  SFC_CLIMO_INPUT_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_sfc_climo