diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml
index d7494c60b..74b9da866 100644
--- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml
+++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml
@@ -6,14 +6,13 @@ packages:
   mpi:
     buildable: false
     require:
-    - cray-mpich@8.1.32
+    - cray-mpich@8.1.29
   gcc:
     buildable: false
     externals:
     - spec: gcc@13.3.1 languages:='c,c++,fortran'
       prefix: /opt/cray/pe/gcc-native/13
       modules:
-      - crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
       extra_attributes:
@@ -29,14 +28,12 @@ packages:
   cray-mpich:
     buildable: false
     externals:
-    - spec: cray-mpich@8.1.32 +wrappers
-      prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3
+    - spec: cray-mpich@8.1.29 +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3
       modules:
-      - crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
-      - craype-network-ofi
-      - cray-mpich/8.1.32
+      - cray-mpich/8.1.29
       - libfabric/1.22.0
       - cray-pals/1.6.1
 
diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml
similarity index 63%
rename from configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml
rename to configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml
index 3d4ba7636..09a726734 100644
--- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml
+++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml
@@ -1,28 +1,27 @@
 packages:
   all:
     require:
-    - any_of: ['%intel-oneapi-compilers@=2025.3.1']
+    - any_of: ['%intel-oneapi-compilers@=2025.3.2']
       when: '%intel-oneapi-compilers'
     - any_of: ['%gcc@=13.3.1']
       when: '%gcc'
   mpi:
     buildable: false
     require:
-    - cray-mpich@8.1.32
+    - cray-mpich@8.1.29
   intel-oneapi-compilers:
     buildable: false
     externals:
-    - spec: intel-oneapi-compilers@2025.3.1
-      prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1
+    - spec: intel-oneapi-compilers@2025.3.2
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt
       modules:
-      - crayenv/25.03
       - PrgEnv-intel/8.6.0
-      - intel/2025.3.1
+      - intel/2025.3.2
       extra_attributes:
         compilers:
-          c: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx
-          cxx: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx
-          fortran: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx
+          c: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/icx
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/icpx
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/ifx
         environment:
           set:
             # https://github.com/JCSDA/spack-stack/issues/957
@@ -35,7 +34,6 @@ packages:
     - spec: gcc@13.3.1 languages:='c,c++'
       prefix: /opt/cray/pe/gcc-native/13
       modules:
-      - crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
       extra_attributes:
@@ -51,14 +49,12 @@ packages:
   cray-mpich:
     buildable: false
     externals:
-    - spec: cray-mpich@8.1.32 +wrappers
-      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+    - spec: cray-mpich@8.1.29 +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1
       modules:
-      - crayenv/25.03
       - PrgEnv-intel/8.6.0
-      - intel/2025.3.1
-      - craype-network-ofi
-      - cray-mpich/8.1.32
+      - intel/2025.3.2
+      - cray-mpich/8.1.29
       - libfabric/1.22.0
       - cray-pals/1.6.1
   intel-oneapi-mkl:
diff --git a/configs/sites/tier1/derecho/setup.sh b/configs/sites/tier1/derecho/setup.sh
index 0d307e730..c77cdeea8 100644
--- a/configs/sites/tier1/derecho/setup.sh
+++ b/configs/sites/tier1/derecho/setup.sh
@@ -1,3 +1,4 @@
 module --force purge
-module use /opt/cray/pe/modulefiles
 module use /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/modulefiles
+module load crayenv/25.03
+