diff --git a/configs/sites/tier1/derecho/compilers.yaml b/configs/sites/tier1/derecho/compilers.yaml
deleted file mode 100644
index 144673bc8..000000000
--- a/configs/sites/tier1/derecho/compilers.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-compilers::
-- compiler:
-    spec: oneapi@2024.2.1
-    paths:
-      cc: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/icx
-      cxx: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/icpx
-      f77: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/ifort
-      fc: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/ifort
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - 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:
-      cc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gcc
-      cxx: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/g++
-      f77: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
-      fc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    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/packages.yaml b/configs/sites/tier1/derecho/packages.yaml
index 59a5f72c5..3542ba3f3 100644
--- a/configs/sites/tier1/derecho/packages.yaml
+++ b/configs/sites/tier1/derecho/packages.yaml
@@ -1,7 +1,6 @@
 packages:
 # Modification of common packages
   all:
-    target: [core2]
     # Use system zlib instead of spack-built zlib-ng
     providers:
       zlib-api:: [zlib]
@@ -26,6 +25,10 @@ packages:
     externals:
     - spec: automake@1.15.1
       prefix: /usr
+  bash:
+    externals:
+    - spec: bash@4.4.23
+      prefix: /usr
   binutils:
     externals:
     - spec: binutils@2.37.20211103
@@ -87,12 +90,6 @@ packages:
     externals:
     - spec: openssh@8.4p1
       prefix: /usr
-  # spack concretizer gets confused when omitting %gcc from the external spec (a spack bug?)
-  openssl:
-    buildable: False
-    externals:
-    - spec: openssl@1.1.1l%gcc
-      prefix: /usr
   pkg-config:
     externals:
     - spec: pkg-config@0.29.2
@@ -101,9 +98,6 @@ packages:
     buildable: False
     externals:
     - spec: qt@5.14.2
-      # Newer versions don't work, some headers are missing
-      #prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/6suc
-      #prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/axtw
       prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/qt/5.14.2/gcc/7.5.0/eqcj
   sed:
     externals:
diff --git a/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml b/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml
new file mode 100644
index 000000000..b33163c33
--- /dev/null
+++ b/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml
@@ -0,0 +1,42 @@
+packages:
+  mpi:
+    buildable: False
+    require: cray-mpich@8.1.29
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.29 +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3
+      modules:
+      - ncarenv/24.12
+      - craype/2.7.31
+      - cray-mpich/8.1.29
+      - libfabric/1.15.2.0
+      - cray-pals/1.2.11
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.4.0
+      prefix: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.4.0 languages:='c,c++'
+      prefix: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c
+      modules:
+      - ncarenv/24.12
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gcc
+          cxx: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/g++
+          fortran: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
+        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/packages_gcc-12.5.0.yaml b/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml
new file mode 100644
index 000000000..f05ac4fb0
--- /dev/null
+++ b/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml
@@ -0,0 +1,42 @@
+packages:
+  mpi:
+    buildable: False
+    require: cray-mpich@8.1.32
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.32 +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3
+      modules:
+      - ncarenv/25.10
+      - craype/2.7.34
+      - cray-mpich/8.1.32
+      - libfabric/1.22.0
+      #- cray-pals/1.2.11
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.5.0
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.5.0 languages:='c,c++,fortran'
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+      modules:
+      - ncarenv/25.10
+      - gcc/12.5.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gcc
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/g++
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gfortran
+        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/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib64
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+        extra_rpaths: []
+
diff --git a/configs/sites/tier1/derecho/packages_gcc.yaml b/configs/sites/tier1/derecho/packages_gcc.yaml
deleted file mode 100644
index dff6a2a85..000000000
--- a/configs/sites/tier1/derecho/packages_gcc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@12.4.0]
-    providers:
-      mpi:: [cray-mpich@8.1.29]
-  mpi:
-    buildable: False
-  cray-mpich:
-    externals:
-    - spec: cray-mpich@8.1.29 +wrappers %gcc@12.4.0
-      prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3
-      modules:
-      - ncarenv/24.12
-      - craype/2.7.31
-      - cray-mpich/8.1.29
-      - libfabric/1.15.2.0
-      - cray-pals/1.2.11
-
diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml
new file mode 100644
index 000000000..54b386e70
--- /dev/null
+++ b/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml
@@ -0,0 +1,75 @@
+packages:
+  mpi:
+    buildable: False
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.32 +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+      modules:
+      - ncarenv/25.10
+      - craype/2.7.34
+      - cray-mpich/8.1.32
+      - libfabric/1.22.0
+  intel-oneapi-runtime:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-runtime@2025.2.1
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-compilers@2025.2.1
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2
+      modules:
+        - ncarenv/25.10
+        - intel/2025.2.1
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/icx
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/icpx
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/ifx
+        environment:
+          prepend_path:
+            PATH: '/glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin'
+            CPATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/include
+            LD_LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/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: []
+  intel-oneapi-mkl:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-mkl@2025.2.0
+      prefix: /glade/u/apps/derecho/25.10/spack/opt/spack/intel-oneapi-mkl/2025.2.0/intel-oneapi-compilers/2025.2.1/fj2q
+      modules:
+      - intel-oneapi-mkl/2025.2.0
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.5.0
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.5.0 languages:='c,c++'
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+      modules:
+      - ncarenv/25.10
+      - gcc/12.5.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gcc
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/g++
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gfortran
+        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/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib64
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+        extra_rpaths: []
diff --git a/configs/sites/tier1/derecho/packages_oneapi.yaml b/configs/sites/tier1/derecho/packages_oneapi.yaml
deleted file mode 100644
index 6bd26552c..000000000
--- a/configs/sites/tier1/derecho/packages_oneapi.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1, gcc@12.4.0]
-    providers:
-      mpi:: [cray-mpich@8.1.29]
-  mpi:
-    buildable: False
-  cray-mpich:
-    externals:
-    - spec: cray-mpich@8.1.29 +wrappers %oneapi@2024.2.1
-      prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1
-      modules:
-      - ncarenv/24.12
-      - craype/2.7.31
-      - cray-mpich/8.1.29
-      - libfabric/1.15.2.0
-      - cray-pals/1.2.11
-  intel-oneapi-runtime:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2
diff --git a/configs/sites/tier1/gaea-c6/compilers.yaml b/configs/sites/tier1/gaea-c6/compilers.yaml
deleted file mode 100644
index 0bd9c3a31..000000000
--- a/configs/sites/tier1/gaea-c6/compilers.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-compilers:
-- compiler:
-    spec: oneapi@2024.2.1
-    paths:
-      cc: cc
-      cxx: CC
-      f77: ftn
-      fc: ftn
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - PrgEnv-intel/8.6.0
-    - intel/2024.2
-    - craype/2.7.34
-    - cray-libsci/24.11.0
-    - libfabric/1.20.1
-    environment:
-      prepend_path:
-        LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2024.2/lib'
-      set:
-        # OpenSUSE on Gaea C6 sets CONFIG_SITE so
-        # Automake-based builds are installed in lib64
-        # which confuses some packages.
-        CONFIG_SITE: ''
-    extra_rpaths:
-      - /opt/intel/oneapi/compiler/2024.2/lib
-- compiler:
-    spec: intel@2023.2.0
-    paths:
-      cc: cc
-      cxx: CC
-      f77: ftn
-      fc: ftn
-    flags:
-      cflags: "-gcc-name=/usr/bin/gcc-12"
-      cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++"
-      fflags: "-gcc-name=/usr/bin/gcc-12"
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - PrgEnv-intel/8.5.0
-    - intel-classic/2023.2.0
-    - craype/2.7.30
-    - libfabric/1.20.1
-    environment:
-      prepend_path:
-        LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12'
-      set:
-        # OpenSUSE on Gaea C6 sets CONFIG_SITE so
-        # Automake-based builds are installed in lib64
-        # which confuses some packages.
-        CONFIG_SITE: ''
-    extra_rpaths: []
-- compiler:
-    spec: gcc@12.3.0
-    paths:
-      cc: /usr/bin/gcc-12
-      cxx: /usr/bin/g++-12
-      f77: /usr/bin/gfortran-12
-      fc:  /usr/bin/gfortran-12
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - PrgEnv-gnu/8.6.0
-    - gcc-native/12.3
-    - craype/2.7.34
-    - libfabric/1.20.1
-    - cray-libsci/24.11.0
-    - libfabric/1.20.1
-    environment: 
-      prepend_path:
-        LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2024.2/lib'
-    extra_rpaths:
-      - /opt/intel/oneapi/compiler/2024.2/lib
diff --git a/configs/sites/tier1/gaea-c6/packages.yaml b/configs/sites/tier1/gaea-c6/packages.yaml
index 03364d66b..d90929b67 100644
--- a/configs/sites/tier1/gaea-c6/packages.yaml
+++ b/configs/sites/tier1/gaea-c6/packages.yaml
@@ -67,13 +67,15 @@ packages:
   git:
     buildable: false
     externals:
-    - spec: git@2.42.0
-      modules: [git/2.42.0]
+    - spec: git@2.43.0
+      prefix: /usr
   git-lfs:
     buildable: false
     externals:
     - spec: git-lfs@2.11.0
-      modules: [git-lfs/2.11.0]
+      modules:
+        - Core/24.11
+        - git-lfs/2.11.0
   gmake:
     externals:
     - spec: gmake@4.2.1
@@ -123,7 +125,6 @@ packages:
     externals:
     - spec: mysql@8.0.36
       prefix: /ncrc/proj/epic/spack-stack/c6/installs/mysql/8.0.36
-      modules: [mysql/8.0.36]
   ncurses:
     externals:
     - spec: ncurses@6.1.20180317+termlib abi=6
@@ -146,7 +147,6 @@ packages:
     externals:
     - spec: qt@5.12.6
       prefix: /ncrc/proj/epic/spack-stack/c6/installs/qt5/qt-5.12.6/qtbase
-      modules: [qt/5.12.6]
   rdma-core:
     externals:
     - spec: rdma-core@37.0
diff --git a/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml b/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml
new file mode 100644
index 000000000..5430b7a63
--- /dev/null
+++ b/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml
@@ -0,0 +1,37 @@
+packages:
+  mpi:
+    buildable: False
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.32 ~wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+      modules:
+      - cray-mpich/8.1.32
+      - craype-network-ofi
+  gcc-runtime:
+    buildable: False
+    externals:
+      - spec: gcc-runtime@12.3.0
+        prefix: /opt/cray/pe/gcc-native/12/bin
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.3.0 languages:='c,c++'
+      prefix: /opt/cray/pe/gcc-native/12/bin
+      modules:
+        - PrgEnv-gnu/8.6.0
+        - gcc-native/12.3
+        - craype/2.7.35
+        - libfabric/1.22.0
+        - cray-libsci/25.09.0
+      extra_attributes:
+        compilers:
+          c: /usr/bin/gcc-12
+          cxx: /usr/bin/g++-12
+          fortran: /usr/bin/gfortran-12
+        environment:
+          prepend_path:
+            LD_LIBRARY_PATH: '/opt/cray/libfabric/1.22.0/lib64:/opt/cray/pe/libsci/25.09.0/INTEL/2025.0/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2025.2/lib'
+      extra_rpaths:
+        - /opt/intel/oneapi/compiler/2025.2/lib
diff --git a/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml b/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml
new file mode 100644
index 000000000..354f6e75a
--- /dev/null
+++ b/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml
@@ -0,0 +1,37 @@
+packages:
+  mpi:
+    buildable: False
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.32 ~wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+      modules:
+      - cray-mpich/8.1.32
+      - craype-network-ofi
+  gcc-runtime:
+    buildable: False
+    externals:
+      - spec: gcc-runtime@13.3.1
+        prefix: /opt/cray/pe/gcc-native/13/bin
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@13.3.1 languages:='c,c++'
+      prefix: /opt/cray/pe/gcc-native/12/bin
+      modules:
+        - PrgEnv-gnu/8.6.0
+        - gcc-native/13.2
+        - craype/2.7.35
+        - libfabric/1.22.0
+        - cray-libsci/25.09.0
+      extra_attributes:
+        compilers:
+          c: /usr/bin/gcc-13
+          cxx: /usr/bin/g++-13
+          fortran: /usr/bin/gfortran-13
+        environment:
+          prepend_path:
+            LD_LIBRARY_PATH: '/opt/cray/libfabric/1.22.0/lib64:/opt/cray/pe/libsci/25.09.0/INTEL/2025.0/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2025.2/lib'
+      extra_rpaths:
+        - /opt/intel/oneapi/compiler/2025.2/lib
diff --git a/configs/sites/tier1/gaea-c6/packages_gcc.yaml b/configs/sites/tier1/gaea-c6/packages_gcc.yaml
deleted file mode 100644
index f7cc32465..000000000
--- a/configs/sites/tier1/gaea-c6/packages_gcc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@12.3.0]
-    providers:
-      mpi:: [cray-mpich@8.1.32]
-  mpi:
-    buildable: False
-  cray-mpich:
-    externals:
-    - spec: cray-mpich@8.1.32
-      prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3
-      modules:
-      - craype-network-ofi
-      - cray-mpich/8.1.32
-  gcc-runtime:
-    externals:
-    - spec: gcc-runtime@12.3.0%gcc@12.3.0
-      prefix: /usr
diff --git a/configs/sites/tier1/gaea-c6/packages_intel.yaml b/configs/sites/tier1/gaea-c6/packages_intel.yaml
deleted file mode 100644
index 6a26ba5c1..000000000
--- a/configs/sites/tier1/gaea-c6/packages_intel.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-packages:
-  all:
-    compiler:: [intel@2023.2.0]
-    providers:
-      mpi:: [cray-mpich@8.1.30]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-
-### MPI, Python, MKL
-  mpi:
-    buildable: False
-  cray-mpich:
-    externals:
-    - spec: cray-mpich@8.1.30%intel@2023.2.0~wrappers
-      prefix: /opt/cray/pe/mpich/8.1.30/ofi/intel/2022.1
-      modules:
-      - craype-network-ofi
-      - cray-mpich/8.1.30
-  intel-oneapi-mkl:
-    buildable: False
-
-### Modification of common packages
-  bison:
-    require:
-    - '%gcc'
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml
new file mode 100644
index 000000000..7f783a912
--- /dev/null
+++ b/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml
@@ -0,0 +1,76 @@
+packages:
+  mpi:
+    buildable: False
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: cray-mpich@8.1.32
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+      modules:
+      - PrgEnv-intel/8.6.0
+      - cray-mpich/8.1.32
+      - libfabric/1.22.0
+      - craype-network-ofi
+  intel-oneapi-runtime:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-runtime@2025.2.1
+      prefix: /opt/intel/oneapi
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-compilers@2025.2.1
+      prefix: /opt/intel/oneapi
+      modules:
+        - PrgEnv-intel/8.6.0
+        - intel/2025.2
+        - craype/2.7.35
+        - cray-libsci/25.09.0
+        - libfabric/1.22.0
+      extra_attributes:
+        compilers:
+          c: /opt/intel/oneapi/compiler/2025.2/bin/icx
+          cxx: /opt/intel/oneapi/compiler/2025.2/bin/icpx
+          fortran: /opt/intel/oneapi/compiler/2025.2/bin/ifx
+        environment:
+          prepend_path:
+            PATH: '/opt/cray/pe/gcc-native/12/bin'
+            LD_LIBRARY_PATH: '/opt/cray/libfabric/1.22.0/lib64:/opt/cray/pe/libsci/25.09.0/INTEL/2025.0/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2025.2/lib:/opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1/lib'
+          set:
+            # OpenSUSE on Gaea C6 sets CONFIG_SITE so
+            # Automake-based builds are installed in lib64
+            # which confuses some packages.
+            CONFIG_SITE: ''
+        extra_rpaths:
+          - /opt/intel/oneapi/compiler/2025.2/lib  
+  intel-oneapi-mkl:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-mkl@2025.2
+      prefix: /opt/intel/oneapi
+  gcc-runtime:
+    buildable: False
+    externals:
+      - spec: gcc-runtime@12.3.0
+        prefix: /opt/cray/pe/gcc-native/12/bin
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.3.0 languages:='c,c++'
+      prefix: /opt/cray/pe/gcc-native/12/bin
+      modules:
+        - PrgEnv-gnu/8.6.0
+        - gcc-native/12.3
+        - craype/2.7.35
+        - libfabric/1.22.0
+        - cray-libsci/25.09.0
+      extra_attributes:
+        compilers:
+          c: /opt/cray/pe/gcc-native/12/bin/gcc
+          cxx: /opt/cray/pe/gcc-native/12/bin/g++
+          fortran: /opt/cray/pe/gcc-native/12/bin/gfortran
+        environment: 
+          prepend_path:
+            LD_LIBRARY_PATH: '/opt/cray/libfabric/1.22.0/lib64:/opt/cray/pe/libsci/25.09.0/INTEL/2025.0/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2025.2/lib'
+      extra_rpaths:
+        - /opt/intel/oneapi/compiler/2025.2/lib
diff --git a/configs/sites/tier1/gaea-c6/packages_oneapi.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml
deleted file mode 100644
index 63189597a..000000000
--- a/configs/sites/tier1/gaea-c6/packages_oneapi.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1, gcc@12.3.0]
-    providers:
-      mpi:: [cray-mpich@8.1.32]
-
-### MPI, Python, MKL
-  mpi:
-    buildable: False
-  cray-mpich:
-    buildable: False
-    externals:
-    - spec: cray-mpich@8.1.32%oneapi@2024.2.1 ~wrappers
-      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
-      modules:
-      - cray-mpich/8.1.32
-      - craype-network-ofi
-  intel-oneapi-runtime:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /opt/intel/oneapi/compiler/2024.2
-  intel-oneapi-mkl:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mkl@2023.2.0%oneapi@2024.2.1
-      prefix: /opt/intel/oneapi
-
-### Modification of common packages
-  bison:
-    require:
-    - '%gcc'
-  ectrans:
-    require::
-    - '@1.2.0 +mkl ~fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/hercules/compilers.yaml b/configs/sites/tier1/hercules/compilers.yaml
deleted file mode 100644
index efe9f2712..000000000
--- a/configs/sites/tier1/hercules/compilers.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-compilers:
-- compiler:
-    spec: oneapi@=2024.2.1
-    paths:
-      cc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icx
-      cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icpx
-      f77: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
-      fc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - spack-managed-x86-64_v3
-    - intel-oneapi-compilers/2024.2.1
-    environment:
-      set:
-        # https://github.com/ufs-community/ufs-weather-model/issues/2015#issuecomment-1864438186
-        I_MPI_EXTRA_FILESYSTEM: 'ON'
-        # Override system module settings for FC and F77 (they're set to ifx)
-        F77: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
-        FC: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
-      prepend_path:
-        PATH: /usr/bin
-        LD_LIBRARY_PATH: /usr/lib:/usr/lib64
-        CPATH: '/usr/include/c++/11:/usr/include/c++/11/x86_64-redhat-linux'
-    extra_rpaths: []
-- compiler:
-    spec: intel@2021.9.0
-    paths:
-      cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icc
-      cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
-      f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-      fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - intel-oneapi-compilers/2023.1.0
-    environment:
-      set:
-        # https://github.com/ufs-community/ufs-weather-model/issues/2015#issuecomment-1864438186
-        I_MPI_EXTRA_FILESYSTEM: 'ON'
-    extra_rpaths: []
-- compiler:
-    spec: gcc@13.3.0
-    paths:
-      cc: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gcc
-      cxx: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/g++
-      f77: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gfortran
-      fc: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gfortran
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - gnu/13.3.0
-    environment:
-      prepend_path:
-        MODULEPATH: '/apps/contrib/spack-stack/modulefiles'
-    extra_rpaths: []
diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml
index a8bccf22b..7c438842b 100644
--- a/configs/sites/tier1/hercules/packages.yaml
+++ b/configs/sites/tier1/hercules/packages.yaml
@@ -71,19 +71,10 @@ packages:
     externals:
     - spec: groff@1.22.4
       prefix: /usr
-  # Don't use, incomplete installation!
-  #libtool:
-  #  externals:
-  #  - spec: libtool@2.4.6
-  #    prefix: /usr
   m4:
     externals:
     - spec: m4@1.4.19
       prefix: /usr
-  openssl:
-    externals:
-    - spec: openssl@3.0.1
-      prefix: /usr
   pkgconf:
     externals:
     - spec: pkgconf@1.7.3
@@ -100,10 +91,6 @@ packages:
     externals:
     - spec: subversion@1.14.1
       prefix: /usr
-  #tar:
-  #  externals:
-  #  - spec: tar@1.34
-  #    prefix: /usr
   texinfo:
     externals:
     - spec: texinfo@6.7
diff --git a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml
new file mode 100644
index 000000000..673772d5e
--- /dev/null
+++ b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml
@@ -0,0 +1,29 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - openmpi@4.1.4
+  openmpi:
+    buildable: False
+    externals:
+    - spec: openmpi@4.1.4
+      prefix: /apps/spack-managed/gcc-11.3.1/openmpi-4.1.4-zabolhazla2ahsroedlyt2pu4mkp7o3q
+      modules:
+      - openmpi/4.1.6
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.2.0
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.2.0 languages:='c,c++,fortran'
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo
+      modules:
+      - gcc/12.2.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc
+          cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++
+          fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran
diff --git a/configs/sites/tier1/hercules/packages_gcc.yaml b/configs/sites/tier1/hercules/packages_gcc.yaml
deleted file mode 100644
index 835c8dd72..000000000
--- a/configs/sites/tier1/hercules/packages_gcc.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@13.3.0]
-    providers:
-      mpi:: [openmpi@4.1.6]
-  mpi:
-    buildable: False
-  openmpi:
-    externals:
-    - spec: openmpi@4.1.6~atomics~cuda~cxx~cxx_exceptions~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
-      prefix: /apps/contrib/spack-stack/openmpi/installs/openmpi/4.1.6
-      modules:
-      - gnu/13.3.0
-      - openmpi/4.1.6
-
-  ectrans:
-    require::
-    - '~mkl +fftw'
-  gsibec:
-    require::
-    - '~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/hercules/packages_intel.yaml b/configs/sites/tier1/hercules/packages_intel.yaml
deleted file mode 100644
index 527921f3c..000000000
--- a/configs/sites/tier1/hercules/packages_intel.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-packages:
-  all:
-    compiler:: [intel@2021.9.0,gcc@12.2.0]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.9.0]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    externals:
-    - spec: intel-oneapi-mpi@2021.9.0%intel@2021.9.0 +classic-names
-      modules:
-      - intel-oneapi-mpi/2021.9.0
-  intel-oneapi-mkl:
-    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
-    buildable: False
-    #externals:
-    #- spec: intel-oneapi-mkl@2023.1.0%intel@2021.9.0
-    #  modules:
-    #  - intel-oneapi-mkl/2023.1.0
-  # Remove this section to switch to intel-oneapi-mkl
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml-DO.NOT.USE b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml-DO.NOT.USE
new file mode 100644
index 000000000..1a0cefc1f
--- /dev/null
+++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml-DO.NOT.USE
@@ -0,0 +1,68 @@
+packages:
+  mpi:
+    buildable: false
+    require:
+    - intel-oneapi-mpi@2021.17
+  intel-oneapi-mpi:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-mpi@2021.17
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/intel-oneapi-compilers-2025.3.1/intel-oneapi-mpi-2021.17.1-yin2cansthgf7jsldji6psbjkxqmrz3n
+      modules:
+      - intel-oneapi-mpi/2021.17.1
+  intel-oneapi-runtime:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-runtime@2025.3.1
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj
+  intel-oneapi-compilers:
+    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
+      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
+        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:
+    - spec: intel-oneapi-mkl@2025.3.0
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2025.3.0-k4vxa4iuzfth5qvxi5ymh36ap6kb4gfj
+      modules:
+      - intel-oneapi-mkl/2025.3.0
+  intel-oneapi-tbb:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-tbb@2022.3.0
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-tbb-2022.3.0-npcdu7tjriihmbm4cbi4fepycg34d2fd
+      modules:
+      - intel-oneapi-tbb/2022.3.0
+  gcc-runtime:
+    buildable: false
+    externals:
+    - spec: gcc-runtime@12.2.0
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+  gcc:
+    buildable: false
+    externals:
+    - spec: gcc@12.2.0 languages:='c,c++'
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+      modules:
+      - gcc/12.2.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gcc
+          cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/g++
+          fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gfortran
diff --git a/configs/sites/tier1/hercules/packages_oneapi.yaml b/configs/sites/tier1/hercules/packages_oneapi.yaml
deleted file mode 100644
index 6eed0cd0a..000000000
--- a/configs/sites/tier1/hercules/packages_oneapi.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.13]
-      # If using intel-oneapi-mkl, make appropriate changes below
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-3pv63eugwmse2xpeglxib4dr2oeb42g2
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-compilers/2024.2.1
-      - intel-oneapi-mpi/2021.13.1
-
-  intel-oneapi-mkl:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mkl@2024.2.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2024.2.1-aeiool3i5jj4newwifvkhow5almp67rt
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-mkl/2024.2.1
-
-  intel-oneapi-runtime:
-    externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-runtime-2024.2.1-hl5zgdjaldynq35dq3yotclfy2vblybx
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-compilers/2024.2.1
-      - intel-oneapi-runtime/2024.2.1
-
-  ectrans:
-    require::
-    - '@1.5.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-maturin:
-    require:
-    - '%gcc'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
-  py-scipy:
-    require:
-    - '%gcc'
-  zlib-ng:
-    require:
-    - '~shared'
diff --git a/configs/sites/tier1/orion/compilers.yaml b/configs/sites/tier1/orion/compilers.yaml
deleted file mode 100644
index 22b211b65..000000000
--- a/configs/sites/tier1/orion/compilers.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-compilers:
-- compiler:
-    spec: intel@2021.9.0
-    paths:
-      cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icc
-      cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
-      f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-      fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - intel-oneapi-compilers/2023.1.0
-    environment:
-      set:
-        # https://github.com/ufs-community/ufs-weather-model/issues/2015#issuecomment-1864438186
-        I_MPI_EXTRA_FILESYSTEM: 'ON'
-    extra_rpaths: []
-- compiler:
-    spec: gcc@12.2.0
-    paths:
-      cc: /work/noaa/epic/role-epic/spack-stack/orion/installs/gcc/12.2.0/bin/gcc
-      cxx: /work/noaa/epic/role-epic/spack-stack/orion/installs/gcc/12.2.0/bin/g++
-      f77: /work/noaa/epic/role-epic/spack-stack/orion/installs/gcc/12.2.0/bin/gfortran
-      fc: /work/noaa/epic/role-epic/spack-stack/orion/installs/gcc/12.2.0/bin/gfortran
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - gcc/12.2.0
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: oneapi@=2024.2.1
-    paths:
-      cc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icx
-      cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icpx
-      f77: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
-      fc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - spack-managed-x86-64_v3
-    - intel-oneapi-compilers/2024.2.1
-    environment:
-      set:
-        # https://github.com/ufs-community/ufs-weather-model/issues/2015#issuecomment-1864438186
-        I_MPI_EXTRA_FILESYSTEM: 'ON'
-        # override system module settings for FC and F77 (they're set to ifx)
-        F77: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
-        FC: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
-      prepend_path:
-        PATH: /usr/bin
-        LD_LIBRARY_PATH: /usr/lib:/usr/lib64
-        CPATH: '/usr/include/c++/11:/usr/include/c++/11/x86_64-redhat-linux'
-    extra_rpaths: []
diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml
index a7ef7c899..99675d2a4 100644
--- a/configs/sites/tier1/orion/packages.yaml
+++ b/configs/sites/tier1/orion/packages.yaml
@@ -33,11 +33,6 @@ packages:
     externals:
     - spec: coreutils@8.32
       prefix: /usr
-  # Don't use issues with openssl
-  #curl:
-  #  externals:
-  #  - spec: curl@7.76.1+gssapi+ldap+nghttp2
-  #    prefix: /usr
   diffutils:
     externals:
     - spec: diffutils@3.7
@@ -78,11 +73,6 @@ packages:
     externals:
     - spec: groff@1.22.4
       prefix: /usr
-  # Don't use, incomplete installation!
-  #libtool:
-  #  externals:
-  #  - spec: libtool@2.4.6
-  #    prefix: /usr
   m4:
     externals:
     - spec: m4@1.4.19
@@ -91,10 +81,6 @@ packages:
     externals:
     - spec: openssh@8.7p1
       prefix: /usr
-  openssl:
-    externals:
-    - spec: openssl@3.0.1
-      prefix: /usr
   perl:
     externals:
     - spec: perl@5.32.1~cpanm+opcode+open+shared+threads
@@ -115,10 +101,6 @@ packages:
     externals:
     - spec: subversion@1.14.1
       prefix: /usr
-  #tar:
-  #  externals:
-  #  - spec: tar@1.34
-  #    prefix: /usr
   wget:
     externals:
     - spec: wget@1.21.1
diff --git a/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml b/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml
new file mode 100644
index 000000000..fe5305df0
--- /dev/null
+++ b/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml
@@ -0,0 +1,29 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - openmpi@4.1.6
+  openmpi:
+    buildable: False
+    externals:
+    - spec: openmpi@4.1.6
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/openmpi-4.1.6-awzgueipsaecmty57kpycopknhad3xbe
+      modules:
+      - openmpi/4.1.6
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.2.0
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.2.0 languages:='c,c++,fortran'
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+      modules:
+      - gcc/12.2.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gcc
+          cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/g++
+          fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gfortran
diff --git a/configs/sites/tier1/orion/packages_gcc.yaml b/configs/sites/tier1/orion/packages_gcc.yaml
deleted file mode 100644
index df636b05f..000000000
--- a/configs/sites/tier1/orion/packages_gcc.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@12.2.0]
-    providers:
-      mpi:: [openmpi@4.1.4]
-  mpi:
-    buildable: False
-  openmpi:
-    externals:
-    - spec: openmpi@4.1.4%gcc@12.2.0 ~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=none romio-filesystem=none schedulers=slurm
-      prefix: /apps/spack-managed/gcc-12.2.0/openmpi-4.1.4-tgam5l5paaiwksys4r7nc5xocwm33iv4
-      modules:
-      - gcc/12.2.0
-      - openmpi/4.1.4
diff --git a/configs/sites/tier1/orion/packages_intel.yaml b/configs/sites/tier1/orion/packages_intel.yaml
deleted file mode 100644
index 527921f3c..000000000
--- a/configs/sites/tier1/orion/packages_intel.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-packages:
-  all:
-    compiler:: [intel@2021.9.0,gcc@12.2.0]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.9.0]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    externals:
-    - spec: intel-oneapi-mpi@2021.9.0%intel@2021.9.0 +classic-names
-      modules:
-      - intel-oneapi-mpi/2021.9.0
-  intel-oneapi-mkl:
-    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
-    buildable: False
-    #externals:
-    #- spec: intel-oneapi-mkl@2023.1.0%intel@2021.9.0
-    #  modules:
-    #  - intel-oneapi-mkl/2023.1.0
-  # Remove this section to switch to intel-oneapi-mkl
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml
new file mode 100644
index 000000000..1a0cefc1f
--- /dev/null
+++ b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml
@@ -0,0 +1,68 @@
+packages:
+  mpi:
+    buildable: false
+    require:
+    - intel-oneapi-mpi@2021.17
+  intel-oneapi-mpi:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-mpi@2021.17
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/intel-oneapi-compilers-2025.3.1/intel-oneapi-mpi-2021.17.1-yin2cansthgf7jsldji6psbjkxqmrz3n
+      modules:
+      - intel-oneapi-mpi/2021.17.1
+  intel-oneapi-runtime:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-runtime@2025.3.1
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj
+  intel-oneapi-compilers:
+    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
+      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
+        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:
+    - spec: intel-oneapi-mkl@2025.3.0
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2025.3.0-k4vxa4iuzfth5qvxi5ymh36ap6kb4gfj
+      modules:
+      - intel-oneapi-mkl/2025.3.0
+  intel-oneapi-tbb:
+    buildable: false
+    externals:
+    - spec: intel-oneapi-tbb@2022.3.0
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-tbb-2022.3.0-npcdu7tjriihmbm4cbi4fepycg34d2fd
+      modules:
+      - intel-oneapi-tbb/2022.3.0
+  gcc-runtime:
+    buildable: false
+    externals:
+    - spec: gcc-runtime@12.2.0
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+  gcc:
+    buildable: false
+    externals:
+    - spec: gcc@12.2.0 languages:='c,c++'
+      prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3
+      modules:
+      - gcc/12.2.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gcc
+          cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/g++
+          fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gfortran
diff --git a/configs/sites/tier1/orion/packages_oneapi.yaml b/configs/sites/tier1/orion/packages_oneapi.yaml
deleted file mode 100644
index 744618221..000000000
--- a/configs/sites/tier1/orion/packages_oneapi.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.13]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  intel-oneapi-mpi:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-compilers/2024.2.1
-      - intel-oneapi-mpi/2021.13.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-3pv63eugwmse2xpeglxib4dr2oeb42g2
-
-  intel-oneapi-mkl:
-    buildable: False
-    externals:
-    - spec: intel-oneapi-mkl@2024.2.1
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-mkl/2024.2.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2024.2.1-aeiool3i5jj4newwifvkhow5almp67rt
-
-  intel-oneapi-runtime:
-    externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-runtime-2024.2.1-hl5zgdjaldynq35dq3yotclfy2vblybx
-      modules:
-      - spack-managed-x86-64_v3
-      - intel-oneapi-compilers/2024.2.1
-      - intel-oneapi-runtime/2024.2.1
-
-  ectrans:
-    require::
-    - '@1.5.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
-  py-scipy:
-    require:
-    - '%gcc'
diff --git a/configs/sites/tier1/ursa/compilers.yaml b/configs/sites/tier1/ursa/compilers.yaml
deleted file mode 100644
index 0f86cb3e2..000000000
--- a/configs/sites/tier1/ursa/compilers.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-compilers:
-- compiler:
-    spec: oneapi@=2024.2.1
-    paths:
-      cc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/icx
-      cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/icpx
-      f77: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/ifort
-      fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/ifort
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - intel-oneapi-compilers/2024.2.1
-    environment:
-      prepend_path:
-        CPATH: /usr/include/c++/11/x86_64-redhat-linux
-    extra_rpaths: []
-
-- compiler:
-    spec: gcc@12.4.0
-    paths:
-      cc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
-      cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
-      f77: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
-      fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
-    flags: {}
-    operating_system: rocky9
-    target: x86_64
-    modules:
-    - gcc/12.4.0
-    environment:
-      prepend_path:
-        CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib/gcc/x86_64-pc-linux-gnu/12.4.0/include
-    extra_rpaths: []
-
diff --git a/configs/sites/tier1/ursa/packages.yaml b/configs/sites/tier1/ursa/packages.yaml
index 5a32c35c6..a9ebff186 100644
--- a/configs/sites/tier1/ursa/packages.yaml
+++ b/configs/sites/tier1/ursa/packages.yaml
@@ -82,6 +82,10 @@ packages:
     externals:
     - spec: gmake@4.3
       prefix: /usr
+  grep:
+    externals:
+    - spec: grep@3.6.1
+      prefix: /usr
   groff:
     externals:
     - spec: groff@1.22.4
@@ -113,11 +117,6 @@ packages:
     externals:
     - spec: openjdk@1.8.0.412.b08-2
       prefix: /usr
-  openssl:
-      buildable: False
-      externals:
-      - spec: openssl@3.0.7
-        prefix: /usr
   pkg-config:
     externals:
     - spec: pkg-config@1.7.3
diff --git a/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml b/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml
new file mode 100644
index 000000000..be934552c
--- /dev/null
+++ b/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml
@@ -0,0 +1,29 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - openmpi@4.1.6
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.4.0
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrh
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.4.0 languages:='c,c++,fortran'
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrh
+      modules:
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
+  openmpi:
+    buildable: False
+    externals:
+    - spec: openmpi@4.1.6
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-2dkf6t23iyw4xodxruh72yvmrhhvyoms
+      modules:
+      - openmpi/4.1.6
diff --git a/configs/sites/tier1/ursa/packages_gcc.yaml b/configs/sites/tier1/ursa/packages_gcc.yaml
deleted file mode 100644
index 5774c127d..000000000
--- a/configs/sites/tier1/ursa/packages_gcc.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-packages:
-  all:
-    compiler:: [gcc@12.4.0]
-    providers:
-      mpi:: [openmpi@4.1.6]
-  mpi:
-    buildable: False
-  openmpi:
-    externals:
-    - spec: openmpi@4.1.6~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
-      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-2dkf6t23iyw4xodxruh72yvmrhhvyoms
-      modules:
-      - openmpi/4.1.6
-  gcc-runtime:
-    externals:
-    - spec: gcc-runtime@12.4.0%gcc@12.4.0
-      prefix: /usr
diff --git a/configs/sites/tier1/ursa/packages_hpcx.yaml b/configs/sites/tier1/ursa/packages_hpcx.yaml
deleted file mode 100644
index b581b7891..000000000
--- a/configs/sites/tier1/ursa/packages_hpcx.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1,gcc@12.4.0]
-    providers:
-      mpi:: [hpcx-mpi@2.18.1]
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  hpcx-mpi:
-    buildable: False
-    externals:
-    - spec: hpcx-mpi@2.18.1%oneapi@2024.2.1
-      modules:
-      - hpc-x/2.18.1-oneapi2024
-      prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-oneapi2024
-  intel-oneapi-runtime:
-    externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2
-      modules:
-      - compiler-rt/2024.2.1
-  gcc-runtime:
-    externals:
-    - spec: gcc-runtime@12.4.0%gcc@12.4.0
-      prefix: /usr
-
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
new file mode 100644
index 000000000..e072f0d6f
--- /dev/null
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml
@@ -0,0 +1,54 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - hpcx-mpi@2.18.1
+  hpcx-mpi:
+    buildable: False
+    externals:
+    - spec: hpcx-mpi@2.18.1
+      prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-mt-oneapi2025
+      modules:
+      - hpc-x/2.18.1-mt-oneapi2025
+  intel-oneapi-runtime:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-runtime@2025.2.1
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-compilers@2025.2.1
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7
+      modules:
+      - intel-oneapi-compilers/2025.2.1
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/icx
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/icpx
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/ifx
+        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
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.4.0
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.4.0 languages:='c,c++'
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+      modules:
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml
new file mode 100644
index 000000000..6fa652297
--- /dev/null
+++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml
@@ -0,0 +1,66 @@
+packages:
+  mpi:
+    buildable: False
+    require:
+    - intel-oneapi-mpi@2021.13
+  intel-oneapi-runtime:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-runtime@2025.2.1
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-compilers@2025.2.1
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7
+      modules:
+      - intel-oneapi-compilers/2025.2.1
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/icx
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/icpx
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7/compiler/2025.2/bin/ifx
+        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:
+    - spec: intel-oneapi-mpi@2021.13
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-ss72gbndvat3oz22sa6lhmlbjkeabrn4
+      modules:
+      - intel-oneapi-mpi/2021.13.1
+  intel-oneapi-mkl:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-mkl@2024.2
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat
+      modules:
+      - intel-oneapi-mkl/2024.2.1
+  intel-oneapi-tbb:
+    buildable: False
+    externals:
+    - spec: intel-oneapi-tbb@2021.12
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-tbb-2021.12.0-grcsmccjpm3trn6rgtyq76kdxks6ygzm
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: gcc-runtime@12.4.0
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+  gcc:
+    buildable: False
+    externals:
+    - spec: gcc@12.4.0 languages:='c,c++'
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj
+      modules:
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
+          cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
+          fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
diff --git a/configs/sites/tier1/ursa/packages_oneapi.yaml b/configs/sites/tier1/ursa/packages_oneapi.yaml
deleted file mode 100644
index 52d6f1f22..000000000
--- a/configs/sites/tier1/ursa/packages_oneapi.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-packages:
-  all:
-    compiler:: [oneapi@2024.2.1,gcc@12.4.0]
-    providers:
-      # Intel oneAPI MPI
-      #mpi:: [intel-oneapi-mpi@2021.13]
-      # NVIDIA HPC-X
-      mpi:: [hpcx-mpi@2.18.1]
-      # Change as appropriate to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-  mpi:
-    buildable: False
-  # Intel oneAPI MPI
-  intel-oneapi-mpi:
-    externals:
-    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
-      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-ss72gbndvat3oz22sa6lhmlbjkeabrn4
-      modules:
-      - intel-oneapi-mpi/2021.13.1
-  # NVIDIA HPC-X
-  #hpcx-mpi:
-  #  externals:
-  #  - spec: hpcx-mpi@2.18.1%oneapi@2024.2.1
-  #    prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-oneapi2024
-  #    modules:
-  #    - hpc-x/2.18.1-oneapi2024
-  intel-oneapi-mkl:
-    externals:
-    - spec: intel-oneapi-mkl@2024.2.1%oneapi@2024.2.1
-      modules:
-      - intel-oneapi-mkl/2024.2.1
-      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat
-# Commented out for spack v0.23 to avoid duplicate packages
-#  intel-oneapi-runtime:
-#    externals:
-#    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-#      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2
-#      modules:
-#      - compiler-rt/2024.2.1
-#  gcc-runtime:
-#    externals:
-#    - spec: gcc-runtime@12.4.0%gcc@12.4.0
-#      prefix: /usr
-