diff --git a/ci/platforms/config.noaacloud b/ci/platforms/config.noaacloud
new file mode 100644
index 0000000000..5303f24860
--- /dev/null
+++ b/ci/platforms/config.noaacloud
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+export HPC_ACCOUNT=${USER}
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index b2f4e6ce0e..33b440f242 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -108,6 +108,9 @@ fi
 #------------------------------------
 # TODO: Commented out until components aligned for build
 #source ../versions/build.ver
+if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
+   source "../versions/build.${MACHINE_ID}.ver"
+fi
 
 #------------------------------------
 # Exception Handling Init
diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh
index 44c8c7a2ad..bacbf9fd85 100755
--- a/sorc/build_ufs.sh
+++ b/sorc/build_ufs.sh
@@ -41,6 +41,14 @@ COMPILE_NR=0
 CLEAN_BEFORE=YES
 CLEAN_AFTER=NO
 
+#TODO temp patch for build update for noaacload in advance of updating ufs_module.fd repo for global-workflow building
+if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
+    patched=$(grep upp-addon-env modulefiles/ufs_noaacloud.intel.lua; echo $?)
+    if [[ ${patched} == "1" ]] ; then
+       patch -R modulefiles/ufs_noaacloud.intel.lua ../ufs_noaacloud.intel.diff
+    fi   
+fi
+
 BUILD_JOBS=${BUILD_JOBS:-8} ./tests/compile.sh "${MACHINE_ID}" "${MAKE_OPT}" "${COMPILE_NR}" "intel" "${CLEAN_BEFORE}" "${CLEAN_AFTER}"
 mv "./tests/fv3_${COMPILE_NR}.exe" ./tests/ufs_model.x
 mv "./tests/modules.fv3_${COMPILE_NR}.lua" ./tests/modules.ufs_model.lua
diff --git a/sorc/ufs_noaacloud.intel.diff b/sorc/ufs_noaacloud.intel.diff
new file mode 100644
index 0000000000..5080781641
--- /dev/null
+++ b/sorc/ufs_noaacloud.intel.diff
@@ -0,0 +1,10 @@
+--- ufs_noaacloud.intel.lua	2024-10-03 15:54:33.334583588 +0000
++++ ufs_model.fd/modulefiles/ufs_noaacloud.intel.lua	2024-10-03 16:11:28.534275972 +0000
+@@ -3,7 +3,6 @@
+ ]])
+ 
+ prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+ 
+ stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
+ load(pathJoin("stack-intel", stack_intel_ver))
diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh
index ff6f64cece..8c8cec0648 100755
--- a/ush/load_fv3gfs_modules.sh
+++ b/ush/load_fv3gfs_modules.sh
@@ -13,14 +13,28 @@ ulimit_s=$( ulimit -S -s )
 source "${HOMEgfs}/ush/detect_machine.sh"
 source "${HOMEgfs}/ush/module-setup.sh"
 
-# Source versions file for runtime
-source "${HOMEgfs}/versions/run.ver"
-
 # Load our modules:
 module use "${HOMEgfs}/modulefiles"
 
 case "${MACHINE_ID}" in
-  "wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4" | "noaacloud")
+  "noaacloud")
+    #TODO this is a total kludge to get epic mount point for compute nodes
+    #    to be the same as the login node.  This should be workng from in the
+    #    ALLNODES section of the User Bootstrap of Parllel Works but it doen't
+    #    on the Rokcky Clusters (works fine in the Centos 7 cluster)
+    if [[ ! -d  /contrib-epic/EPIC ]]; then
+      /contrib/Terry.McGuinness/SETUP/mount-epic-contrib.sh
+      sudo systemctl daemon-reload
+    fi
+    # Check if the OS is Rocky or CentOS
+    OS_NAME=$(grep -E '^ID=' /etc/os-release | sed -E 's/ID="?([^"]*)"?/\1/') || true
+    # Source versions file for runtime
+    source "${HOMEgfs}/versions/run.${MACHINE_ID}.${OS_NAME}.ver"
+    module load "module_base.${MACHINE_ID}"
+    ;;
+  "wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4")
+    # Source versions file for runtime
+    source "${HOMEgfs}/versions/run.${MACHINE_ID}.ver"
     module load "module_base.${MACHINE_ID}"
     ;;
   *)
diff --git a/versions/run.noaacloud.centos.ver b/versions/run.noaacloud.centos.ver
new file mode 100644
index 0000000000..5a9b2b6fc5
--- /dev/null
+++ b/versions/run.noaacloud.centos.ver
@@ -0,0 +1,12 @@
+export stack_intel_ver=2021.3.0
+export stack_impi_ver=2021.3.0
+export spack_env=gsi-addon-env
+
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+
+export g2tmpl_ver=1.10.2
+export jasper_ver=2.0.32
+export wgrib2_ver=2.0.8
+export cdo_ver=1.9.5
+export nco_ver=4.9.3
diff --git a/versions/run.noaacloud.rocky.ver b/versions/run.noaacloud.rocky.ver
new file mode 100644
index 0000000000..0f2a815dec
--- /dev/null
+++ b/versions/run.noaacloud.rocky.ver
@@ -0,0 +1,12 @@
+export stack_intel_ver=2021.3.0
+export stack_impi_ver=2021.3.0
+export spack_env=gsi-addon-env
+
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+
+export g2tmpl_ver=1.10.2
+export wgrib2_ver=3.1.2_wmo
+export cdo_ver=2.3.0
+export jasper_ver=4.2.0
+export nco_ver=5.1.6
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
index 1fc3779b2e..0f2a815dec 100644
--- a/versions/run.noaacloud.ver
+++ b/versions/run.noaacloud.ver
@@ -5,4 +5,8 @@ export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 
-export cdo_ver=2.2.0
+export g2tmpl_ver=1.10.2
+export wgrib2_ver=3.1.2_wmo
+export cdo_ver=2.3.0
+export jasper_ver=4.2.0
+export nco_ver=5.1.6
diff --git a/versions/spack.ver b/versions/spack.ver
index 1f553134f0..dbe304a5fe 100644
--- a/versions/spack.ver
+++ b/versions/spack.ver
@@ -6,7 +6,7 @@ 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 fms_ver=2023.02.01
+export fms_ver=2023.04
 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