diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index da8e2d8096..1ab730c30e 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -44,20 +44,15 @@ elif [[ -d /scratch1 ]] ; then
   # set NETCDF variable based on ncdump location
   NETCDF=$( which ncdump )
   export NETCDF
-  # prod_util stuff, find a better solution later...
-  module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/compiler/intel/2022.1.2/
-  module load prod_util
 elif [[ -d /work ]] ; then
-  # We are on MSU Orion
-  # prod_util stuff, find a better solution later...
-  #module use /apps/contrib/NCEP/hpc-stack/libs/hpc-stack/modulefiles/compiler/intel/2022.1.2/
-  #module load prod_util
-  export UTILROOT=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2
-  export MDATE=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/mdate
-  export NDATE=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/ndate
-  export NHOUR=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/nhour
-  export FSYNC=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/fsync_file
-  module load "${MODS}/orion"
+  # We are on MSU Orion or Hercules
+  if [[ -d /apps/other ]] ; then
+     # Hercules
+     module load "${MODS}/hercules"
+  else
+     # Orion
+     module load "${MODS}/orion"
+  fi
   # set NETCDF variable based on ncdump location
   ncdump=$( which ncdump )
   NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )