diff --git a/cime_config/machines/cmake_macros/nvidiagpu.cmake b/cime_config/machines/cmake_macros/nvidiagpu.cmake
index a30b2ba585dc..8b015bd351d7 100644
--- a/cime_config/machines/cmake_macros/nvidiagpu.cmake
+++ b/cime_config/machines/cmake_macros/nvidiagpu.cmake
@@ -1,7 +1,7 @@
 set(MPICC "cc")
 set(MPICXX "CC")
 set(MPIFC "ftn")
-set(SCC "nvcc")
+set(SCC "nvc")
 set(SCXX "nvc++")
 set(SFC "nvfortran")
 string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRNVIDIA")
diff --git a/cime_config/machines/cmake_macros/polaris_gnu.cmake b/cime_config/machines/cmake_macros/polaris_gnu.cmake
index f65180b40ab3..09a42eef9e2f 100644
--- a/cime_config/machines/cmake_macros/polaris_gnu.cmake
+++ b/cime_config/machines/cmake_macros/polaris_gnu.cmake
@@ -5,6 +5,3 @@ endif()
 set(MPICC "cc")
 set(MPICXX "CC")
 set(MPIFC "ftn")
-set(SCC "cc")
-set(SCXX "CC")
-set(SFC "ftn")
diff --git a/cime_config/machines/cmake_macros/polaris_gnugpu.cmake b/cime_config/machines/cmake_macros/polaris_gnugpu.cmake
index 01308c02ac13..89011b0b69b4 100644
--- a/cime_config/machines/cmake_macros/polaris_gnugpu.cmake
+++ b/cime_config/machines/cmake_macros/polaris_gnugpu.cmake
@@ -12,7 +12,4 @@ set(E3SM_LINK_WITH_FORTRAN "TRUE")
 set(MPICC "cc")
 set(MPICXX "CC")
 set(MPIFC "ftn")
-set(SCC "cc")
-set(SCXX "CC")
-set(SFC "ftn")
 string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CUDA_HOME}/lib64/ -lstdc++ ")
diff --git a/cime_config/machines/cmake_macros/polaris_nvidia.cmake b/cime_config/machines/cmake_macros/polaris_nvidia.cmake
index 60d548360ccd..47b36050e566 100644
--- a/cime_config/machines/cmake_macros/polaris_nvidia.cmake
+++ b/cime_config/machines/cmake_macros/polaris_nvidia.cmake
@@ -2,6 +2,3 @@ string(APPEND CONFIG_ARGS " --host=cray")
 if (COMP_NAME STREQUAL gptl)
   string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
 endif()
-set(SCC "cc")
-set(SCXX "CC")
-set(SFC "ftn")
diff --git a/cime_config/machines/cmake_macros/polaris_nvidiagpu.cmake b/cime_config/machines/cmake_macros/polaris_nvidiagpu.cmake
index c57ada72b6d2..6257322f2489 100644
--- a/cime_config/machines/cmake_macros/polaris_nvidiagpu.cmake
+++ b/cime_config/machines/cmake_macros/polaris_nvidiagpu.cmake
@@ -8,7 +8,4 @@ string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK")
 string(APPEND CMAKE_CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math")
 set(CMAKE_CUDA_ARCHITECTURES "80")
 string(APPEND CMAKE_EXE_LINKER_FLAGS " -acc=gpu -gpu=cc80 -Minfo=accel")
-set(SCC "cc")
-set(SCXX "CC")
-set(SFC "ftn")
 string(APPEND CMAKE_Fortran_FLAGS " -acc=gpu -gpu=cc80 -Minfo=accel")
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
index 80b894c9d809..91a7198c32ef 100644
--- a/cime_config/machines/config_machines.xml
+++ b/cime_config/machines/config_machines.xml
@@ -3484,23 +3484,24 @@
         <command name="load">craype-accel-host</command>
       </modules>
       <modules compiler="gnu.*">
-        <command name="load">PrgEnv-gnu/8.6.0</command>
-        <command name="load">gcc-native/13.2</command>
+        <command name="load">PrgEnv-gnu/8.7.0</command>
+        <command name="load">gcc-native/14</command>
         <command name="load">hdf5/1.14.6</command>
         <command name="load">netcdf/4.9.3c-4.6.2f</command>
       </modules>
       <modules compiler="nvidia.*">
-        <command name="load">PrgEnv-nvidia/8.6.0</command>
+        <command name="load">PrgEnv-nvidia/8.7.0</command>
         <command name="load">hdf5-nvidia/1.14.6</command>
         <command name="load">netcdf-nvidia/4.9.3c-4.6.2f</command>
       </modules>
       <modules compiler=".*gpu">
-        <command name="load">cuda/12.9</command>
+        <command name="load">cuda/13.0</command>
         <command name="load">craype-accel-nvidia80</command>
       </modules>
       <modules>
-        <command name="load">cray-libsci/25.03.0</command>
-        <command name="load">cray-parallel-netcdf/1.12.3.13</command>
+        <command name="load">cray-libsci/26.03.0</command>
+        <command name="load">cray-parallel-netcdf/1.12.3.21</command>
+        <command name="rm">darshan</command>
       </modules>
     </module_system>
     <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>