diff --git a/configs/sites/tier1/gaea-c6/compilers.yaml b/configs/sites/tier1/gaea-c6/compilers.yaml
index 774275d9f..86025058a 100644
--- a/configs/sites/tier1/gaea-c6/compilers.yaml
+++ b/configs/sites/tier1/gaea-c6/compilers.yaml
@@ -1,4 +1,30 @@
 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:
@@ -11,6 +37,7 @@ compilers:
       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
@@ -34,10 +61,16 @@ compilers:
       fc:  /usr/bin/gfortran-12
     flags: {}
     operating_system: sles15
+    target: x86_64
     modules:
-    - PrgEnv-gnu/8.5.0
+    - PrgEnv-gnu/8.6.0
     - gcc-native/12.3
-    - craype/2.7.30
-    - libfabric/1.20.1 
+    - craype/2.7.34
+    - libfabric/1.20.1
+    - cray-libsci/24.11.0
+    - libfabric/1.20.1
     environment: {}
-    extra_rpaths: []
+      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_gcc.yaml b/configs/sites/tier1/gaea-c6/packages_gcc.yaml
new file mode 100644
index 000000000..f7cc32465
--- /dev/null
+++ b/configs/sites/tier1/gaea-c6/packages_gcc.yaml
@@ -0,0 +1,18 @@
+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_oneapi.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml
new file mode 100644
index 000000000..63189597a
--- /dev/null
+++ b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml
@@ -0,0 +1,42 @@
+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'