diff --git a/configs/sites/tier1/derecho/compilers.yaml b/configs/sites/tier1/derecho/compilers.yaml
index 47736702b..cfaf34761 100644
--- a/configs/sites/tier1/derecho/compilers.yaml
+++ b/configs/sites/tier1/derecho/compilers.yaml
@@ -10,19 +10,14 @@ compilers::
     operating_system: sles15
     target: x86_64
     modules:
-    - intel/2024.2.1
     - ncarenv/24.12
+    - intel/2024.2.1
     environment:
       prepend_path:
         PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin'
         CPATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/include'
         LD_LIBRARY_PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/lib:/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/lib64'
-      set:
-        # https://github.com/JCSDA/spack-stack/issues/957
-        FI_CXI_RX_MATCH_MODE: 'hybrid'
-        # https://github.com/JCSDA/spack-stack/issues/1012
-        I_MPI_EXTRA_FILESYSTEM: 'ON'
-    extra_rpaths: []
+
 - compiler:
     spec: gcc@12.4.0
     paths:
@@ -36,12 +31,3 @@ compilers::
     modules:
     - ncarenv/24.12
     - gcc/12.4.0
-    environment:
-      prepend_path:
-        # For compiling scotch (which requires Intel MPI) with gcc in the oneapi@2024.2.1 unified environment
-        LD_LIBRARY_PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/lib'
-      set:
-        # https://github.com/JCSDA/spack-stack/issues/957
-        FI_CXI_RX_MATCH_MODE: 'hybrid'
-    extra_rpaths: []
-
diff --git a/configs/sites/tier1/derecho/modules.yaml b/configs/sites/tier1/derecho/modules.yaml
index 960198ae7..65801706f 100644
--- a/configs/sites/tier1/derecho/modules.yaml
+++ b/configs/sites/tier1/derecho/modules.yaml
@@ -4,5 +4,4 @@ modules:
     - lmod
     lmod:
       include:
-      - cray-mpich
       - python
diff --git a/configs/sites/tier1/derecho/packages_gcc.yaml b/configs/sites/tier1/derecho/packages_gcc.yaml
index eb0e0754d..fbc9a9baa 100644
--- a/configs/sites/tier1/derecho/packages_gcc.yaml
+++ b/configs/sites/tier1/derecho/packages_gcc.yaml
@@ -11,20 +11,6 @@ packages:
       modules:
       - craype/2.7.31
       - ncarenv/24.12
-      - cray-mpich/8.1.29
+      - gcc/12.4.0 
       - libfabric/1.15.2.0
-      environment:
-        prepend_path:
-          PATH: '/opt/cray/pe/pals/1.2.12/bin'
-          PKG_CONFIG_PATH: '/opt/cray/pe/pals/1.2.12/lib/pkgconfig'
-          MANPATH: '/opt/cray/pe/pals/1.2.12/man'
-          PE_PALS_PKGCONFIG_LIBS: 'libpals'
-          PE_PKGCONFIG_PRODUCTS: 'PE_PALS'
-        set:
-          # https://github.com/JCSDA/spack-stack/issues/957
-          FI_CXI_RX_MATCH_MODE: 'hybrid'
-          # https://github.com/JCSDA/spack-stack/issues/1012
-          I_MPI_EXTRA_FILESYSTEM: 'ON'
-          I_MPI_OFI_LIBRARY: '/opt/cray/libfabric/1.15.2.0/lib64/libfabric.so.1'
-        extra_rpaths: []
-
+      - cray-mpich/8.1.29
diff --git a/configs/sites/tier1/derecho/packages_oneapi.yaml b/configs/sites/tier1/derecho/packages_oneapi.yaml
index 72c4bc589..1edce74c5 100644
--- a/configs/sites/tier1/derecho/packages_oneapi.yaml
+++ b/configs/sites/tier1/derecho/packages_oneapi.yaml
@@ -4,29 +4,16 @@ packages:
     providers:
       mpi:: [cray-mpich@8.1.29]
   mpi:
-    buildable: true
+    buildable: false
   cray-mpich:
     externals:
     - spec: cray-mpich@8.1.29%oneapi@2024.2.1 +wrappers
       modules:
-      - intel/2024.2.1
       - ncarenv/24.12
       - craype/2.7.31
+      - intel/2024.2.1
       - libfabric/1.15.2.0
-      environment:
-        prepend_path:
-          PATH: '/opt/cray/pe/pals/1.2.12/bin'
-          PKG_CONFIG_PATH: '/opt/cray/pe/pals/1.2.12/lib/pkgconfig'
-          MANPATH: '/opt/cray/pe/pals/1.2.12/man'
-          PE_PALS_PKGCONFIG_LIBS: 'libpals'
-          PE_PKGCONFIG_PRODUCTS: 'PE_PALS'
-        set:
-          # https://github.com/JCSDA/spack-stack/issues/957
-          FI_CXI_RX_MATCH_MODE: 'hybrid'
-          # https://github.com/JCSDA/spack-stack/issues/1012
-          I_MPI_EXTRA_FILESYSTEM: 'ON'
-          I_MPI_OFI_LIBRARY: '/opt/cray/libfabric/1.15.2.0/lib64/libfabric.so.1'
-        extra_rpaths: []
+      - cray-mpich/8.1.29
   intel-oneapi-runtime:
     buildable: False
     externals: