diff --git a/dev/ci/cases/pr/C96C48_hybatmDA.yaml b/dev/ci/cases/pr/C96C48_hybatmDA.yaml
index b874bebd80f..86fb1cf9cf1 100644
--- a/dev/ci/cases/pr/C96C48_hybatmDA.yaml
+++ b/dev/ci/cases/pr/C96C48_hybatmDA.yaml
@@ -3,7 +3,6 @@ experiment:
   mode: cycled
 
 arguments:
-  account: {{ 'HPC_ACCOUNT' | getenv }}
   account: {{ 'HPC_ACCOUNT' | getenv }}
   pslot: {{ 'pslot' | getenv }}
   app: ATM
@@ -18,7 +17,7 @@ arguments:
   nens: 2
   interval: 24
   start: cold
-  yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_defaults_ci.yaml
+  yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
 
 skip_ci_on_hosts:
   - awsepicglobalworkflow
diff --git a/dev/ci/cases/yamls/atmsoilDA_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
similarity index 52%
rename from dev/ci/cases/yamls/atmsoilDA_defaults_ci.yaml
rename to dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
index 28c4f3dc940..6dfad69daaa 100644
--- a/dev/ci/cases/yamls/atmsoilDA_defaults_ci.yaml
+++ b/dev/ci/cases/yamls/gfs_hyb_defaults_ci.yaml
@@ -2,4 +2,5 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_GSISOILDA: "YES"
-  DO_TEST_MODE: "NO"
+  DO_TEST_MODE: "YES"
+  FETCHDIR: "/NCEPDEV/emc-global/1year/David.Grumm/test_data"
diff --git a/dev/jobs/esfc.sh b/dev/jobs/esfc.sh
index a7180b080c5..d67375e6050 100755
--- a/dev/jobs/esfc.sh
+++ b/dev/jobs/esfc.sh
@@ -4,10 +4,7 @@ set -x
 
 ###############################################################
 # Source FV3GFS workflow modules
-# For DO_GSISOILDA=YES need to switch to ufsda modules
-# until g-w issue 3390 is resolved.
-source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
-#source "${HOMEgfs}/ush/load_ufsda_modules.sh"
+. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
 status=$?
 if [[ ${status} -ne 0 ]]; then
     exit "${status}"
diff --git a/dev/jobs/sfcanl.sh b/dev/jobs/sfcanl.sh
index 434a4f0c3fa..7336d17b274 100755
--- a/dev/jobs/sfcanl.sh
+++ b/dev/jobs/sfcanl.sh
@@ -4,10 +4,7 @@ set -x
 
 ###############################################################
 # Source FV3GFS workflow modules
-# For DO_GSISOILDA=YES need to switch to ufsda modules
-# until g-w issue 3390 is resolved.
 source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
-#source "${HOMEgfs}/ush/load_ufsda_modules.sh"
 status=$?
 if [[ ${status} -ne 0 ]]; then
     exit "${status}"
diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py
index 0dbd3b329bf..4273d07e09f 100644
--- a/dev/workflow/rocoto/gfs_tasks.py
+++ b/dev/workflow/rocoto/gfs_tasks.py
@@ -253,10 +253,10 @@ def sfcanl(self):
         if self.options['do_jedisnowda']:
             dep_dict = {'type': 'task', 'name': f'{self.run}_snowanl'}
             deps.append(rocoto.add_dependency(dep_dict))
-        if self.options['do_gsisoilda']:
+        if self.options['do_gsisoilda'] and self.run in ['gdas']:
             dep_dict = {'type': 'task', 'name': 'enkfgdas_eupd'}
             deps.append(rocoto.add_dependency(dep_dict))
-        if self.options['do_jedisnowda'] or self.options['do_gsisoilda']:
+        if self.options['do_jedisnowda'] or (self.options['do_gsisoilda'] and self.run in ['gdas']):
             dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         else:
             dependencies = rocoto.create_dependency(dep=deps)
diff --git a/env/GAEAC5.env b/env/GAEAC5.env
index fc4dacc1038..e81e26ed52c 100755
--- a/env/GAEAC5.env
+++ b/env/GAEAC5.env
@@ -199,12 +199,8 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
  ;;
@@ -287,6 +283,10 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
+    export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
+
  ;;
  "epos")
 
diff --git a/env/GAEAC6.env b/env/GAEAC6.env
index 56a13619a3a..17b633d2729 100755
--- a/env/GAEAC6.env
+++ b/env/GAEAC6.env
@@ -204,12 +204,8 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
  ;;
@@ -299,6 +295,10 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
+    export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
+
  ;;
  "epos")
 
diff --git a/env/HERA.env b/env/HERA.env
index fbfd19df0de..e9fc5de4ee9 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -207,12 +207,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
     export NTHREADS_CYCLE=${threads_per_task:-14}
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "eobs" ]]; then
@@ -286,11 +282,8 @@ elif [[ "${step}" = "esfc" ]]; then
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "epos" ]]; then
diff --git a/env/HERCULES.env b/env/HERCULES.env
index 622d61394c3..10bd5fa0068 100755
--- a/env/HERCULES.env
+++ b/env/HERCULES.env
@@ -211,12 +211,8 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
  ;;
  "eobs")
@@ -303,11 +299,8 @@ case ${step} in
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
  ;;
diff --git a/env/ORION.env b/env/ORION.env
index d5be672a536..3031a5e16a5 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -210,12 +210,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "eobs" ]]; then
@@ -294,11 +290,8 @@ elif [[ "${step}" = "esfc" ]]; then
     fi
     export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"
 
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "epos" ]]; then
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index d94be2a5bdd..fe823b7fefd 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -203,12 +203,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
     fi
     export APRUN_CYCLE="${APRUN_default}"
 
-    # REGRID requires multiple of 6 tasks
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "eobs" ]]; then
@@ -304,11 +300,8 @@ elif [[ "${step}" = "esfc" ]]; then
     fi
     export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
-    ntdiv6=$((ntasks/6))
-    ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then
-        ntasks_regrid=36
-    fi
+    # REGRID requires 6 tasks for reproducibility
+    ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
 elif [[ "${step}" = "epos" ]]; then
diff --git a/modulefiles/module_base.gaeac5.lua b/modulefiles/module_base.gaeac5.lua
index 7f84e2efb3a..9208c8c4d89 100644
--- a/modulefiles/module_base.gaeac5.lua
+++ b/modulefiles/module_base.gaeac5.lua
@@ -15,6 +15,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
 load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
diff --git a/modulefiles/module_base.gaeac6.lua b/modulefiles/module_base.gaeac6.lua
index e35c8c3c24a..45f7a42405a 100644
--- a/modulefiles/module_base.gaeac6.lua
+++ b/modulefiles/module_base.gaeac6.lua
@@ -15,6 +15,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
 load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
index fb177f2bd82..8b4eec2aef4 100644
--- a/modulefiles/module_base.hera.lua
+++ b/modulefiles/module_base.hera.lua
@@ -21,6 +21,7 @@ load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
 load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
index dbc77c2e62f..805e7edb73c 100644
--- a/modulefiles/module_base.hercules.lua
+++ b/modulefiles/module_base.hercules.lua
@@ -17,6 +17,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
 load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index ca25f97c2fd..4f9d0de1069 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -16,6 +16,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
 load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
 load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
 load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
+load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
 
 load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
 load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
diff --git a/parm/config/gfs/config.esfc b/parm/config/gfs/config.esfc
index f2c8414be4b..c74c425b757 100644
--- a/parm/config/gfs/config.esfc
+++ b/parm/config/gfs/config.esfc
@@ -31,7 +31,7 @@ if [[ ${DO_GSISOILDA} == "YES" ]]; then
     export GCYCLE_DO_SOILINCR=".true."
     export GCYCLE_INTERP_LANDINCR=".false."
     export LSOIL_INCR=2
-    export REGRID_EXEC="${HOMEgfs}/sorc/gdas.cd/build/bin/regridStates.x"
+    export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
 fi
 
 echo "END: config.esfc"
diff --git a/parm/config/gfs/config.sfcanl b/parm/config/gfs/config.sfcanl
index e235154f2d8..59a0af5c35b 100644
--- a/parm/config/gfs/config.sfcanl
+++ b/parm/config/gfs/config.sfcanl
@@ -22,7 +22,7 @@ if [[ "${DO_GSISOILDA}" == "YES" ]]; then
     export GCYCLE_DO_SOILINCR=".true."
     export GCYCLE_INTERP_LANDINCR=".false."
     export LSOIL_INCR=2
-    export REGRID_EXEC=${REGRID_EXEC:-"${HOMEgfs}/sorc/gdas.cd/build/bin/regridStates.x"}
+    export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
 fi
 
 echo "END: config.sfcanl"
diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
index 670bb92338c..f1feab6ac0c 100755
--- a/scripts/exgdas_enkf_update.sh
+++ b/scripts/exgdas_enkf_update.sh
@@ -89,6 +89,7 @@ else
 fi
 INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"}
 DO_GSISOILDA=${DO_GSISOILDA:-"NO"}
+hofx_2m_sfcfile=${hofx_2m_sfcfile:-".false."}
 
 ################################################################################
 
@@ -204,7 +205,7 @@ for imem in $(seq 1 $NMEM_ENS); do
    for FHR in $nfhrs; do
       ${NLN} "${COMIN_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}atmf00${FHR}${ENKF_SUFFIX}.nc" \
          "sfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
-      if [[ "${DO_GSISOILDA}" = "YES" ]]; then
+      if [[ "${hofx_2m_sfcfile}" = ".true." ]]; then
          ${NLN} "${COMIN_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
              "bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
       fi
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index 56a163dc953..0efcb75c99b 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -336,7 +336,7 @@ if [[ -s "upp.x" ]]; then
 fi
 ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/exec/upp.x" .
 
-for ufs_utilsexe in emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid; do
+for ufs_utilsexe in emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid regridStates.x; do
   if [[ -s "${ufs_utilsexe}" ]]; then
       rm -f "${ufs_utilsexe}"
   fi
@@ -397,8 +397,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then
     "gdasapp_land_ensrecenter.x"
     "bufr2ioda.x"
     "calcfIMS.exe"
-    "apply_incr.exe"
-    "regridStates.x")
+    "apply_incr.exe")
   for gdasexe in "${JEDI_EXE[@]}"; do
     if [[ -s "${gdasexe}" ]]; then
         rm -f "${gdasexe}"
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index 053f4559dc3..3f498ed34a4 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit 053f4559dc321894bb4e666c7e727dd6da0d8ed6
+Subproject commit 3f498ed34a4fc6dd6bbf06c3101b72cc7090533e
diff --git a/ush/regrid_gsiSfcIncr_to_tile.sh b/ush/regrid_gsiSfcIncr_to_tile.sh
index 1d8254e2e65..3b17f88a79d 100755
--- a/ush/regrid_gsiSfcIncr_to_tile.sh
+++ b/ush/regrid_gsiSfcIncr_to_tile.sh
@@ -6,10 +6,6 @@
 # Clara Draper, Dec 2024
 #-------------------------------------------------------------------------------------------------
 
-# temporary files on hera, until g-w issue 3392 is resolved.
-TMP_FIX_FILES=/scratch2/BMC/gsienkf/Clara.Draper/gw_new_fix_files/
-
-
 export PGMOUT=${PGMOUT:-${pgmout:-'&1'}}
 export PGMERR=${PGMERR:-${pgmerr:-'&2'}}
 export REDOUT=${REDOUT:-'1>'}
@@ -71,7 +67,7 @@ cat << EOF > regrid.nml
 EOF
 
 # input, fixed files
-${NCP} "${TMP_FIX_FILES}/gaussian.${LONB_CASE_IN}.${LATB_CASE_IN}.nc" \
+${NCP} "${FIXorog}/${CASE_IN}/gaussian.${LONB_CASE_IN}.${LATB_CASE_IN}.nc" \
         "${DATA}/gaussian_scrip.nc"
 
 # output, fixed files
diff --git a/versions/build.gaeac5.ver b/versions/build.gaeac5.ver
index 1b473aa297a..681607855d4 100644
--- a/versions/build.gaeac5.ver
+++ b/versions/build.gaeac5.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2023.2.0
 export stack_cray_mpich_ver=8.1.28
-export spack_env=gsi-addon-dev
+export spack_env=gsi-addon-dev-fms-2024.01
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.gaeac6.ver b/versions/build.gaeac6.ver
index f46469e7f2f..ae3ef5e407b 100644
--- a/versions/build.gaeac6.ver
+++ b/versions/build.gaeac6.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2023.2.0
 export stack_cray_mpich_ver=8.1.29
-export spack_env=gsi-addon
+export spack_env=gsi-addon-dev-fms-2024.01
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/c6/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hera.ver b/versions/build.hera.ver
index 70afb90a296..da7be231d09 100644
--- a/versions/build.hera.ver
+++ b/versions/build.hera.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev-rocky8
+export spack_env=gsi-addon-dev-fms-2024.01
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver
index 2d7185d5e7d..17dd60abb10 100644
--- a/versions/build.hercules.ver
+++ b/versions/build.hercules.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
-export spack_env=gsi-addon-env
+export spack_env=gsi-addon-dev-fms-2024.01
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
index 29e02f08734..fde6136ad66 100644
--- a/versions/build.orion.ver
+++ b/versions/build.orion.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
-export spack_env=gsi-addon-env-rocky9
+export spack_env=gsi-addon-dev-fms-2024.01
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/fix.ver b/versions/fix.ver
index 522df57cf33..8b10c5bd5ca 100644
--- a/versions/fix.ver
+++ b/versions/fix.ver
@@ -18,7 +18,7 @@ export glwu_ver=20220805
 export gsi_ver=20241022
 export lut_ver=20220805
 export mom6_ver=20240416
-export orog_ver=20231027
+export orog_ver=20240917
 export reg2grb2_ver=20220805
 export sfc_climo_ver=20220805
 export ugwd_ver=20240624
diff --git a/versions/run.gaeac5.ver b/versions/run.gaeac5.ver
index 3b1688709ed..6e61ca82295 100644
--- a/versions/run.gaeac5.ver
+++ b/versions/run.gaeac5.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2023.2.0
 export stack_cray_mpich_ver=8.1.28
-export spack_env=gsi-addon-dev
+export spack_env=gsi-addon-dev-fms-2024.01
 
 export perl_ver=5.38.2
 
diff --git a/versions/run.gaeac6.ver b/versions/run.gaeac6.ver
index f9ac46de709..c342a313e65 100644
--- a/versions/run.gaeac6.ver
+++ b/versions/run.gaeac6.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2023.2.0
 export stack_cray_mpich_ver=8.1.29
-export spack_env=gsi-addon
+export spack_env=gsi-addon-dev-fms-2024.01
 
 export perl_ver=5.38.2
 
diff --git a/versions/run.hera.ver b/versions/run.hera.ver
index d04777eb5ce..5df640bfec6 100644
--- a/versions/run.hera.ver
+++ b/versions/run.hera.ver
@@ -1,6 +1,6 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev-rocky8
+export spack_env=gsi-addon-dev-fms-2024.01
 
 export hpss_ver=hpss
 export ncl_ver=6.6.2
diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver
index b3e2d747ba6..7ba02511335 100644
--- a/versions/run.hercules.ver
+++ b/versions/run.hercules.ver
@@ -1,7 +1,7 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
-export spack_env=gsi-addon-env
+export spack_env=gsi-addon-dev-fms-2024.01
 export globus_cli_ver=3.27
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
index 98ec2b36f95..0b95ba246a0 100644
--- a/versions/run.noaacloud.ver
+++ b/versions/run.noaacloud.ver
@@ -6,3 +6,9 @@ source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack-rocky8/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 
 export cdo_ver=2.2.0
+
+# modules updated in spack.ver for gsi-addon-dev-fms-2024.01
+export export esmf_ver=8.5.0
+export g2tmpl_ver=1.10.2
+
+
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
index 13667fedaa6..4cccb09b7e1 100644
--- a/versions/run.orion.ver
+++ b/versions/run.orion.ver
@@ -1,7 +1,7 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
-export spack_env=gsi-addon-env-rocky9
+export spack_env=gsi-addon-dev-fms-2024.01
 export globus_cli_ver=3.27
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/spack.ver b/versions/spack.ver
index 43236d39122..27d889d1b09 100644
--- a/versions/spack.ver
+++ b/versions/spack.ver
@@ -5,7 +5,7 @@ export python_ver=3.11.6
 export jasper_ver=2.0.32
 export libpng_ver=1.6.37
 export zlib_ver=1.2.13
-export esmf_ver=8.5.0
+export esmf_ver=8.6.0
 export fms_ver=2023.02.01
 export cdo_ver=2.2.0
 export nco_ver=5.0.6
@@ -23,7 +23,7 @@ export g2_ver=3.4.5
 export sp_ver=2.5.0
 export ip_ver=4.3.0
 export gsi_ncdiag_ver=1.1.2
-export g2tmpl_ver=1.10.2
+export g2tmpl_ver=1.13.0
 export crtm_ver=2.4.0.1
 export wgrib2_ver=2.0.8
 export grib_util_ver=1.3.0