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..855fa9e49 100644
--- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml
+++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml
@@ -13,7 +13,7 @@ packages:
     - spec: gcc@13.3.1 languages:='c,c++,fortran'
       prefix: /opt/cray/pe/gcc-native/13
       modules:
-      - crayenv/25.03
+      #- crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
       extra_attributes:
@@ -32,10 +32,10 @@ packages:
     - spec: cray-mpich@8.1.32 +wrappers
       prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3
       modules:
-      - crayenv/25.03
+      #- crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
-      - craype-network-ofi
+      #- craype-network-ofi
       - cray-mpich/8.1.32
       - 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.1.yaml
index 3d4ba7636..7e9422962 100644
--- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml
+++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml
@@ -15,7 +15,7 @@ packages:
     - spec: intel-oneapi-compilers@2025.3.1
       prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1
       modules:
-      - crayenv/25.03
+      #- crayenv/25.03
       - PrgEnv-intel/8.6.0
       - intel/2025.3.1
       extra_attributes:
@@ -35,7 +35,7 @@ packages:
     - spec: gcc@13.3.1 languages:='c,c++'
       prefix: /opt/cray/pe/gcc-native/13
       modules:
-      - crayenv/25.03
+      #- crayenv/25.03
       - PrgEnv-gnu/8.6.0
       - gcc-native/13.2
       extra_attributes:
@@ -54,10 +54,10 @@ packages:
     - spec: cray-mpich@8.1.32 +wrappers
       prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
       modules:
-      - crayenv/25.03
+      #- crayenv/25.03
       - PrgEnv-intel/8.6.0
       - intel/2025.3.1
-      - craype-network-ofi
+      #- craype-network-ofi
       - cray-mpich/8.1.32
       - libfabric/1.22.0
       - cray-pals/1.6.1
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
+