diff --git a/modulefiles/prod_util/gaea.lua b/modulefiles/prod_util/gaea.lua
new file mode 100644
index 000000000..ed170ff0c
--- /dev/null
+++ b/modulefiles/prod_util/gaea.lua
@@ -0,0 +1,28 @@
+-- -*- lua -*-
+-- Module file created by spack (https://github.com/spack/spack) on 2024-06-28 14:08:47.507927
+--
+-- prod-util@2.1.1%intel@2023.2.0~ipo build_system=cmake build_type=Release generator=make arch=linux-sles15-zen3/ynnwpz3
+--
+
+whatis([[Name : prod-util]])
+whatis([[Version : 2.1.1]])
+whatis([[Target : zen3]])
+whatis([[Short description :  Product utilities for the NCEP models.]])
+
+help([[Name   : prod-util]])
+help([[Version: 2.1.1]])
+help([[Target : zen3]])
+help()
+help([[ Product utilities for the NCEP models. This is part of NOAA's NCEPLIBS
+project.]])
+
+prepend_path("PATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin", ":")
+prepend_path("CMAKE_PREFIX_PATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/.", ":")
+prepend_path("PATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin", ":")
+prepend_path("CMAKE_PREFIX_PATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/.", ":")
+setenv("prod_util_ROOT", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3")
+setenv("MDATE", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin/mdate")
+setenv("NDATE", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin/ndate")
+setenv("NHOUR", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin/nhour")
+setenv("FSYNC", "/autofs/ncrc-svm1_proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/intel/2023.2.0/prod-util-2.1.1-ynnwpz3/bin/fsync_file")
+
diff --git a/modulefiles/rrfs/gaea.intel.lua b/modulefiles/rrfs/gaea.intel.lua
new file mode 100644
index 000000000..792b2bac7
--- /dev/null
+++ b/modulefiles/rrfs/gaea.intel.lua
@@ -0,0 +1,18 @@
+help([[
+This module loads libraries for rrfs-workflow
+]])
+
+whatis([===[Loads libraries for rrfs-workflow ]===])
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+load("stack-intel/2023.2.0")
+load("stack-cray-mpich/8.1.29")
+load("cmake/3.23.1")
+load("parallel-netcdf/1.12.2")
+load("parallelio/2.5.10")
+
+setenv("PIO", os.getenv("parallelio_ROOT"))
+
+setenv("CMAKE_C_COMPILER", "cc")
+setenv("CMAKE_CXX_COMPILER", "CC")
+setenv("CMAKE_Fortran_COMPILER", "fn")
diff --git a/sorc/MPASSIT b/sorc/MPASSIT
index 0af95df93..a1859eb49 160000
--- a/sorc/MPASSIT
+++ b/sorc/MPASSIT
@@ -1 +1 @@
-Subproject commit 0af95df93aaadccb7a1432fc87f3f3aa537d0069
+Subproject commit a1859eb4948fe363b4db311a1d27af24a7b4e964
diff --git a/sorc/UPP b/sorc/UPP
index fb6a965a3..72108ee2d 160000
--- a/sorc/UPP
+++ b/sorc/UPP
@@ -1 +1 @@
-Subproject commit fb6a965a33be6aba21a1b612d26a93ead934542d
+Subproject commit 72108ee2dab07c5244597e02c26d27e47705b01d
diff --git a/sorc/build.mpas b/sorc/build.mpas
index fd2572751..bc05a42d9 100755
--- a/sorc/build.mpas
+++ b/sorc/build.mpas
@@ -25,9 +25,10 @@ module list
 
 cd ${HOMErrfs}/sorc/MPAS-Model
 make clean CORE=init_atmosphere
-make -j8 intel-mpi CORE=init_atmosphere PRECISION=single
+#make -j8 intel-mpi CORE=atmosphere PRECISION=single # intel-mpi does not work on Gaea
+make -j8 ifort CORE=init_atmosphere PRECISION=single
 make clean CORE=atmosphere
-make -j8 intel-mpi CORE=atmosphere PRECISION=single
+make -j8 ifort CORE=atmosphere PRECISION=single
 
 mkdir -p ${HOMErrfs}/exec
 echo "copy ${EXEC} to ../exec/init_atmosphere_model.x"
diff --git a/sorc/build.wps b/sorc/build.wps
index 47cca9b05..d065917a1 100755
--- a/sorc/build.wps
+++ b/sorc/build.wps
@@ -29,6 +29,8 @@ cd ${HOMErrfs}/sorc/WPS
 ./clean
 if [ "${MACHINE}" = "wcoss2" ]; then
   cp ../configure.wps_wcoss2 configure.wps
+elif [ "${MACHINE}" = "gaea" ]; then
+  echo "23" | ./configure --nowrf
 else
   echo "19" | ./configure --nowrf
 fi
diff --git a/workflow/ush/detect_machine.sh b/workflow/ush/detect_machine.sh
index c72249b37..f3e0ecff6 100755
--- a/workflow/ush/detect_machine.sh
+++ b/workflow/ush/detect_machine.sh
@@ -10,10 +10,10 @@ case $(hostname -f) in
   dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE=wcoss2 ;; ### dogwood01-9
   dlogin10.dogwood.wcoss2.ncep.noaa.gov)     MACHINE=wcoss2 ;; ### dogwood10
 
-  gaea9)               MACHINE=gaea ;; ### gaea9
-  gaea1[0-6])          MACHINE=gaea ;; ### gaea10-16
-  gaea9.ncrc.gov)      MACHINE=gaea ;; ### gaea9
-  gaea1[0-6].ncrc.gov) MACHINE=gaea ;; ### gaea10-16
+  gaea|gaea5[1-8])     MACHINE=gaea ;;
+  gaea6[1-8])          MACHINE=gaea ;;
+  gaea.ncrc.gov|gaea5[1-8].ncrc.gov) MACHINE=gaea ;;
+  gaea6[1-8].ncrc.gov)               MACHINE=gaea ;;
 
   hfe0[1-9]) MACHINE=hera ;; ### hera01-09
   hfe1[0-2]) MACHINE=hera ;; ### hera10-12
@@ -66,8 +66,11 @@ if [[ "${MACHINE}" == "UNKNOWN" ]]; then
     else
       MACHINE=orion
     fi
-  elif [[ -d /gpfs && -d /ncrc ]]; then
-    # We are on GAEA.
+  elif [[ -d /gpfs/f5 && -d /ncrc ]]; then
+    # We are on GAEA
+    MACHINE=gaea
+  elif [[ -d /gpfs/f6 && -d /ncrc ]]; then
+    # We are on GAEA
     MACHINE=gaea
   elif [[ -d /data/prod ]]; then
     # We are on SSEC's S4
diff --git a/workflow/ush/init.sh b/workflow/ush/init.sh
index f96298c3d..47e824a61 100755
--- a/workflow/ush/init.sh
+++ b/workflow/ush/init.sh
@@ -17,6 +17,15 @@ case ${MACHINE} in
   orion|hercules)
     FIX_RRFS_LOCATION=/work/noaa/zrtrr/FIX_RRFS2
     ;;
+  gaea)
+    if [[ -d /gpfs/f5 ]]; then
+      FIX_RRFS_LOCATION=/gpfs/f5/gsl-glo/world-shared/role.rrfsfix/FIX_RRFS2
+    elif [[ -d /gpfs/f6 ]]; then
+      FIX_RRFS_LOCATION=/gpfs/f6/bil-fire10-oar/world-shared/role.rrfsfix/FIX_RRFS2
+    else
+      echo "unsupported gaea cluster: ${MACHINE}"
+    fi
+    ;;
   *)
     FIX_RRFS_LOCATION=/unknown/location
     echo "platform not supported: ${MACHINE}"