diff --git a/README.md b/README.md
index a3c6aef0..7c1c0afa 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,8 @@ EMC_verif-global is supported on the following machines:
 * Orion
 * S4
 * Jet
+* Gaea-C5
+* Gaea-C6
 
 For questions or issues, please e-mail Mallory Row at mallory.row@noaa.gov.
 
diff --git a/modulefiles/emc_verif_global_gaeac5.lua b/modulefiles/emc_verif_global_gaeac5.lua
index 71b8a253..a384f0dd 100644
--- a/modulefiles/emc_verif_global_gaeac5.lua
+++ b/modulefiles/emc_verif_global_gaeac5.lua
@@ -1,72 +1,38 @@
 help([[
-Load environment to run EMC_verif-global on Gaea C5 using Intel
+Load environment to run EMC_verif-global on Gaea-C5 using Intel
 ]])
 
-prepend_path("MODULEPATH", "/sw/rdtn/modulefiles")
-load("hsi")
-
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
-load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+Core_ver=os.getenv("Core_ver") or "24.10"
+load(pathJoin("Core", Core_ver))
+
+prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
+load(pathJoin("prod_util", prod_util_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-load(pathJoin("cmake", cmake_ver))
+grib_util_ver=os.getenv("grib_util_ver") or "1.3.0"
+load(pathJoin("grib-util", grib_util_ver))
 
+intel_oneapi_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
 load(pathJoin("netcdf-c", netcdf_c_ver))
 
-netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
-load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
-
-nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
-load(pathJoin("nccmp", nccmp_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
-load(pathJoin("esmf", esmf_ver))
-
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.1.9"
 load(pathJoin("nco", nco_ver))
 
-grads_ver=os.getenv("grads_ver","2.2.3")
-load(pathJoin("grads",grads_ver))
-
-imagemagick_ver=os.getenv("imagemagick_ver","7.1.1-11")
-load(pathJoin("imagemagick",imagemagick_ver))
+grads_ver=os.getenv("grads_ver") or "2.2.3"
+load(pathJoin("grads", grads_ver))
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+imagemagick_ver=os.getenv("imagemagick_ver") or "7.1.1-29"
+load(pathJoin("imagemagick", imagemagick_ver))
 
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-load(pathJoin("hpc", hpc_ver))
-
-hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
-load(pathJoin("hpc-intel", hpc_intel_ver))
-
-hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
-load(pathJoin("hpc-impi", impi_ver))
-
-prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
-load(pathJoin("prod_util", prod_util_ver))
-
-grib_util_ver=os.getenv("grib_util_ver") or "1.2.3"
-load(pathJoin("grib_util", grib_util_ver))
-
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-anaconda_ver=os.getenv("anaconda_ver") or "latest"
-load(pathJoin("anaconda", anaconda_ver))
-
-prepend_path("MODULEPATH", "/contrib/met/modulefiles")
-
-met_ver=os.getenv("met_ver") or "9.1"
+met_ver=os.getenv("met_ver") or "9.1.3"
 load(pathJoin("met", met_ver))
 
-prepend_path("MODULEPATH", "/contrib/METplus/modulefiles")
-
-metplus_ver=os.getenv("metplus_ver") or "3.1"
+metplus_ver=os.getenv("metplus_ver") or "3.1.1"
 load(pathJoin("metplus", metplus_ver))
diff --git a/modulefiles/emc_verif_global_gaeac6.lua b/modulefiles/emc_verif_global_gaeac6.lua
index 71b8a253..4d7195dd 100644
--- a/modulefiles/emc_verif_global_gaeac6.lua
+++ b/modulefiles/emc_verif_global_gaeac6.lua
@@ -1,72 +1,38 @@
 help([[
-Load environment to run EMC_verif-global on Gaea C5 using Intel
+Load environment to run EMC_verif-global on Gaea-C6 using Intel
 ]])
 
-prepend_path("MODULEPATH", "/sw/rdtn/modulefiles")
-load("hsi")
-
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
-load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+Core_ver=os.getenv("Core_ver") or "24.11"
+load(pathJoin("Core", Core_ver))
+
+prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
+load(pathJoin("prod_util", prod_util_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-load(pathJoin("cmake", cmake_ver))
+grib_util_ver=os.getenv("grib_util_ver") or "1.3.0"
+load(pathJoin("grib-util", grib_util_ver))
 
+intel_oneapi_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
 load(pathJoin("netcdf-c", netcdf_c_ver))
 
-netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
-load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
-
-nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
-load(pathJoin("nccmp", nccmp_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
-load(pathJoin("esmf", esmf_ver))
-
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.1.9"
 load(pathJoin("nco", nco_ver))
 
-grads_ver=os.getenv("grads_ver","2.2.3")
-load(pathJoin("grads",grads_ver))
-
-imagemagick_ver=os.getenv("imagemagick_ver","7.1.1-11")
-load(pathJoin("imagemagick",imagemagick_ver))
+grads_ver=os.getenv("grads_ver") or "2.2.3"
+load(pathJoin("grads", grads_ver))
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+imagemagick_ver=os.getenv("imagemagick_ver") or "7.1.1-29"
+load(pathJoin("imagemagick", imagemagick_ver))
 
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-load(pathJoin("hpc", hpc_ver))
-
-hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
-load(pathJoin("hpc-intel", hpc_intel_ver))
-
-hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
-load(pathJoin("hpc-impi", impi_ver))
-
-prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
-load(pathJoin("prod_util", prod_util_ver))
-
-grib_util_ver=os.getenv("grib_util_ver") or "1.2.3"
-load(pathJoin("grib_util", grib_util_ver))
-
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-anaconda_ver=os.getenv("anaconda_ver") or "latest"
-load(pathJoin("anaconda", anaconda_ver))
-
-prepend_path("MODULEPATH", "/contrib/met/modulefiles")
-
-met_ver=os.getenv("met_ver") or "9.1"
+met_ver=os.getenv("met_ver") or "9.1.3"
 load(pathJoin("met", met_ver))
 
-prepend_path("MODULEPATH", "/contrib/METplus/modulefiles")
-
-metplus_ver=os.getenv("metplus_ver") or "3.1"
-load(pathJoin("metplus", metplus_ver))
+metplus_ver=os.getenv("metplus_ver") or "3.1.1"
+load(pathJoin("metplus", metplus_ver))
\ No newline at end of file
diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy
index 70748bb0..27e6db72 100644
--- a/parm/config/config.vrfy
+++ b/parm/config/config.vrfy
@@ -31,9 +31,9 @@ echo "BEGIN: $(basename ${BASH_SOURCE[0]})"
 #RUN_MAPSDA:          run to make analysis maps of time-mean increments, ENKF ensemble mean and ensemble spread
 export RUN_GRID2GRID_STEP1="YES"
 export RUN_GRID2GRID_STEP2="NO"
-export RUN_GRID2OBS_STEP1="NO"
+export RUN_GRID2OBS_STEP1="YES"
 export RUN_GRID2OBS_STEP2="NO"
-export RUN_PRECIP_STEP1="NO"
+export RUN_PRECIP_STEP1="YES"
 export RUN_PRECIP_STEP2="NO"
 export RUN_SATELLITE_STEP1="NO"
 export RUN_SATELLITE_STEP2="NO"
@@ -53,16 +53,16 @@ export RUN_MAPSDA="NO"
 #model_hpss_dir_list:    HPSS directory of data
 #model_data_run_hpss:    get files from HPSS ("YES") if not online
 #hpss_walltime:          how long to run HPSS job to get data in minutes
-export model_list="C96_TEST_NEW"
-export model_dir_list="/gpfs/f5/epic/scratch/$USER/archive"
-export model_stat_dir_list="/gpfs/f5/epic/scratch/$USER/archive"
-export model_file_format_list="pgbf{lead?fmt=%2H}.gfs.{init?fmt=%Y%m%d%H}.grib2"
+export model_list="gfs"
+export model_dir_list="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data"
+export model_stat_dir_list="/lfs/h2/emc/vpppg/noscrub/$USER/archive"
+export model_file_format_list="pgbf{lead?fmt=%2H}.gfs.{init?fmt=%Y%m%d%H}"
 export model_data_run_hpss="NO"
 export model_hpss_dir_list="/NCEPPROD/hpssprod/runhistory"
 export hpss_walltime="10"
 ## OUTPUT DATA SETTINGS
 #OUTPUTROOT: base output directory
-export OUTPUTROOT="/gpfs/f5/epic/scratch/$USER/verif_global_standalone"
+export OUTPUTROOT="/lfs/h2/emc/stmp/$USER/verif_global_standalone"
 ## DATE SETTINGS
 #start_date:          verification start date, format YYYYMMDD
 #end_date:            verification end date, format YYYYMMDD
@@ -70,8 +70,8 @@ export OUTPUTROOT="/gpfs/f5/epic/scratch/$USER/verif_global_standalone"
 #spinup_period_end:   spinup period end, format YYYYMMDDHH, if none use "NA"
 #make_met_data_by:    how to treat dates, "VALID" or "INIT"
 #plot_by:             how to plot data, "VALID" or "INIT"
-export start_date=20210323
-export end_date=20210323
+export start_date=$(date -d "24 hours ago" '+%Y%m%d')
+export end_date=$(date -d "24 hours ago" '+%Y%m%d')
 export spinup_period_start="NA"
 export spinup_period_end="NA"
 export make_met_data_by="VALID"
diff --git a/scripts/exgrid2obs_step1.sh b/scripts/exgrid2obs_step1.sh
index 9d6b4f9f..1d4c11a4 100755
--- a/scripts/exgrid2obs_step1.sh
+++ b/scripts/exgrid2obs_step1.sh
@@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
         if [ $machine = WCOSS2 ]; then
             export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
             launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
-        elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
+        elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
             launcher="srun --export=ALL --multi-prog"
         fi
         $launcher $MP_CMDFILE
diff --git a/ush/build_webpage.py b/ush/build_webpage.py
index 94e6b952..dce95af8 100644
--- a/ush/build_webpage.py
+++ b/ush/build_webpage.py
@@ -946,12 +946,12 @@ def tropcyc_write_template_body2(template_filename):
                   +'--job-name='+web_job_name+' '+web_job_filename)
 elif machine == 'GAEAC5':
     os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' '
-                  +'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
+                  +'--clusters='+CLUSTERS+' --account='+ACCOUNT+' '
                   +'--output='+web_job_output+' '
                   +'--job-name='+web_job_name+' '+web_job_filename)
 elif machine == 'GAEAC6':
     os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' '
-                  +'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
+                  +'--clusters='+CLUSTERS+' --account='+ACCOUNT+' '
                   +'--output='+web_job_output+' '
                   +'--job-name='+web_job_name+' '+web_job_filename)
 elif machine == 'JET':
@@ -963,7 +963,7 @@ def tropcyc_write_template_body2(template_filename):
                   +'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
                   +'--output='+web_job_output+' '
                   +'--job-name='+web_job_name+' '+web_job_filename)
-elif machine in ["ORION", "HERCULES", "S4"]:
+elif machine in ["ORION", "HERCULES", "S4","GAEAC5","GAEAC6"]:
     if webhost == 'emcrzdm.ncep.noaa.gov':
         print("ERROR: Currently " + machine + " cannot connect to "+webhost)
     else:
diff --git a/ush/get_data_files.py b/ush/get_data_files.py
index f22e0e8f..f2466e91 100644
--- a/ush/get_data_files.py
+++ b/ush/get_data_files.py
@@ -462,7 +462,7 @@ def get_hpss_data(hpss_job_filename, save_data_dir, save_data_file,
                          +hpss_job_name+' -t R,PD -h | wc -l')
     elif machine in ['ORION', 'S4', 'HERCULES', 'GAEAC5', 'GAEAC6']:
         print("ERROR: No HPSS access from "+machine)
-    if machine not in ['ORION', 'S4', 'HERCULES']:
+    if machine not in ['ORION', 'S4', 'HERCULES', 'GAEAC5', 'GAEAC6']:
         sleep_counter, sleep_checker = 1, 10
         while (sleep_counter*sleep_checker) <= walltime_seconds:
             sleep(sleep_checker)
diff --git a/ush/get_machine.py b/ush/get_machine.py
index 02acb1ac..dddc27b4 100644
--- a/ush/get_machine.py
+++ b/ush/get_machine.py
@@ -58,7 +58,7 @@
     s4_match = re.match(re.compile(r"s4-submit.ssec.wisc.edu"), hostname)
     jet_match = re.match(re.compile(r"^fe[0-9]{1}"), hostname)
     gaeac5_match = re.match(re.compile(r"^gaea5[1-8]{1}"), hostname)
-    gaeac6_match = re.match(re.compile(r"^gaea6[1-8]{1}"), hostname) 
+    gaeac6_match = re.match(re.compile(r"^gaea6[1-8]{1}"), hostname)
     if cactus_match or dogwood_match or cactus_match2 or dogwood_match2:
         machine = 'WCOSS2'
     elif hera_match:
@@ -75,7 +75,7 @@
         machine = 'GAEAC5'
     elif gaeac6_match:
         machine = 'GAEAC6'
-else:
+    else:
         print("Cannot find match for "+hostname)
         sys.exit(1)
 
diff --git a/ush/load_modules.sh b/ush/load_modules.sh
index 37c80c7d..f62ee798 100755
--- a/ush/load_modules.sh
+++ b/ush/load_modules.sh
@@ -63,13 +63,13 @@ elif [ $machine = HERA ]; then
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
     fi
-elif [ $machine = GAEAC5 ]; then
-    source /apps/lmod/lmod/init/sh
+elif [ $machine = ORION ]; then
+    source /apps/other/lmod/lmod/init/sh
     module purge
     module use ${HOMEverif_global}/modulefiles
-    module load emc_verif_global_gaeac5
+    module load emc_verif_global_orion
     if [ $MET_version = 9.1 ]; then
-        export HOMEMET="/contrib/met/9.1"
+        export HOMEMET="$MET_ROOT"
         export HOMEMET_bin_exec="bin"
     else
         "ERROR: $MET_version is not supported on $machine"
@@ -81,31 +81,34 @@ elif [ $machine = GAEAC5 ]; then
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
     fi
-elif [ $machine = GAEAC6 ]; then
-    source /apps/lmod/lmod/init/sh
+    export PYTHONPATH=/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.0_py3.8/lib/python3.8/site-packages
+elif [ $machine = HERCULES ]; then
+    "ERROR: EMC_Verif-Global standalone not supported on $machine"
+    exit 1
+elif [ $machine = S4 ]; then
+    source /usr/share/lmod/lmod/init/sh
     module purge
-    module use ${HOMEverif_global}/modulefiles
-    module load emc_verif_global_gaeac6
     if [ $MET_version = 9.1 ]; then
-        export HOMEMET="/contrib/met/9.1"
+        export HOMEMET="/data/prod/glopara/contrib/MET/met-9.1.3"
         export HOMEMET_bin_exec="bin"
     else
         "ERROR: $MET_version is not supported on $machine"
         exit 1
     fi
     if [ $METplus_version = 3.1 ]; then
-        export HOMEMETplus="${METPLUS_PATH}"
+        export HOMEMETplus="/data/prod/glopara/contrib/METplus/METplus-3.1.1"
     else
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
     fi
-elif [ $machine = ORION ]; then
-    source /apps/other/lmod/lmod/init/sh
-    module purge
     module use ${HOMEverif_global}/modulefiles
-    module load emc_verif_global_orion
+    module load emc_verif_global_s4
+elif [ $machine = JET ]; then
+    source /apps/lmod/lmod/init/sh
+    module use ${HOMEverif_global}/modulefiles
+    module load emc_verif_global_jet
     if [ $MET_version = 9.1 ]; then
-        export HOMEMET="$MET_ROOT"
+        export HOMEMET="/contrib/met/9.1"
         export HOMEMET_bin_exec="bin"
     else
         "ERROR: $MET_version is not supported on $machine"
@@ -117,41 +120,38 @@ elif [ $machine = ORION ]; then
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
     fi
-    export PYTHONPATH=/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.0_py3.8/lib/python3.8/site-packages
-elif [ $machine = HERCULES ]; then
-    "ERROR: EMC_Verif-Global standalone not supported on $machine"
-    exit 1
-elif [ $machine = S4 ]; then
-    source /usr/share/lmod/lmod/init/sh
-    module purge
-    if [ $MET_version = 9.1 ]; then
-        export HOMEMET="/data/prod/glopara/contrib/MET/met-9.1.3"
+elif [ $machine = GAEAC5 ]; then
+    module reset
+    module use ${HOMEverif_global}/modulefiles
+    module load emc_verif_global_gaeac5
+    module swap python/3.11.6 python/3.9
+    if [[ "${MET_version}" =~ ^(9.1) ]]; then
+        export HOMEMET="${met_ROOT}"
         export HOMEMET_bin_exec="bin"
     else
         "ERROR: $MET_version is not supported on $machine"
         exit 1
     fi
-    if [ $METplus_version = 3.1 ]; then
-        export HOMEMETplus="/data/prod/glopara/contrib/METplus/METplus-3.1.1"
+    if [[ "${METplus_version}" =~ ^(3.1) ]]; then
+        export HOMEMETplus="${metplus_ROOT}"
     else
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
     fi
+elif [ $machine = GAEAC6 ]; then
+    module reset
     module use ${HOMEverif_global}/modulefiles
-    module load emc_verif_global_s4
-elif [ $machine = JET ]; then
-    source /apps/lmod/lmod/init/sh
-    module use ${HOMEverif_global}/modulefiles
-    module load emc_verif_global_jet
+    module load emc_verif_global_gaeac6
+    module swap python/3.11.6 python/3.11
     if [ $MET_version = 9.1 ]; then
-        export HOMEMET="/contrib/met/9.1"
+        export HOMEMET="${met_ROOT}"
         export HOMEMET_bin_exec="bin"
     else
         "ERROR: $MET_version is not supported on $machine"
         exit 1
     fi
     if [ $METplus_version = 3.1 ]; then
-        export HOMEMETplus="${METPLUS_PATH}"
+        export HOMEMETplus="${metplus_ROOT}"
     else
         "ERROR: $METplus_version is not supported on $machine"
         exit 1
diff --git a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
index e74d207b..c89d4aa5 100644
--- a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
+++ b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
@@ -300,6 +300,10 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
     config['data_dir']='/home/mrow/.local/share/cartopy'
 elif machine == 'HERCULES':
     config['data_dir']='/home/dhuber/.local/share/cartopy'
+elif machine == 'GAEAC5':
+    config['data_dir']='/gpfs/f5/ufs-ard/world-shared/global/metplus.data/cartopy'
+elif machine == 'GAEAC6':
+    config['data_dir']='/gpfs/f6/bil-fire8/world-shared/global/metplus.data/cartopy'
 
 # Set up information
 env_var_model_list = []
diff --git a/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py b/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
index 6c6a4eef..374c4d35 100644
--- a/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
+++ b/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
@@ -290,6 +290,10 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
     config['data_dir']='/home/mrow/.local/share/cartopy'
 elif machine == 'HERCULES':
     config['data_dir']='/home/dhuber/.local/share/cartopy'
+elif machine == 'GAEAC5':
+    config['data_dir']='/gpfs/f5/ufs-ard/world-shared/global/metplus.data/cartopy'
+elif machine == 'GAEAC6':
+    config['data_dir']='/gpfs/f6/bil-fire8/world-shared/global/metplus.data/cartopy'
 
 # Set up information
 RUN_type = 'model2obs'
diff --git a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
index d564ab8e..f701988c 100644
--- a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
+++ b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
@@ -346,6 +346,10 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
     config['data_dir']='/home/dhuber/.local/share/cartopy'
 elif machine == 'ORION':
     config['data_dir']='/home/mrow/.local/share/cartopy'
+elif machine == 'GAEAC5':
+    config['data_dir']='/gpfs/f5/ufs-ard/world-shared/global/metplus.data/cartopy'
+elif machine == 'GAEAC6':
+    config['data_dir']='/gpfs/f6/bil-fire8/world-shared/global/metplus.data/cartopy'
 
 # Set up information
 env_var_model_list = []
diff --git a/ush/run_batch.py b/ush/run_batch.py
index 289f9bdb..f8a41d9c 100644
--- a/ush/run_batch.py
+++ b/ush/run_batch.py
@@ -60,7 +60,7 @@
         job_card.write('#SBATCH --nodes=1\n')
         job_card.write('#SBATCH --ntasks-per-node='+nproc+'\n')
         job_card.write('#SBATCH --time=6:00:00\n')
-    elif machine in ['ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
+    elif machine in ['ORION', 'S4', 'JET', 'HERCULES']:
         job_card.write('#!/bin/sh\n')
         job_card.write('#SBATCH --partition='+PARTITION_BATCH+'\n')
         job_card.write('#SBATCH --qos='+QUEUE+'\n')
@@ -70,6 +70,26 @@
         job_card.write('#SBATCH --nodes=1\n')
         job_card.write('#SBATCH --ntasks-per-node='+nproc+'\n')
         job_card.write('#SBATCH --time=6:00:00\n')
+    elif machine == 'GAEAC5':
+        job_card.write('#!/bin/sh\n')
+        job_card.write('#SBATCH --partition='+PARTITION_BATCH+'\n')
+        job_card.write('#SBATCH --account='+ACCOUNT+'\n')
+        job_card.write('#SBATCH --job-name='+job_name+'\n')
+        job_card.write('#SBATCH --output='+job_output_filename+'\n')
+        job_card.write('#SBATCH --nodes=1\n')
+        job_card.write('#SBATCH --clusters=c5\n')
+        job_card.write('#SBATCH --ntasks-per-node='+nproc+'\n')
+        job_card.write('#SBATCH --time=6:00:00\n')
+    elif machine == 'GAEAC6':
+        job_card.write('#!/bin/sh\n')
+        job_card.write('#SBATCH --partition='+PARTITION_BATCH+'\n')
+        job_card.write('#SBATCH --account='+ACCOUNT+'\n')
+        job_card.write('#SBATCH --job-name='+job_name+'\n')
+        job_card.write('#SBATCH --output='+job_output_filename+'\n')
+        job_card.write('#SBATCH --nodes=1\n')
+        job_card.write('#SBATCH --clusters=c6\n')
+        job_card.write('#SBATCH --ntasks-per-node='+nproc+'\n')
+        job_card.write('#SBATCH --time=6:00:00\n')
     job_card.write('\n')
     job_card.write('/bin/sh '+script)
 
diff --git a/ush/run_verif_global_in_global_workflow.sh b/ush/run_verif_global_in_global_workflow.sh
index 37d81775..9f74bbc4 100755
--- a/ush/run_verif_global_in_global_workflow.sh
+++ b/ush/run_verif_global_in_global_workflow.sh
@@ -301,6 +301,14 @@ elif [ $machine = "WCOSS2" ]; then
     export global_archive="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data"
     export prepbufr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/prepbufr"
     export ccpa_24hr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/ccpa_accum24hr"
+elif [ $machine = "GAEAC5" ]; then
+    export global_archive="/gpfs/f5/ufs-ard/world-shared/global/metplus.data/archive"
+    export prepbufr_arch_dir="/gpfs/f5/ufs-ard/world-shared/global/metplus.data/prepbufr"
+    export ccpa_24hr_arch_dir="/gpfs/f5/ufs-ard/world-shared/global/metplus.data/obdata/ccpa_accum24hr"
+elif [ $machine = "GAEAC6" ]; then
+    export global_archive="/gpfs/f6/bil-fire8/world-shared/global/metplus.data/archive"
+    export prepbufr_arch_dir="/gpfs/f6/bil-fire8/world-shared/global/metplus.data/prepbufr"
+    export ccpa_24hr_arch_dir="/gpfs/f6/bil-fire8/world-shared/global/metplus.data/obdata/ccpa_accum24hr"
 fi
 
 ## Set operational directories
diff --git a/ush/set_up_verif_global.sh b/ush/set_up_verif_global.sh
index 11fece09..23c38454 100755
--- a/ush/set_up_verif_global.sh
+++ b/ush/set_up_verif_global.sh
@@ -108,16 +108,17 @@ if [ $machine = "WCOSS2" ]; then
     export FIXverif_global="/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/verif/20220805"
 elif [ $machine = "HERA" ]; then
     export FIXverif_global="/scratch1/NCEPDEV/global/glopara/fix/verif/20220805"
-elif [ $machine = "GAEAC5" ]; then
-    export FIXverif_global="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/FIX/verif/20220805"
-elif [ $machine = "GAEAC6" ]; then
-    export FIXverif_global="/gpfs/f6/drsa-precip3/world-shared/role.glopara/fix/verif/20220805"
 elif [ $machine = "ORION" -o $machine = "HERCULES" ]; then
     export FIXverif_global="/work/noaa/global/glopara/fix/verif/20220805"
 elif [ $machine = "S4" ]; then
     export FIXverif_global="/data/prod/glopara/fix/verif/20220805"
 elif [ $machine = "JET" ]; then
     export FIXverif_global="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/verif/20220805"
+elif [ $machine = "GAEAC5" ]; then
+    export FIXverif_global="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/FIX/verif/20220805"
+elif [ $machine = "GAEAC6" ]; then
+    export FIXverif_global="    export FIXverif_global="/gpfs/f6/drsa-precip3/world-shared/role.glopara/fix/verif/20220805"
+"
 fi
 
 ## Set machine specific account, queues, and run settings
@@ -142,6 +143,7 @@ elif [ $machine = "GAEAC5" ]; then
     export QUEUE="normal"
     export QUEUESHARED="normal"
     export QUEUESERV="service"
+    export CLUSTERS="c5"
     export PARTITION_BATCH="batch"
     export nproc="128"
     export MPMD="YES"
@@ -150,6 +152,7 @@ elif [ $machine = "GAEAC6" ]; then
     export QUEUE="normal"
     export QUEUESHARED="normal"
     export QUEUESERV="service"
+    export CLUSTERS="c6"
     export PARTITION_BATCH="batch"
     export nproc="192"
     export MPMD="YES"
@@ -185,6 +188,22 @@ elif [ $machine = "JET" ]; then
     export PARTITION_BATCH="xjet"
     export nproc="10"
     export MPMD="YES"
+elif [ $machine = "GAEAC5" ]; then
+    export ACCOUNT="ufs-ard"
+    export QUEUE="batch"
+    export QUEUESHARED="batch"
+    export QUEUESERV="service"
+    export PARTITION_BATCH=""
+    export nproc="128"
+    export MPMD="YES"
+elif [ $machine = "GAEAC6" ]; then
+    export ACCOUNT="bil-fire8"
+    export QUEUE="batch"
+    export QUEUESHARED="batch"
+    export QUEUESERV="service"
+    export PARTITION_BATCH=""
+    export nproc="192"
+    export MPMD="YES"
 fi
 
 ## Set machine and user specific directories
@@ -210,28 +229,6 @@ elif [ $machine = "HERA" ]; then
     export obdata_dir="/scratch1/NCEPDEV/global/glopara/data/metplus.data/obdata"
     export ccpa_24hr_arch_dir="/scratch1/NCEPDEV/global/glopara/data/metplus.data/obdata/ccpa_accum24hr"
     export METviewer_AWS_scripts_dir="/scratch1/NCEPDEV/global/glopara/data/metplus.data/VRFY/METviewer_AWS"
-elif [ $machine = "GAEAC5" ]; then
-    export NWROOT="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/nwpara"
-    export HOMEDIR="/gpfs/f5/epic/scratch/$USER"
-    export STMP="/gpfs/f5/epic/scratch/$USER"
-    export PTMP="/gpfs/f5/epic/scratch/$USER"
-    export NOSCRUB="/gpfs/f5/epic/scratch/$USER"
-    export global_archive="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/archive"
-    export prepbufr_arch_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/prepbufr"
-    export obdata_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/obdata"
-    export ccpa_24hr_arch_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/obdata/ccpa_accum24hr"
-    export METviewer_AWS_scripts_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/VRFY/METviewer_AWS"
-elif [ $machine = "GAEAC6" ]; then
-    export NWROOT="/gpfs/f6/bil-fire8/world-shared/global/glopara/data/nwpara"
-    export HOMEDIR="/gpfs/f6/bil-fire8/scratch/$USER"
-    export STMP="/gpfs/f6/bil-fire8/scratch/$USER"
-    export PTMP="/gpfs/f6/bil-fire8/scratch/$USER"
-    export NOSCRUB="/gpfs/f6/bil-fire8/scratch/$USER"
-    export global_archive="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/archive"
-    export prepbufr_arch_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/prepbufr"
-    export obdata_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/obdata"
-    export ccpa_24hr_arch_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/obdata/ccpa_accum24hr"
-    export METviewer_AWS_scripts_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/VRFY/METviewer_AWS"
 elif [ $machine = "ORION" ] || [ $machine = "HERCULES" ]; then
     export NWROOT=${NWROOT:-"/work/noaa/global/glopara/nwpara"}
     export HOMEDIR="/work/noaa/nems/$USER"
@@ -265,6 +262,29 @@ elif [ $machine = "JET" ]; then
     export obdata_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/obdata"
     export ccpa_24hr_arch_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/obdata/ccpa_accum24hr"
     export METviewer_AWS_scripts_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/VRFY/METviewer_AWS"
+elif [ $machine = "GAEAC5" ]; then
+    export NWROOT="/gpfs/f5/${ACCOUNT}/world-shared/global/glopara/data/nwpara"
+    export HOMEDIR="/gpfs/f5/${ACCOUNT}/scratch/${USER}"
+    export STMP="/gpfs/f5/${ACCOUNT}/scratch/${USER}/stmp2"
+    export PTMP="/gpfs/f5/${ACCOUNT}/scratch/${USER}/stmp4"
+    export NOSCRUB="/gpfs/f5/${ACCOUNT}/scratch/${USER}/noscrub"
+    export global_archive="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/archive"
+    export prepbufr_arch_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/prepbufr"
+    export obdata_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/obdata"
+    export ccpa_24hr_arch_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/obdata/ccpa_accum24hr"
+    export METviewer_AWS_scripts_dir="/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/VRFY/METviewer_AWS"
+elif [ $machine = "GAEAC6" ]; then
+    export NWROOT="/gpfs/f6/${ACCOUNT}/world-shared/global/glopara/data/nwpara"
+    export HOMEDIR="/gpfs/f6/${ACCOUNT}/scratch/${USER}"
+    export STMP="/gpfs/f6/${ACCOUNT}/scratch/${USER}/stmp2"
+    export PTMP="/gpfs/f6/${ACCOUNT}/scratch/${USER}/stmp4"
+    export NOSCRUB="/gpfs/f6/${ACCOUNT}/scratch/${USER}/noscrub"
+    export global_archive="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/archive"
+    export prepbufr_arch_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/prepbufr"
+    export obdata_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/obdata"
+    export ccpa_24hr_arch_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/obdata/ccpa_accum24hr"
+    export METviewer_AWS_scripts_dir="/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/VRFY/METviewer_AWS"
+
 fi
 
 ## Set operational directories