diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml
index acd10f74..a85d5c0a 100644
--- a/mache/cime_machine_config/config_machines.xml
+++ b/mache/cime_machine_config/config_machines.xml
@@ -266,7 +266,6 @@
       <env name="OMP_PLACES">threads</env>
       <env name="HDF5_USE_FILE_LOCKING">FALSE</env>
       <env name="PERL5LIB">/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch</env>
-      <env name="FI_CXI_RX_MATCH_MODE">software</env>
       <env name="FI_MR_CACHE_MONITOR">kdreg2</env>
       <env name="MPICH_COLL_SYNC">MPI_Bcast</env>
       <env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
@@ -584,7 +583,6 @@
       <env name="OMP_PLACES">threads</env>
       <env name="HDF5_USE_FILE_LOCKING">FALSE</env>
       <env name="PERL5LIB">/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch</env>
-      <env name="FI_CXI_RX_MATCH_MODE">software</env>
       <env name="FI_MR_CACHE_MONITOR">kdreg2</env>
       <env name="MPICH_COLL_SYNC">MPI_Bcast</env>
       <env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
@@ -903,7 +901,6 @@
       <env name="OMP_PLACES">threads</env>
       <env name="HDF5_USE_FILE_LOCKING">FALSE</env>
       <env name="PERL5LIB">/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch</env>
-      <env name="FI_CXI_RX_MATCH_MODE">software</env>
       <env name="FI_MR_CACHE_MONITOR">kdreg2</env>
       <env name="MPICH_COLL_SYNC">MPI_Bcast</env>
       <env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
@@ -1072,7 +1069,7 @@
       <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
       <modules compiler="crayclang.*">
         <command name="reset"></command>
-        <command name="switch">Core/24.07</command>
+        <command name="switch">Core Core/24.00</command>
         <command name="switch">PrgEnv-cray PrgEnv-cray/8.3.3</command>
         <command name="switch">cce cce/15.0.1</command>
         <!-- craype module to address tcmalloc runtime errors at startup -->
@@ -1085,16 +1082,22 @@
       </modules>
       <modules compiler="amdclang.*">
         <command name="reset"></command>
-        <command name="switch">Core/24.07</command>
+        <command name="switch">Core Core/24.00</command>
         <command name="switch">PrgEnv-cray PrgEnv-amd/8.3.3</command>
         <command name="switch">amd amd/5.4.0</command>
       </modules>
+
+<!-- Removed to resolve the issue: https://github.com/E3SM-Project/E3SM/issues/6755
+     May or may not need to be restored to support OpenMP Offload or OpenACC
+-->
+<!--
       <modules compiler="amdclanggpu">
         <command name="load">craype-accel-amd-gfx90a</command>
       </modules>
+-->
       <modules compiler="gnu.*">
         <command name="reset"></command>
-        <command name="switch">Core/24.07</command>
+        <command name="switch">Core Core/24.00</command>
         <command name="switch">PrgEnv-cray PrgEnv-gnu/8.3.3</command>
         <command name="switch">gcc gcc/12.2.0</command>
       </modules>
@@ -1103,12 +1106,13 @@
         <command name="load">rocm/5.4.0</command>
       </modules>
       <modules>
-        <command name="load">cray-python/3.11.5</command>
+        <command name="load">cray-python/3.9.13.1</command>
         <command name="load">cray-libsci</command>
-        <command name="load">cmake/3.27.9</command>
+        <command name="load">cmake/3.21.3</command>
         <command name="load">subversion</command>
         <command name="load">git</command>
         <command name="load">zlib</command>
+        <command name="load">libfabric/1.15.2.0</command>
         <command name="load">cray-hdf5-parallel/1.12.2.1</command>
         <command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
         <command name="load">cray-parallel-netcdf/1.12.3.1</command>
@@ -1142,9 +1146,6 @@
       <env name="OMP_PROC_BIND">spread</env>
       <env name="OMP_PLACES">threads</env>
     </environment_variables>
-<!--
-commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" issue is resolved.
-
     <environment_variables compiler="gnu.*" mpilib="mpich">
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lustre/orion/cli115/world-shared/frontier/3rdparty/adios2/2.9.1/cray-mpich-8.1.23/gcc-11.2.0; else echo "$ADIOS2_ROOT"; fi}</env>
     </environment_variables>
@@ -1154,7 +1155,6 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     <environment_variables compiler="amdclang.*" mpilib="mpich">
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lustre/orion/cli115/world-shared/frontier/3rdparty/adios2/2.9.1/cray-mpich-8.1.23/amdclang-15.0.0; else echo "$ADIOS2_ROOT"; fi}</env>
     </environment_variables>
--->
   </machine>
 
   <machine MACH="frontier-scream-gpu">
@@ -1218,10 +1218,11 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       </modules>
       <modules compiler="crayclang-scream">
         <command name="reset"></command>
+        <command name="load">Core/24.00</command>
         <command name="load">cpe/22.12</command>
         <command name="load">craype-accel-amd-gfx90a</command>
         <command name="load">rocm/5.4.0</command>
-        <command name="load">libunwind/1.6.2</command>
+        <command name="load">libunwind/1.5.0</command>
         <command name="load">cce/15.0.1</command>
         <command name="load">libfabric/1.15.2.0</command>
         <command name="load">craype/2.7.20</command>
@@ -1690,6 +1691,49 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     </environment_variables>
   </machine>
 
+  <machine MACH="ghci-snl-cpu">
+    <DESC>Huge Linux workstation for Sandia climate scientists</DESC>
+    <NODENAME_REGEX>^[a-fA-F0-9]{12}$</NODENAME_REGEX>
+    <OS>LINUX</OS>
+    <PROXY>proxy.sandia.gov:80</PROXY>
+    <COMPILERS>gnu</COMPILERS>
+    <MPILIBS>openmpi</MPILIBS>
+    <CIME_OUTPUT_ROOT>/projects/e3sm/scratch</CIME_OUTPUT_ROOT>
+    <DIN_LOC_ROOT>/projects/e3sm/inputdata</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
+    <BASELINE_ROOT>/projects/e3sm/baselines/ghci-snl-cpu/$COMPILER</BASELINE_ROOT>
+    <CCSM_CPRNC>/projects/e3sm/cprnc/cprnc</CCSM_CPRNC>
+    <GMAKE_J>32</GMAKE_J>
+    <TESTS>e3sm_developer</TESTS>
+    <BATCH_SYSTEM>none</BATCH_SYSTEM>
+    <SUPPORTED_BY>lbertag at sandia dot gov</SUPPORTED_BY>
+    <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
+    <MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
+    <mpirun mpilib="default">
+      <executable>mpirun</executable>
+      <arguments>
+        <arg name="binding"> --bind-to core</arg>
+        <arg name="num_tasks"> -np {{ total_tasks }}</arg>
+      </arguments>
+    </mpirun>
+    <module_system type="none"/>
+    <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
+    <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
+    <TEST_TPUT_TOLERANCE>0.1</TEST_TPUT_TOLERANCE>
+    <MAX_GB_OLD_TEST_DATA>0</MAX_GB_OLD_TEST_DATA>
+    <environment_variables>
+      <env name="NETCDF_C_PATH">$ENV{NETCDF_C_ROOT}</env>
+      <env name="NETCDF_FORTRAN_PATH">$ENV{NETCDF_FORTRAN_ROOT}</env>
+      <env name="PNETCDF_PATH">$ENV{PARALLEL_NETCDF_ROOT}</env>
+      <env name="OMP_STACKSIZE">64M</env>
+      <env name="OMP_PROC_BIND">spread</env>
+      <env name="OMP_PLACES">threads</env>
+      <env name="BLA_VENDOR">Generic</env>
+      <env name="GATOR_INITIAL_MB">4000MB</env>
+    </environment_variables>
+  </machine>
+
   <machine MACH="weaver">
     <DESC>Sandia GPU testbed</DESC>
     <NODENAME_REGEX>weaver</NODENAME_REGEX>
@@ -1990,7 +2034,8 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       <env name="PERL5LIB">/nfs/gce/projects/climate/software/perl5/lib/perl5</env>
     </environment_variables>
     <environment_variables compiler="gnu" mpilib="mpich">
-      <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/adios2/2.9.1/mpich-4.1.2/gcc-12.1.0; else echo "$ADIOS2_ROOT"; fi}</env>
+      <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/adios2/2.10.1/mpich-4.1.2/gcc-12.1.0; else echo "$ADIOS2_ROOT"; fi}</env>
+      <env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/c-blosc2/2.15.1/gcc-12.1.0; else echo "$BLOSC2_ROOT"; fi}</env>
     </environment_variables>
   </machine>
 
@@ -2333,6 +2378,8 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       <env name="NETCDF_FORTRAN_PATH">$SHELL{dirname $(dirname $(which nf-config))}</env>
       <env name="PNETCDF_PATH">$SHELL{dirname $(dirname $(which pnetcdf_version))}</env>
       <env name="PATH">/lcrc/group/e3sm/soft/perl/5.26.0/bin:$ENV{PATH}</env>
+      <env name="UCX_TLS">self,sm,ud</env>
+      <env name="UCX_UD_MLX5_RX_QUEUE_LEN">16384</env>
     </environment_variables>
     <environment_variables mpilib="mvapich">
       <env name="MV2_ENABLE_AFFINITY">0</env>
@@ -2813,7 +2860,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       <env name="PATH">/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/bin:/lcrc/group/e3sm/soft/perl/improv/bin:$ENV{PATH}</env>
       <env name="LD_LIBRARY_PATH">$SHELL{lp=/lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0:/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/lib:/opt/pbs/lib:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/lib; if [ -z "$LD_LIBRARY_PATH" ]; then echo $lp; else echo "$lp:$LD_LIBRARY_PATH"; fi}</env>
       <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/improv/gnu; else echo "$MOAB_ROOT"; fi}</env>
-      <env name="OMPI_MCA_sharedfp">^lockedfile</env>
+      <env name="OMPI_MCA_sharedfp">^lockedfile,individual</env>
     </environment_variables>
     <environment_variables BUILD_THREADED="TRUE">
       <env name="OMP_STACKSIZE">128M</env>
@@ -3193,10 +3240,8 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     <BATCH_SYSTEM>pbspro</BATCH_SYSTEM>
     <SUPPORTED_BY>e3sm</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>208</MAX_TASKS_PER_NODE>
-    <MAX_TASKS_PER_NODE compiler="oneapi-ifx">208</MAX_TASKS_PER_NODE>
-    <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">104</MAX_TASKS_PER_NODE>
+    <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE>104</MAX_MPITASKS_PER_NODE>
-    <MAX_MPITASKS_PER_NODE compiler="oneapi-ifx">104</MAX_MPITASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE>
     <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
@@ -3221,10 +3266,10 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
           <command name="load">cmake</command>
         </modules>
         <modules compiler="!gnu">
-          <command name="load">oneapi/eng-compiler/2024.04.15.002</command>
+          <command name="load">oneapi/eng-compiler/2024.07.30.002</command>
         </modules>
         <modules compiler="oneapi-ifxgpu">
-          <command name="load">kokkos/git.7ff87a5-omp-sycl</command>
+          <command name="load">kokkos/4.4.01-omp-sycl</command>
         </modules>
         <modules compiler="gnu">
            <command name="unload">spack cmake</command>
@@ -3234,10 +3279,10 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
      <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
      <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
      <environment_variables>
-        <env name="NETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf</env>
-        <env name="PNETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/pnetcdf</env>
-        <env name="LD_LIBRARY_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf/lib:$ENV{LD_LIBRARY_PATH}</env>
-        <env name="PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf/bin:$ENV{PATH}</env>
+        <env name="NETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002</env>
+        <env name="PNETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002</env>
+        <env name="LD_LIBRARY_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/lib:/lus/gila/projects/CSC249ADSE15_CNDA/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/lib:$ENV{LD_LIBRARY_PATH}</env>
+        <env name="PATH">/lus/gila/projects/CSC249ADSE15_CNDA/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/bin:/lus/gila/projects/CSC249ADSE15_CNDA/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/bin:$ENV{PATH}</env>
      </environment_variables>
      <environment_variables mpilib="mpich" DEBUG="TRUE">
         <env name="HYDRA_TOPO_DEBUG">1</env>
@@ -3256,7 +3301,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <env name="FI_CXI_CQ_FILL_PERCENT">20</env>
         <env name="Kokkos_ROOT">$ENV{KOKKOS_ROOT}</env>
         <env name="ZES_ENABLE_SYSMAN">1</env>
-        <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4</env>
+        <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4,8:4,9:4,10:4,11:4</env>
     </environment_variables>
     <environment_variables compiler="oneapi-ifx">
         <env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 -->
@@ -3285,22 +3330,22 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     <OS>LINUX</OS>
     <COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
-    <CHARGE_ACCOUNT>CSC249ADSE15_CNDA</CHARGE_ACCOUNT>
-    <SAVE_TIMING_DIR>/lus/flare/projects/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR>
+    <PROJECT>E3SM_Dec</PROJECT>
+    <SAVE_TIMING_DIR>/lus/flare/projects/E3SM_Dec/performance_archive</SAVE_TIMING_DIR>
     <SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
-    <CIME_OUTPUT_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/$USER/scratch</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/inputdata</DIN_LOC_ROOT>
-    <DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/CSC249ADSE15_CNDA/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <CIME_OUTPUT_ROOT>/lus/flare/projects/$PROJECT/$USER/scratch</CIME_OUTPUT_ROOT>
+    <DIN_LOC_ROOT>/lus/flare/projects/E3SM_Dec/inputdata</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/E3SM_Dec/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
-    <BASELINE_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>/lus/flare/projects/CSC249ADSE15_CNDA/tools/cprnc/cprnc</CCSM_CPRNC>
+    <BASELINE_ROOT>/lus/flare/projects/E3SM_Dec/baselines/$COMPILER</BASELINE_ROOT>
+    <CCSM_CPRNC>/lus/flare/projects/E3SM_Dec/tools/cprnc/cprnc</CCSM_CPRNC>
     <GMAKE_J>16</GMAKE_J>
     <TESTS>e3sm_developer</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
     <BATCH_SYSTEM>pbspro</BATCH_SYSTEM>
     <SUPPORTED_BY>e3sm</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>208</MAX_TASKS_PER_NODE>
-    <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">104</MAX_TASKS_PER_NODE>
+    <MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE>104</MAX_MPITASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE>
     <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
@@ -3316,20 +3361,20 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
        </arguments>
     </mpirun>
     <module_system type="module" allow_error="true">
-       <init_path lang="sh">/lus/flare/projects/CSC249ADSE15_CNDA/modules/lmod.sh</init_path>
-       <init_path lang="csh">/soft/sunspot_migrate/soft/packaging/lmod/lmod/init/csh</init_path>
-       <init_path lang="python">/soft/sunspot_migrate/soft/packaging/lmod/lmod/init/env_modules_python.py</init_path>
+       <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+       <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
+       <init_path lang="python">/usr/share/lmod/lmod/init/env_modules_python.py</init_path>
        <cmd_path lang="sh">module</cmd_path>
        <cmd_path lang="csh">module</cmd_path>
-       <cmd_path lang="python">/soft/sunspot_migrate/soft/packaging/lmod/lmod/libexec/lmod python</cmd_path>
+       <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
        <modules>
           <command name="load">cmake</command>
         </modules>
         <modules compiler="!gnu">
-          <command name="load">oneapi/eng-compiler/2024.04.15.002</command>
+          <command name="load">oneapi/eng-compiler/2024.07.30.002</command>
         </modules>
         <modules compiler="oneapi-ifxgpu">
-          <command name="load">kokkos/git.7ff87a5-omp-sycl</command>
+          <command name="load">kokkos/4.4.01-omp-sycl</command>
         </modules>
         <modules compiler="gnu">
            <command name="unload">spack-pe-gcc cmake</command>
@@ -3339,11 +3384,10 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
      <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
      <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
      <environment_variables>
-        <env name="NETCDF_C_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002</env>
-        <env name="NETCDF_FORTRAN_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002</env>
-        <env name="PNETCDF_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002</env>
-        <env name="LD_LIBRARY_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002/lib:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002/lib:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002/lib:$ENV{LD_LIBRARY_PATH}</env>
-        <env name="PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002/bin:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002/bin:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002/bin:$ENV{PATH}</env>
+        <env name="NETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002</env>
+        <env name="PNETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002</env>
+        <env name="LD_LIBRARY_PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/lib:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/lib:$ENV{LD_LIBRARY_PATH}</env>
+        <env name="PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/bin:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/bin:$ENV{PATH}</env>
      </environment_variables>
      <environment_variables DEBUG="TRUE">
         <env name="HYDRA_TOPO_DEBUG">1</env>
@@ -3362,7 +3406,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <env name="FI_CXI_CQ_FILL_PERCENT">20</env>
         <env name="Kokkos_ROOT">$ENV{KOKKOS_ROOT}</env>
         <env name="ZES_ENABLE_SYSMAN">1</env>
-        <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4</env>
+        <env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4,8:4,9:4,10:4,11:4</env>
     </environment_variables>
     <environment_variables compiler="oneapi-ifx">
         <env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 -->
@@ -3983,7 +4027,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     <DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>/usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
     <GMAKE_J>10</GMAKE_J>
     <TESTS>e3sm_developer</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -4003,11 +4047,11 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     </arguments>
     </mpirun>
     <module_system type="module" allow_error="true">
-      <init_path lang="perl">/usr/share/lmod/8.3.1/init/perl</init_path>
+      <init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
       <!-- does not exist -->
-      <init_path lang="python">/usr/share/lmod/8.3.1/init/python</init_path>
-      <init_path lang="sh">/usr/share/lmod/8.3.1/init/sh</init_path>
-      <init_path lang="csh">/usr/share/lmod/8.3.1/init/csh</init_path>
+      <init_path lang="python">/usr/share/lmod/lmod/init/python</init_path>
+      <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+      <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
       <cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
       <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
       <cmd_path lang="sh">module</cmd_path>
@@ -4019,39 +4063,42 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <command name="unload">cray-parallel-netcdf</command>
         <command name="unload">cray-netcdf</command>
         <command name="unload">cray-hdf5</command>
-        <command name="unload">PrgEnv-gnu</command>
-        <command name="unload">PrgEnv-intel</command>
-        <command name="unload">PrgEnv-nvidia</command>
-        <command name="unload">PrgEnv-cray</command>
-        <command name="unload">PrgEnv-aocc</command>
+        <command name="unload">gcc</command>
+        <command name="unload">gcc-native</command>
         <command name="unload">intel</command>
         <command name="unload">intel-oneapi</command>
         <command name="unload">nvidia</command>
         <command name="unload">aocc</command>
         <command name="unload">cudatoolkit</command>
         <command name="unload">climate-utils</command>
+        <command name="unload">cray-libsci</command>
         <command name="unload">craype-accel-nvidia80</command>
         <command name="unload">craype-accel-host</command>
         <command name="unload">perftools-base</command>
         <command name="unload">perftools</command>
         <command name="unload">darshan</command>
+        <command name="unload">PrgEnv-gnu</command>
+        <command name="unload">PrgEnv-intel</command>
+        <command name="unload">PrgEnv-nvidia</command>
+        <command name="unload">PrgEnv-cray</command>
+        <command name="unload">PrgEnv-aocc</command>
       </modules>
 
       <modules compiler="gnu">
-        <command name="load">PrgEnv-gnu/8.4.0</command>
-        <command name="load">gcc/12.2.0</command>
-        <command name="load">cray-libsci/23.05.1.4</command>
+        <command name="load">PrgEnv-gnu/8.5.0</command>
+        <command name="load">gcc-native/12.3</command>
+        <command name="load">cray-libsci/23.12.5</command>
       </modules>
 
       <modules compiler="nvidia">
-        <command name="load">PrgEnv-nvidia/8.4.0</command>
-        <command name="load">nvidia/22.7</command>
-        <command name="load">cray-libsci/23.05.1.4</command>
+        <command name="load">PrgEnv-nvidia/8.5.0</command>
+        <command name="load">nvidia/24.7</command>
+        <command name="load">cray-libsci/23.12.5</command>
       </modules>
 
       <modules compiler="intel">
-        <command name="load">PrgEnv-intel/8.4.0</command>
-        <command name="load">intel-classic/2023.2.0</command>
+        <command name="load">PrgEnv-intel/8.5.0</command>
+        <command name="load">intel/2023.2.0</command>
       </modules>
 
       <modules compiler="amdclang">
@@ -4062,13 +4109,12 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
 
       <modules>
         <command name="load">craype-accel-host</command>
-        <command name="load">craype/2.7.21</command>
-        <command name="load">cray-mpich/8.1.26</command>
-        <command name="load">libfabric/1.15.2.0</command>
-        <command name="load">cray-hdf5-parallel/1.12.2.3</command>
-        <command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
-        <command name="load">cray-parallel-netcdf/1.12.3.3</command>
-        <command name="load">cmake/3.25.1</command>
+        <command name="load">craype/2.7.30</command>
+        <command name="load">cray-mpich/8.1.28</command>
+        <command name="load">cray-hdf5-parallel/1.12.2.9</command>
+        <command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
+        <command name="load">cray-parallel-netcdf/1.12.3.9</command>
+        <command name="load">cmake/3.27.7</command>
       </modules>
     </module_system>
 
@@ -4090,14 +4136,16 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       <env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
       <env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
     </environment_variables>
+    <environment_variables compiler="gnu">
+      <env name="LD_LIBRARY_PATH">/usr/lib64/gcc/x86_64-suse-linux/12:$ENV{LD_LIBRARY_PATH}</env>
+    </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
     </resource_limits>
   </machine>
 
   <machine MACH="chicoma-gpu">
-    <DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single
-AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
+    <DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
     <NODENAME_REGEX>ch-fe*</NODENAME_REGEX>
     <OS>Linux</OS>
     <COMPILERS>gnugpu,gnu,nvidiagpu,nvidia</COMPILERS>
@@ -4107,7 +4155,7 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
     <DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>/usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
     <GMAKE_J>10</GMAKE_J>
     <TESTS>e3sm_developer</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -4131,11 +4179,11 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
     </arguments>
     </mpirun>
     <module_system type="module" allow_error="true">
-      <init_path lang="perl">/usr/share/lmod/8.3.1/init/perl</init_path>
+      <init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
       <!-- does not exist -->
-      <init_path lang="python">/usr/share/lmod/8.3.1/init/python</init_path>
-      <init_path lang="sh">/usr/share/lmod/8.3.1/init/sh</init_path>
-      <init_path lang="csh">/usr/share/lmod/8.3.1/init/csh</init_path>
+      <init_path lang="python">/usr/share/lmod/lmod/init/python</init_path>
+      <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+      <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
       <cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
       <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
       <cmd_path lang="sh">module</cmd_path>
@@ -4147,32 +4195,35 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
         <command name="unload">cray-parallel-netcdf</command>
         <command name="unload">cray-netcdf</command>
         <command name="unload">cray-hdf5</command>
-        <command name="unload">PrgEnv-gnu</command>
-        <command name="unload">PrgEnv-intel</command>
-        <command name="unload">PrgEnv-nvidia</command>
-        <command name="unload">PrgEnv-cray</command>
-        <command name="unload">PrgEnv-aocc</command>
         <command name="unload">intel</command>
         <command name="unload">intel-oneapi</command>
         <command name="unload">nvidia</command>
         <command name="unload">aocc</command>
         <command name="unload">cudatoolkit</command>
         <command name="unload">climate-utils</command>
+        <command name="unload">cray-libsci</command>
         <command name="unload">craype-accel-nvidia80</command>
         <command name="unload">craype-accel-host</command>
         <command name="unload">perftools-base</command>
         <command name="unload">perftools</command>
         <command name="unload">darshan</command>
+        <command name="unload">PrgEnv-gnu</command>
+        <command name="unload">PrgEnv-intel</command>
+        <command name="unload">PrgEnv-nvidia</command>
+        <command name="unload">PrgEnv-cray</command>
+        <command name="unload">PrgEnv-aocc</command>
       </modules>
 
       <modules compiler="gnu.*">
-        <command name="load">PrgEnv-gnu/8.4.0</command>
-        <command name="load">gcc/11.2.0</command>
+        <command name="load">PrgEnv-gnu/8.5.0</command>
+        <command name="load">gcc/12.2.0</command>
+        <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
       <modules compiler="nvidia.*">
         <command name="load">PrgEnv-nvidia/8.4.0</command>
         <command name="load">nvidia/22.7</command>
+        <command name="load">cray-libsci/23.05.1.4</command>
       </modules>
 
       <modules compiler="gnugpu">
@@ -4195,14 +4246,13 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
       </modules>
 
       <modules>
-        <command name="load">cray-libsci/23.05.1.4</command>
+        <command name="load">craype-accel-host</command>
         <command name="load">craype/2.7.21</command>
         <command name="load">cray-mpich/8.1.26</command>
-        <command name="load">libfabric/1.15.2.0</command>
         <command name="load">cray-hdf5-parallel/1.12.2.3</command>
         <command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
         <command name="load">cray-parallel-netcdf/1.12.3.3</command>
-        <command name="load">cmake/3.25.1</command>
+        <command name="load">cmake/3.27.7</command>
       </modules>
     </module_system>
 
@@ -4225,6 +4275,9 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
       <env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
       <env name="PKG_CONFIG_PATH">/usr/projects/e3sm/cudatoolkit:$ENV{PKG_CONFIG_PATH}</env>
     </environment_variables>
+    <environment_variables compiler="gnu">
+      <env name="LD_LIBRARY_PATH">/opt/cray/pe/gcc/12.2.0/snos/lib64:$ENV{LD_LIBRARY_PATH}</env>
+    </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
     </resource_limits>
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.csh b/mache/spack/chicoma-cpu_gnu_mpich.csh
index 434a23cd..c8445524 100644
--- a/mache/spack/chicoma-cpu_gnu_mpich.csh
+++ b/mache/spack/chicoma-cpu_gnu_mpich.csh
@@ -56,7 +56,6 @@ setenv MPICH_VERSION_DISPLAY 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 setenv PERL5LIB /usr/projects/climate/SHARED_CLIMATE/software/chicoma-cpu/perl5-only-switch/lib/perl5
 setenv PNETCDF_HINTS "romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable"
-setenv FI_CXI_RX_MATCH_MODE software
 setenv MPICH_COLL_SYNC MPI_Bcast
 
 # for standalone MPAS builds
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.sh b/mache/spack/chicoma-cpu_gnu_mpich.sh
index d3ec206e..5cd56340 100644
--- a/mache/spack/chicoma-cpu_gnu_mpich.sh
+++ b/mache/spack/chicoma-cpu_gnu_mpich.sh
@@ -56,7 +56,6 @@ export MPICH_VERSION_DISPLAY=1
 export HDF5_USE_FILE_LOCKING=FALSE
 export PERL5LIB=/usr/projects/climate/SHARED_CLIMATE/software/chicoma-cpu/perl5-only-switch/lib/perl5
 export PNETCDF_HINTS="romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable"
-export FI_CXI_RX_MATCH_MODE=software
 export MPICH_COLL_SYNC=MPI_Bcast
 
 export LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
diff --git a/mache/spack/frontier_amdclang_mpich.csh b/mache/spack/frontier_amdclang_mpich.csh
index 31ca9c28..fe95a120 100644
--- a/mache/spack/frontier_amdclang_mpich.csh
+++ b/mache/spack/frontier_amdclang_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
 
diff --git a/mache/spack/frontier_amdclang_mpich.sh b/mache/spack/frontier_amdclang_mpich.sh
index aee1dd35..8f1d3d31 100644
--- a/mache/spack/frontier_amdclang_mpich.sh
+++ b/mache/spack/frontier_amdclang_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
 
diff --git a/mache/spack/frontier_amdclang_mpich.yaml b/mache/spack/frontier_amdclang_mpich.yaml
index 47a0d240..e1747f42 100644
--- a/mache/spack/frontier_amdclang_mpich.yaml
+++ b/mache/spack/frontier_amdclang_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
       - libfabric/1.15.2.0
diff --git a/mache/spack/frontier_amdclanggpu_mpich.csh b/mache/spack/frontier_amdclanggpu_mpich.csh
index 279c55eb..0f40d699 100644
--- a/mache/spack/frontier_amdclanggpu_mpich.csh
+++ b/mache/spack/frontier_amdclanggpu_mpich.csh
@@ -1,8 +1,9 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
-module load craype-accel-amd-gfx90a >& /dev/null
+# see https://github.com/E3SM-Project/E3SM/issues/6755
+# module load craype-accel-amd-gfx90a >& /dev/null
 
 {% if e3sm_lapack %}
 module load cray-libsci/22.12.1.1
diff --git a/mache/spack/frontier_amdclanggpu_mpich.sh b/mache/spack/frontier_amdclanggpu_mpich.sh
index a9ee68e2..b55bb6cd 100644
--- a/mache/spack/frontier_amdclanggpu_mpich.sh
+++ b/mache/spack/frontier_amdclanggpu_mpich.sh
@@ -1,8 +1,9 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
-module load craype-accel-amd-gfx90a >& /dev/null
+# see https://github.com/E3SM-Project/E3SM/issues/6755
+# module load craype-accel-amd-gfx90a >& /dev/null
 
 {% if e3sm_lapack %}
 module load cray-libsci/22.12.1.1
diff --git a/mache/spack/frontier_amdclanggpu_mpich.yaml b/mache/spack/frontier_amdclanggpu_mpich.yaml
index 53462add..9fd2b466 100644
--- a/mache/spack/frontier_amdclanggpu_mpich.yaml
+++ b/mache/spack/frontier_amdclanggpu_mpich.yaml
@@ -156,10 +156,11 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
-      - craype-accel-amd-gfx90a
+      # see https://github.com/E3SM-Project/E3SM/issues/6755
+      # - craype-accel-amd-gfx90a
       - libfabric/1.15.2.0
       environment:
         set:
diff --git a/mache/spack/frontier_crayclang_mpich.csh b/mache/spack/frontier_crayclang_mpich.csh
index a65a8bda..65726273 100644
--- a/mache/spack/frontier_crayclang_mpich.csh
+++ b/mache/spack/frontier_crayclang_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null
diff --git a/mache/spack/frontier_crayclang_mpich.sh b/mache/spack/frontier_crayclang_mpich.sh
index cb5fbe76..3297fc3a 100644
--- a/mache/spack/frontier_crayclang_mpich.sh
+++ b/mache/spack/frontier_crayclang_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null
diff --git a/mache/spack/frontier_crayclang_mpich.yaml b/mache/spack/frontier_crayclang_mpich.yaml
index 97d45454..a54fd296 100644
--- a/mache/spack/frontier_crayclang_mpich.yaml
+++ b/mache/spack/frontier_crayclang_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-cray/8.3.3
       - cce/15.0.1
       - craype/2.7.20
diff --git a/mache/spack/frontier_crayclanggpu_mpich.csh b/mache/spack/frontier_crayclanggpu_mpich.csh
index d2722bc9..67992212 100644
--- a/mache/spack/frontier_crayclanggpu_mpich.csh
+++ b/mache/spack/frontier_crayclanggpu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null
diff --git a/mache/spack/frontier_crayclanggpu_mpich.sh b/mache/spack/frontier_crayclanggpu_mpich.sh
index c0e4a68d..903cc9b3 100644
--- a/mache/spack/frontier_crayclanggpu_mpich.sh
+++ b/mache/spack/frontier_crayclanggpu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null
diff --git a/mache/spack/frontier_crayclanggpu_mpich.yaml b/mache/spack/frontier_crayclanggpu_mpich.yaml
index 6b4640a4..8f559f7b 100644
--- a/mache/spack/frontier_crayclanggpu_mpich.yaml
+++ b/mache/spack/frontier_crayclanggpu_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-cray/8.3.3
       - cce/15.0.1
       - craype/2.7.20
diff --git a/mache/spack/frontier_gnu_mpich.csh b/mache/spack/frontier_gnu_mpich.csh
index 50113051..6317f814 100644
--- a/mache/spack/frontier_gnu_mpich.csh
+++ b/mache/spack/frontier_gnu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/12.2.0 >& /dev/null
 
diff --git a/mache/spack/frontier_gnu_mpich.sh b/mache/spack/frontier_gnu_mpich.sh
index a06a0b7b..85e27a08 100644
--- a/mache/spack/frontier_gnu_mpich.sh
+++ b/mache/spack/frontier_gnu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/12.2.0 >& /dev/null
 
diff --git a/mache/spack/frontier_gnu_mpich.yaml b/mache/spack/frontier_gnu_mpich.yaml
index e4163c89..2a201b1a 100644
--- a/mache/spack/frontier_gnu_mpich.yaml
+++ b/mache/spack/frontier_gnu_mpich.yaml
@@ -171,7 +171,7 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-gnu/8.3.3
       - gcc/12.2.0
       - craype/2.7.19
diff --git a/mache/spack/frontier_gnugpu_mpich.csh b/mache/spack/frontier_gnugpu_mpich.csh
index ef9dcb2d..abd9f15b 100644
--- a/mache/spack/frontier_gnugpu_mpich.csh
+++ b/mache/spack/frontier_gnugpu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/11.2.0 >& /dev/null
 module load craype-accel-amd-gfx90a
diff --git a/mache/spack/frontier_gnugpu_mpich.sh b/mache/spack/frontier_gnugpu_mpich.sh
index eda5278a..3ccd4c35 100644
--- a/mache/spack/frontier_gnugpu_mpich.sh
+++ b/mache/spack/frontier_gnugpu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/11.2.0 >& /dev/null
 module load craype-accel-amd-gfx90a
diff --git a/mache/spack/frontier_gnugpu_mpich.yaml b/mache/spack/frontier_gnugpu_mpich.yaml
index b08f429a..dd1d1b6d 100644
--- a/mache/spack/frontier_gnugpu_mpich.yaml
+++ b/mache/spack/frontier_gnugpu_mpich.yaml
@@ -172,7 +172,7 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-gnu/8.3.3
       - gcc/11.2.0
       - craype/2.7.19
diff --git a/mache/spack/pm-cpu_gnu_mpich.csh b/mache/spack/pm-cpu_gnu_mpich.csh
index 174ef24f..25a550bc 100644
--- a/mache/spack/pm-cpu_gnu_mpich.csh
+++ b/mache/spack/pm-cpu_gnu_mpich.csh
@@ -51,7 +51,6 @@ setenv MPICH_MPIIO_DVS_MAXNODES 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB
diff --git a/mache/spack/pm-cpu_gnu_mpich.sh b/mache/spack/pm-cpu_gnu_mpich.sh
index b824d419..19314006 100644
--- a/mache/spack/pm-cpu_gnu_mpich.sh
+++ b/mache/spack/pm-cpu_gnu_mpich.sh
@@ -51,7 +51,6 @@ export MPICH_MPIIO_DVS_MAXNODES=1
 export HDF5_USE_FILE_LOCKING=FALSE
 ## Not needed
 # export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 
 if [ -z "${NERSC_HOST:-}" ]; then
diff --git a/mache/spack/pm-cpu_intel_mpich.csh b/mache/spack/pm-cpu_intel_mpich.csh
index 52de4034..4d8e1942 100644
--- a/mache/spack/pm-cpu_intel_mpich.csh
+++ b/mache/spack/pm-cpu_intel_mpich.csh
@@ -49,7 +49,6 @@ setenv MPICH_MPIIO_DVS_MAXNODES 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB
diff --git a/mache/spack/pm-cpu_intel_mpich.sh b/mache/spack/pm-cpu_intel_mpich.sh
index 5d4e3b85..577ab3cc 100644
--- a/mache/spack/pm-cpu_intel_mpich.sh
+++ b/mache/spack/pm-cpu_intel_mpich.sh
@@ -49,7 +49,6 @@ export MPICH_MPIIO_DVS_MAXNODES=1
 export HDF5_USE_FILE_LOCKING=FALSE
 ## Not needed
 # export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 
 if [ -z "${NERSC_HOST:-}" ]; then
diff --git a/mache/spack/pm-cpu_nvidia_mpich.csh b/mache/spack/pm-cpu_nvidia_mpich.csh
index 6a0f0732..27064d2c 100644
--- a/mache/spack/pm-cpu_nvidia_mpich.csh
+++ b/mache/spack/pm-cpu_nvidia_mpich.csh
@@ -52,7 +52,6 @@ setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 setenv MPICH_GPU_SUPPORT_ENABLED 1
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB
diff --git a/mache/spack/pm-cpu_nvidia_mpich.sh b/mache/spack/pm-cpu_nvidia_mpich.sh
index 90f1d967..121bef12 100644
--- a/mache/spack/pm-cpu_nvidia_mpich.sh
+++ b/mache/spack/pm-cpu_nvidia_mpich.sh
@@ -57,7 +57,6 @@ if [ -z "${NERSC_HOST:-}" ]; then
   # happens when building spack environment
   export NERSC_HOST="perlmutter"
 fi
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 export MPICH_COLL_SYNC=MPI_Bcast
 export GATOR_INITIAL_MB=4000MB