diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile
index a7665189ac..4d90a0bc40 100644
--- a/.cicd/Jenkinsfile
+++ b/.cicd/Jenkinsfile
@@ -12,10 +12,10 @@ pipeline {
     parameters {
         // Allow job runner to filter based on platform
         // Use the line below to enable all PW clusters
-        // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6','hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
+        // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6','hera', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
         // Use the line below to enable the PW AWS cluster
-        // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
-        choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use')
+        // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
+        choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules'], description: 'Specify the platform(s) to use')
         // Allow job runner to filter based on compiler
         choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build')
         // Workflow Wrapper test depth {0..9}, 0=none, 1=simple, 9=all [default]
@@ -103,7 +103,7 @@ pipeline {
                 axes {
                     axis {
                         name 'SRW_PLATFORM'
-                        values 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                        values 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
                     }
 
                     axis {
@@ -117,7 +117,7 @@ pipeline {
                     exclude {
                             axis {
                             name 'SRW_PLATFORM'
-                            values 'derecho', 'gaea', 'gaea-c6', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                            values 'derecho', 'gaeac5', 'gaeac6', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
                         }
 
                         axis {
diff --git a/.cicd/scripts/srw_unittest.sh b/.cicd/scripts/srw_unittest.sh
index cfc1719de4..d7fa4ea10f 100755
--- a/.cicd/scripts/srw_unittest.sh
+++ b/.cicd/scripts/srw_unittest.sh
@@ -18,7 +18,7 @@ fi
 
 cd $workspace
 # Only run this on machines with hpss access
-hpss_machines=( jet hera )
+hpss_machines=( hera )
 if [[ ${hpss_machines[@]} =~ ${SRW_PLATFORM} ]] ; then
 
   source ${workspace}/ush/load_modules_wflow.sh ${SRW_PLATFORM}
diff --git a/.cicd/scripts/wrapper_srw_ftest.sh b/.cicd/scripts/wrapper_srw_ftest.sh
index d43c828318..3cfdd49d4d 100755
--- a/.cicd/scripts/wrapper_srw_ftest.sh
+++ b/.cicd/scripts/wrapper_srw_ftest.sh
@@ -21,18 +21,18 @@ else
 fi
 
 # Customize wrapper scripts
-if [[ "${SRW_PLATFORM}" == gaea ]]; then
+if [[ "${SRW_PLATFORM}" == gaeac5 ]]; then
     sed -i '15i #SBATCH --clusters=c5' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
     sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
     sed -i 's|00:30:00|00:45:00|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
-    sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaea" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
+    sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaeac5" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
 fi
 
-if [[ "${SRW_PLATFORM}" == gaea-c6 ]]; then
+if [[ "${SRW_PLATFORM}" == gaeac6 ]]; then
     sed -i '15i #SBATCH --clusters=c6' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
     sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
     sed -i 's|00:30:00|00:45:00|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
-    sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaea-c6" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
+    sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaeac6" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
 fi
 
 if [[ "${SRW_PLATFORM}" == hera ]]; then
@@ -41,10 +41,6 @@ if [[ "${SRW_PLATFORM}" == hera ]]; then
     fi
 fi
 
-if [[ "${SRW_PLATFORM}" == jet ]]; then
-    sed -i '15i #SBATCH --partition=xjet' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
-fi
-
 if [[ "${TASK_DEPTH}" == 0 ]] ; then
     exit 0
 fi
diff --git a/Externals.cfg b/Externals.cfg
index 5e94961fb4..e6397e880b 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 3a5e52e
+hash = 8933749
 local_path = sorc/ufs-weather-model
 required = True
 
diff --git a/etc/lmod-setup.csh b/etc/lmod-setup.csh
index 6af4f8dd1f..40d1a62dc6 100644
--- a/etc/lmod-setup.csh
+++ b/etc/lmod-setup.csh
@@ -6,7 +6,7 @@ Usage: source etc/lmod-setup.csh PLATFORM
 
 OPTIONS:
    PLATFORM - name of machine you are building on
-      (e.g. cheyenne | hera | jet | orion | hercules | wcoss2 )
+      (e.g. cheyenne | hera | orion | hercules | wcoss2 )
 EOF_USAGE
    exit 1
 else
@@ -37,10 +37,10 @@ else if ( "$L_MACHINE" == singularity ) then
 
    module purge
 
-else if ( "$L_MACHINE" == gaea ) then
+else if ( "$L_MACHINE" == gaeac5 ) then
    module reset
 
-else if ( "$L_MACHINE" == gaea-c6 ) then
+else if ( "$L_MACHINE" == gaeac6 ) then
    module reset
 
 else if ( "$L_MACHINE" == derecho ) then
diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh
index 5012d4381c..c2f803fd97 100644
--- a/etc/lmod-setup.sh
+++ b/etc/lmod-setup.sh
@@ -7,7 +7,7 @@ Usage: source etc/lmod-setup.sh PLATFORM
 
 OPTIONS:
    PLATFORM - name of machine you are building on
-      (e.g. cheyenne | hera | jet | orion | hercules | wcoss2 )
+      (e.g. cheyenne | hera | orion | hercules | wcoss2 )
 EOF_USAGE
    exit 1
 else
@@ -44,10 +44,10 @@ elif [ "$L_MACHINE" = singularity ]; then
 
    module purge
 
-elif [ "$L_MACHINE" = gaea ]; then
+elif [ "$L_MACHINE" = gaeac5 ]; then
    module reset 
 
-elif [ "$L_MACHINE" = gaea-c6 ]; then
+elif [ "$L_MACHINE" = gaeac6 ]; then
    module reset 
 
 elif [ "$L_MACHINE" = derecho ]; then
diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaeac5_intel.lua
similarity index 100%
rename from modulefiles/build_gaea_intel.lua
rename to modulefiles/build_gaeac5_intel.lua
diff --git a/modulefiles/build_gaea-c6_intel.lua b/modulefiles/build_gaeac6_intel.lua
similarity index 100%
rename from modulefiles/build_gaea-c6_intel.lua
rename to modulefiles/build_gaeac6_intel.lua
diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua
index adf4fa8287..3f14b37863 100644
--- a/modulefiles/build_hera_gnu.lua
+++ b/modulefiles/build_hera_gnu.lua
@@ -17,7 +17,8 @@ load("cmake/3.23.1")
 load("srw_common")
 
 load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
-load(pathJoin("nco", os.getenv("nco_ver") or "5.1.6"))
+load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
+load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
 load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.24"))
 
 prepend_path("CPPFLAGS", " -I/apps/slurm_hera/23.11.3/include/slurm"," ")
diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua
index 5aa24ba157..bb219172b1 100644
--- a/modulefiles/build_noaacloud_intel.lua
+++ b/modulefiles/build_noaacloud_intel.lua
@@ -14,3 +14,6 @@ unload("gnu")
 load("cmake/3.23.1") 
 
 load("srw_common")
+
+load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
+load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
diff --git a/modulefiles/tasks/gaea-c6/get_obs.local.lua b/modulefiles/tasks/gaeac5/get_obs.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/get_obs.local.lua
rename to modulefiles/tasks/gaeac5/get_obs.local.lua
diff --git a/modulefiles/tasks/gaea-c6/plot_allvars.local.lua b/modulefiles/tasks/gaeac5/plot_allvars.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/plot_allvars.local.lua
rename to modulefiles/tasks/gaeac5/plot_allvars.local.lua
diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaeac5/python_srw.lua
similarity index 100%
rename from modulefiles/tasks/gaea/python_srw.lua
rename to modulefiles/tasks/gaeac5/python_srw.lua
diff --git a/modulefiles/tasks/gaea-c6/run_vx.local.lua b/modulefiles/tasks/gaeac5/run_vx.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/run_vx.local.lua
rename to modulefiles/tasks/gaeac5/run_vx.local.lua
diff --git a/modulefiles/tasks/gaea/get_obs.local.lua b/modulefiles/tasks/gaeac6/get_obs.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea/get_obs.local.lua
rename to modulefiles/tasks/gaeac6/get_obs.local.lua
diff --git a/modulefiles/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaeac6/plot_allvars.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea/plot_allvars.local.lua
rename to modulefiles/tasks/gaeac6/plot_allvars.local.lua
diff --git a/modulefiles/tasks/gaea-c6/prepstart.local.lua b/modulefiles/tasks/gaeac6/prepstart.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/prepstart.local.lua
rename to modulefiles/tasks/gaeac6/prepstart.local.lua
diff --git a/modulefiles/tasks/gaea-c6/python_srw.lua b/modulefiles/tasks/gaeac6/python_srw.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/python_srw.lua
rename to modulefiles/tasks/gaeac6/python_srw.lua
diff --git a/modulefiles/tasks/gaea-c6/python_srw_sd.lua b/modulefiles/tasks/gaeac6/python_srw_sd.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/python_srw_sd.lua
rename to modulefiles/tasks/gaeac6/python_srw_sd.lua
diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaeac6/run_vx.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea/run_vx.local.lua
rename to modulefiles/tasks/gaeac6/run_vx.local.lua
diff --git a/modulefiles/tasks/gaea-c6/smoke_dust.local.lua b/modulefiles/tasks/gaeac6/smoke_dust.local.lua
similarity index 100%
rename from modulefiles/tasks/gaea-c6/smoke_dust.local.lua
rename to modulefiles/tasks/gaeac6/smoke_dust.local.lua
diff --git a/modulefiles/tasks/noaacloud/prepstart.local.lua b/modulefiles/tasks/noaacloud/prepstart.local.lua
new file mode 100644
index 0000000000..6d428532bc
--- /dev/null
+++ b/modulefiles/tasks/noaacloud/prepstart.local.lua
@@ -0,0 +1 @@
+load("python_srw_sd")
diff --git a/modulefiles/tasks/noaacloud/smoke_dust.local.lua b/modulefiles/tasks/noaacloud/smoke_dust.local.lua
new file mode 100644
index 0000000000..6d428532bc
--- /dev/null
+++ b/modulefiles/tasks/noaacloud/smoke_dust.local.lua
@@ -0,0 +1 @@
+load("python_srw_sd")
diff --git a/modulefiles/wflow_gaea.lua b/modulefiles/wflow_gaeac5.lua
similarity index 100%
rename from modulefiles/wflow_gaea.lua
rename to modulefiles/wflow_gaeac5.lua
diff --git a/modulefiles/wflow_gaea-c6.lua b/modulefiles/wflow_gaeac6.lua
similarity index 100%
rename from modulefiles/wflow_gaea-c6.lua
rename to modulefiles/wflow_gaeac6.lua
diff --git a/tests/WE2E/machine_suites/comprehensive b/tests/WE2E/machine_suites/comprehensive
index 8c42aa4599..bbd2de0217 100644
--- a/tests/WE2E/machine_suites/comprehensive
+++ b/tests/WE2E/machine_suites/comprehensive
@@ -73,6 +73,7 @@ MET_ensemble_verification_only_vx_time_lag
 MET_ensemble_verification_winter_wx
 MET_verification_only_vx
 pregen_grid_orog_sfc_climo
+smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
 specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
 specify_template_filenames
 vx-det_long-fcst_custom-vx-config_aiml-fourcastnet
diff --git a/tests/WE2E/machine_suites/comprehensive.gaea-c6 b/tests/WE2E/machine_suites/comprehensive.gaea-c6
deleted file mode 120000
index 18a56d9739..0000000000
--- a/tests/WE2E/machine_suites/comprehensive.gaea-c6
+++ /dev/null
@@ -1 +0,0 @@
-comprehensive.orion
\ No newline at end of file
diff --git a/tests/WE2E/machine_suites/comprehensive.jet b/tests/WE2E/machine_suites/comprehensive.gaeac5
similarity index 75%
rename from tests/WE2E/machine_suites/comprehensive.jet
rename to tests/WE2E/machine_suites/comprehensive.gaeac5
index 0e15479feb..5930843582 100644
--- a/tests/WE2E/machine_suites/comprehensive.jet
+++ b/tests/WE2E/machine_suites/comprehensive.gaeac5
@@ -10,7 +10,6 @@
 community
 custom_ESGgrid
 custom_ESGgrid_Central_Asia_3km
-custom_ESGgrid_Great_Lakes_snow_8km
 custom_ESGgrid_IndianOcean_6km
 custom_ESGgrid_NewZealand_3km
 custom_ESGgrid_Peru_12km
@@ -18,15 +17,7 @@ custom_ESGgrid_SF_1p1km
 custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE
 custom_GFDLgrid
 deactivate_tasks
-#get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h
-#get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems
-get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS
-get_from_HPSS_ics_HRRR_lbcs_RAP
-get_from_HPSS_ics_RAP_lbcs_RAP
+get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems
 get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS
 grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
@@ -46,11 +37,11 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_RAP
 grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
 grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16
 grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta
-#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
-#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
-#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
 grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
 grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
@@ -67,9 +58,7 @@ grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
 grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16
 grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
-long_fcst
 MET_ensemble_verification_only_vx
-MET_ensemble_verification_only_vx_time_lag
 MET_ensemble_verification_winter_wx
 MET_verification_only_vx
 pregen_grid_orog_sfc_climo
diff --git a/tests/WE2E/machine_suites/comprehensive.gaea b/tests/WE2E/machine_suites/comprehensive.gaeac6
similarity index 100%
rename from tests/WE2E/machine_suites/comprehensive.gaea
rename to tests/WE2E/machine_suites/comprehensive.gaeac6
diff --git a/tests/WE2E/machine_suites/comprehensive.orion b/tests/WE2E/machine_suites/comprehensive.orion
index 5930843582..265506fa3e 100644
--- a/tests/WE2E/machine_suites/comprehensive.orion
+++ b/tests/WE2E/machine_suites/comprehensive.orion
@@ -62,5 +62,6 @@ MET_ensemble_verification_only_vx
 MET_ensemble_verification_winter_wx
 MET_verification_only_vx
 pregen_grid_orog_sfc_climo
+smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
 specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
 specify_template_filenames
diff --git a/tests/WE2E/machine_suites/coverage.gaea b/tests/WE2E/machine_suites/coverage.gaeac5
similarity index 100%
rename from tests/WE2E/machine_suites/coverage.gaea
rename to tests/WE2E/machine_suites/coverage.gaeac5
diff --git a/tests/WE2E/machine_suites/coverage.gaea-c6 b/tests/WE2E/machine_suites/coverage.gaeac6
similarity index 91%
rename from tests/WE2E/machine_suites/coverage.gaea-c6
rename to tests/WE2E/machine_suites/coverage.gaeac6
index 970fdf4086..62813e9209 100644
--- a/tests/WE2E/machine_suites/coverage.gaea-c6
+++ b/tests/WE2E/machine_suites/coverage.gaeac6
@@ -7,5 +7,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
+smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
 2020_CAPE
 2020_easter_storm
diff --git a/tests/WE2E/machine_suites/coverage.jet b/tests/WE2E/machine_suites/coverage.jet
deleted file mode 100644
index 8c79a0b700..0000000000
--- a/tests/WE2E/machine_suites/coverage.jet
+++ /dev/null
@@ -1,11 +0,0 @@
-2019_hurricane_barry
-community
-custom_ESGgrid
-custom_ESGgrid_Great_Lakes_snow_8km
-custom_GFDLgrid
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018
-get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h
-get_from_HPSS_ics_RAP_lbcs_RAP
-grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh
index 44a229299a..42f75515dd 100755
--- a/tests/WE2E/setup_WE2E_tests.sh
+++ b/tests/WE2E/setup_WE2E_tests.sh
@@ -45,7 +45,7 @@ function usage {
 
 }
 
-machines=( hera jet cheyenne derecho orion wcoss2 gaea gaea-c6 odin singularity macos noaacloud )
+machines=( hera cheyenne derecho orion wcoss2 gaeac5 gaeac6 odin singularity macos noaacloud )
 
 if [ "$1" = "-h" ] ; then usage ; fi
 [[ $# -le 2 ]] && usage
diff --git a/tests/build.sh b/tests/build.sh
index 4aa50f40f2..c499d3b9a2 100755
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -21,7 +21,7 @@ function usage() {
   exit 1
 }
  
-machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea gaea-c6 odin singularity macos noaacloud )
+machines=( hera derecho orion hercules wcoss2 gaeac5 gaeac6 odin singularity macos noaacloud )
 
 [[ $# -gt 4 ]] && usage
 
diff --git a/ush/machine/gaea.yaml b/ush/machine/gaeac5.yaml
similarity index 100%
rename from ush/machine/gaea.yaml
rename to ush/machine/gaeac5.yaml
diff --git a/ush/machine/gaea-c6.yaml b/ush/machine/gaeac6.yaml
similarity index 100%
rename from ush/machine/gaea-c6.yaml
rename to ush/machine/gaeac6.yaml
diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml
index 2b27c0c139..c5cc64ba1a 100644
--- a/ush/machine/noaacloud.yaml
+++ b/ush/machine/noaacloud.yaml
@@ -27,9 +27,18 @@ platform:
   FIXorg: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_orog
   FIXsfc: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_sfc_climo
   FIXshp: /contrib/EPIC/UFS_SRW_data/develop/NaturalEarth
+  FIXaqm: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_aqm
+  FIXemis: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_emis
+  FIXsmoke: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_smoke
+  FIXupp: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_upp
+  FIXcrtm: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_crtm
   EXTRN_MDL_DATA_STORES: aws nomads
 data:
   ics_lbcs:
     FV3GFS:
       nemsio: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/nemsio/${yyyymmdd}${hh}
-      grib2: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh} 
+      grib2: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh}
+
+smoke_dust_parm:
+         COMINsmoke_default: /contrib/EPIC/UFS_SRW_data/develop/data_smoke_dust/RAVE_smoke_dust
+         COMINrave_default: /contrib/EPIC/UFS_SRW_data/develop/data_smoke_dust/RAVE_fire
diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml
index bd25dd1df2..31c3e43511 100644
--- a/ush/valid_param_vals.yaml
+++ b/ush/valid_param_vals.yaml
@@ -4,7 +4,7 @@
 valid_vals_RUN_ENVIR: ["nco", "community"]
 valid_vals_VERBOSE: [True, False]
 valid_vals_DEBUG: [True, False]
-valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "JET", "DERECHO", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA", "GAEA-C6"]
+valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "DERECHO", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEAC5", "GAEAC6"]
 valid_vals_SCHED: ["slurm", "pbspro", "lsf", "lsfcray", "none"]
 valid_vals_FCST_MODEL: ["ufs-weather-model"]
 valid_vals_WORKFLOW_MANAGER: ["rocoto", "ecflow", "none"]