diff --git a/modulefiles/modulefile.ww3.hera.lua b/modulefiles/modulefile.ww3.hera.lua
deleted file mode 100644
index 9b1ab7492ed..00000000000
--- a/modulefiles/modulefile.ww3.hera.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-help([[
-Build environment for WW3 on Hera
-]])
-
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
-
-load(pathJoin("hpc", "1.1.0"))
-load(pathJoin("hpc-intel", "2022.1.2"))
-load(pathJoin("hpc-impi", "2022.1.2"))
-
-load(pathJoin("cmake", "3.20.1"))
-
-load(pathJoin("jasper", "2.0.25"))
-load(pathJoin("zlib", "1.2.11"))
-load(pathJoin("libpng", "1.6.37"))
-
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.5"))
-
-load(pathJoin("hdf5", "1.10.6"))
-load(pathJoin("netcdf", "4.7.4"))
-
-load(pathJoin("w3emc", "2.9.2"))
diff --git a/modulefiles/modulefile.ww3.orion.lua b/modulefiles/modulefile.ww3.orion.lua
deleted file mode 100644
index de1da6b4f95..00000000000
--- a/modulefiles/modulefile.ww3.orion.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-help([[
-Build environment for WW3 on Orion 
-]])
-
-prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
-
-load(pathJoin("hpc", "1.1.0"))
-load(pathJoin("hpc-intel", "2022.1.2"))
-load(pathJoin("hpc-impi", "2022.1.2"))
-
-load("contrib")
-load("noaatools")
-load(pathJoin("cmake", "3.22.1"))
-
-load(pathJoin("jasper", "2.0.25"))
-load(pathJoin("zlib", "1.2.11"))
-load(pathJoin("libpng", "1.6.37"))
-
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.5"))
-
-load(pathJoin("hdf5", "1.10.6"))
-load(pathJoin("netcdf", "4.7.4"))
-
-load(pathJoin("w3emc", "2.9.2"))
diff --git a/modulefiles/modulefile.ww3.s4.lua b/modulefiles/modulefile.ww3.s4.lua
deleted file mode 100644
index 0a8dcb25ff5..00000000000
--- a/modulefiles/modulefile.ww3.s4.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-help([[
-Build environment for WW3 on S4
-]])
-
-load("license_intel")
-prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
-load(pathJoin("hpc", "1.1.0"))
-load(pathJoin("hpc-intel", "18.0.4"))
-load(pathJoin("hpc-impi", "18.0.4"))
-
-load(pathJoin("jasper", "2.0.25"))
-load(pathJoin("zlib", "1.2.11"))
-load(pathJoin("png", "1.6.35"))
-
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.1"))
-
-load(pathJoin("hdf5", "1.10.6"))
-load(pathJoin("netcdf", "4.7.4"))
-
-load(pathJoin("w3emc", "2.9.2"))
diff --git a/modulefiles/modulefile.ww3.wcoss2.lua b/modulefiles/modulefile.ww3.wcoss2.lua
deleted file mode 100644
index 3536428d31f..00000000000
--- a/modulefiles/modulefile.ww3.wcoss2.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-help([[
-Build environment for WW3 on WCOSS2 
-]])
-
-load(pathJoin("PrgEnv-intel", "8.1.0"))
-load(pathJoin("craype", "2.7.10"))
-load(pathJoin("intel", "19.1.3.304"))
-load(pathJoin("cray-mpich", "8.1.9"))
-
-load(pathJoin("cmake", "3.20.2"))
-
-load(pathJoin("jasper", "2.0.25"))
-load(pathJoin("zlib", "1.2.11"))
-load(pathJoin("libpng", "1.6.37"))
-
-load(pathJoin("bacio", "2.4.1"))
-load(pathJoin("g2", "3.4.5"))
-
-load(pathJoin("hdf5", "1.10.6"))
-load(pathJoin("netcdf", "4.7.4"))
-
-load(pathJoin("w3emc", "2.9.2"))
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index 162c5ae427b..3acebb73474 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -73,11 +73,11 @@ fi
 #------------------------------------
 # GET MACHINE
 #------------------------------------
-target=""
+export COMPILER="intel"
 # shellcheck disable=SC1091
-source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
+source gfs_utils.fd/ush/detect_machine.sh
 # shellcheck disable=
-if [[ -z "${target}" ]]; then
+if [[ -z "${MACHINE_ID}" ]]; then
   echo "FATAL: Unable to determine target machine"
   exit 1
 fi
@@ -88,7 +88,7 @@ fi
 # shellcheck source-path=sorc
 source ./partial_build.sh $_verbose_opt $_partial_opt
 
-if [[ ${target} == "jet" ]]; then
+if [[ ${MACHINE_ID} =~ jet.* ]]; then
   Build_gldas="false"
   Build_ww3_prepost="false"
 fi
diff --git a/sorc/build_gdas.sh b/sorc/build_gdas.sh
index c167c246f1c..468516ff43a 100755
--- a/sorc/build_gdas.sh
+++ b/sorc/build_gdas.sh
@@ -5,14 +5,16 @@ script_dir=$(dirname "${BASH_SOURCE[0]}")
 cd "${script_dir}" || exit 1
 
 # shellcheck disable=SC1091
-source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
+source gfs_utils.fd/ush/detect_machine.sh
 # shellcheck disable=
 
-export BUILD_TARGET="${target}"
+# detect_machine now includes the compiler on some machines
+#   but the GDAS build script does not want it
+MACHINE_ID=$(echo "${MACHINE_ID}" | cut -d "." -f 1)
 
 # use more build jobs if on NOAA HPC
 build_jobs=4
-case "${target}" in
+case "${MACHINE_ID}" in
   hera|orion)
     build_jobs=10
     ;;
@@ -24,7 +26,7 @@ if [ ! -d "../exec" ]; then
 fi
 
 cd gdas.cd
-BUILD_JOBS="${build_jobs}" ./build.sh -t "${BUILD_TARGET}"
+BUILD_JOBS="${build_jobs}" ./build.sh -t "${MACHINE_ID}"
 
 exit
 
diff --git a/sorc/build_ww3prepost.sh b/sorc/build_ww3prepost.sh
index c80ed108a7f..786eeaa7cbf 100755
--- a/sorc/build_ww3prepost.sh
+++ b/sorc/build_ww3prepost.sh
@@ -4,8 +4,9 @@ set -x
 script_dir=$(dirname "${BASH_SOURCE[0]}")
 cd "${script_dir}" || exit 1
 
+export RT_COMPILER="intel"
 # shellcheck disable=SC1091
-source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
+source ${script_dir}/ufs_model.fd/tests/detect_machine.sh
 # shellcheck disable=
 
 # Default settings
@@ -44,8 +45,8 @@ finalexecdir=$( pwd -P )/../exec
 
 #Determine machine and load modules
 set +x
-module use ../modulefiles
-module load modulefile.ww3.${target}
+module use "${script_dir}/ufs_model.fd/modulefiles"
+module load "ufs_${MACHINE_ID}"
 set -x
 
 #Set WW3 directory, switch, prep and post exes 
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
old mode 100644
new mode 100755