diff --git a/configs/sites/tier1/hercules/mirrors.yaml b/configs/sites/tier1/hercules/mirrors.yaml
index 97f382e8e..1ffcf0299 100644
--- a/configs/sites/tier1/hercules/mirrors.yaml
+++ b/configs/sites/tier1/hercules/mirrors.yaml
@@ -1,18 +1,2 @@
 mirrors:
-  local-source:
-    fetch:
-      url: file:///work/noaa/epic/role-epic/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
-    push:
-      url: file:///work/noaa/epic/role-epic/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
+  local-source: file:///work/noaa/epic/role-epic/spack-stack/source-cache
diff --git a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml
index 7c0ba5253..16d6c4153 100644
--- a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml
+++ b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml
@@ -6,7 +6,7 @@ packages:
   openmpi:
     buildable: False
     externals:
-    - spec: openmpi@4.1.4
+    - spec: openmpi@4.1.4 ~internal-hwloc +two_level_namespace
       prefix: /apps/spack-managed/gcc-11.3.1/openmpi-4.1.4-zabolhazla2ahsroedlyt2pu4mkp7o3q
       modules:
       - openmpi/4.1.4
diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml
index 8c0ee42a1..e7c885bdf 100644
--- a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml
+++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml
@@ -14,22 +14,17 @@ packages:
     buildable: false
     externals:
     - spec: intel-oneapi-compilers@2025.3.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj
+      prefix: /apps/contrib/spack-stack/installs/oneapi-2025.3.1
       modules:
       - intel-oneapi-compilers/2025.3.1
       extra_attributes:
         compilers:
-          c: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icx
-          cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icpx
-          fortran: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/ifx
+          c: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx
+          cxx: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx
+          fortran: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx
         environment:
           prepend_path:
             LD_LIBRARY_PATH: '/usr/lib:/usr/lib64'
-            PATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin
-            CPATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/include
-        extra_rpaths:
-        - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib
-        - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib64
   intel-oneapi-mkl:
     buildable: false
     externals:
diff --git a/configs/sites/tier1/orion/mirrors.yaml b/configs/sites/tier1/orion/mirrors.yaml
index 97f382e8e..1ffcf0299 100644
--- a/configs/sites/tier1/orion/mirrors.yaml
+++ b/configs/sites/tier1/orion/mirrors.yaml
@@ -1,18 +1,2 @@
 mirrors:
-  local-source:
-    fetch:
-      url: file:///work/noaa/epic/role-epic/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
-    push:
-      url: file:///work/noaa/epic/role-epic/spack-stack/source-cache
-      access_pair:
-      - null
-      - null
-      access_token: null
-      profile: null
-      endpoint_url: null
+  local-source: file:///work/noaa/epic/role-epic/spack-stack/source-cache
diff --git a/configs/sites/tier1/orion/modules.yaml b/configs/sites/tier1/orion/modules.yaml
index 6f37dae97..4e9771f38 100644
--- a/configs/sites/tier1/orion/modules.yaml
+++ b/configs/sites/tier1/orion/modules.yaml
@@ -2,5 +2,3 @@ modules:
   default:
     enable::
     - lmod
-    lmod:
-      - openssl
diff --git a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml
index 4d7713b32..a9e75a280 100644
--- a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml
+++ b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml
@@ -14,22 +14,17 @@ packages:
     buildable: false
     externals:
     - spec: intel-oneapi-compilers@2025.3.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj
+      prefix: /apps/contrib/spack-stack/installs/oneapi-2025.3.1
       modules:
       - intel-oneapi-compilers/2025.3.1
       extra_attributes:
         compilers:
-          c: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icx
-          cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icpx
-          fortran: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/ifx
+          c: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx
+          cxx: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx
+          fortran: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx
         environment:
           prepend_path:
             LD_LIBRARY_PATH: '/usr/lib:/usr/lib64'
-            PATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin
-            CPATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/include
-        extra_rpaths:
-        - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib
-        - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib64
   intel-oneapi-mkl:
     buildable: false
     externals:
diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml
index c6a237d32..afa6be6d3 100644
--- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml
@@ -25,11 +25,6 @@ packages:
         environment:
           prepend_path:
             LD_LIBRARY_PATH: '/usr/lib:/usr/lib64'
-            PATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin
-            CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/include
-        extra_rpaths:
-        - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib
-        - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib64
   intel-oneapi-mkl:
     buildable: False
     externals:
diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml
index 2b2ea531c..9f887da79 100644
--- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml
@@ -18,11 +18,6 @@ packages:
         environment:
           prepend_path:
             LD_LIBRARY_PATH: '/usr/lib:/usr/lib64'
-            PATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin
-            CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/include 
-        extra_rpaths:
-        - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib
-        - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib64
   intel-oneapi-mpi:
     buildable: False
     externals: