diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml
index d361631..9e566bd 100644
--- a/env/sles15/aarch64/sysconfigs/packages.yaml
+++ b/env/sles15/aarch64/sysconfigs/packages.yaml
@@ -38,8 +38,6 @@ packages:
             fortran: ftn
           operating_system: sles15
           target: aarch64
-  cairo:
-    require: '%gcc@7.5.0'
   cmake:
     require: '%gcc@7.5.0'
   coreutils:
@@ -136,9 +134,7 @@ packages:
   gdbm:
     require: '%gcc@7.5.0'
   gettext:
-    externals:
-      - prefix: /usr
-        spec: 'gettext@0.20.2'
+    require: '%gcc@7.5.0'
   git:
     require: '%gcc@7.5.0'
   gmake:
@@ -189,6 +185,11 @@ packages:
     require: '%gcc@7.5.0'
   libsigsegv:
     require: '%gcc@7.5.0'
+  librsvg:
+    buildable: false
+    externals:
+      - prefix: /usr
+        spec: librsvg@2.48.0
   libtool:
     require: '%gcc@7.5.0'
   libxml2:
@@ -267,8 +268,8 @@ packages:
         spec: openldap@2.4.46
   openmpi:
     require:
-      - spec: "schedulers=slurm fabrics=ofi +pmi"
-        when: "@5.0.0:"
+      - spec: "schedulers=slurm fabrics=ofi"
+        when: "@5.0.0"
       - spec:  "schedulers=slurm fabrics=ofi +cxx +cxx_exceptions +cuda +legacylaunchers"
         when: "@:5.0.0"
   openssh:
diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml
index c7bbdca..024cd32 100644
--- a/env/sles15/x86_64/admin/unstable/spack.yaml
+++ b/env/sles15/x86_64/admin/unstable/spack.yaml
@@ -5,6 +5,14 @@ spack:
     install_tree:
       root: $spack/opt/spack/unstable
   definitions:
+  - compilers:
+    - gcc@7.5.0
+    - gcc@=12.3
+    - intel-oneapi-compilers@=2024.1.0
+    - intel-oneapi-compilers@=2022.1.0
+    - gcc@=13.2.0 arch=linux-sles15-x86_64
+    - nvhpc@23.9
+    - cce@17.0.0
   - gcc_7.5.0:
     - visit@3.3.3/fo37wwb
   - gcc_12.3:
@@ -48,6 +56,9 @@ spack:
               SLURM_MPI_TYPE: 'pmix'
               OMPI_MCA_mtl_ofi_disable_hmem: 'true'
   specs:
+  - matrix:
+    - [$compilers]
+    - ['%gcc@7.5.0']
   - matrix:
     - [$gcc_7.5.0]
     - ['%gcc@7.5.0']
diff --git a/env/sles15/x86_64/sysconfigs/compilers.yaml b/env/sles15/x86_64/sysconfigs/compilers.yaml
index 5717fdd..2b2ecfa 100644
--- a/env/sles15/x86_64/sysconfigs/compilers.yaml
+++ b/env/sles15/x86_64/sysconfigs/compilers.yaml
@@ -1,67 +1,4 @@
 compilers:
-- compiler:
-    spec: cce@=17.0.0
-    paths:
-      cc: cc
-      cxx: CC
-      f77: ftn
-      fc: ftn
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-      - libfabric/1.15.2.0
-      - PrgEnv-cray/8.5.0
-      - cce/17.0.0
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: gcc@=12.3
-    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:
-      - libfabric/1.15.2.0
-      - PrgEnv-gnu/8.5.0
-      - gcc-native/12.3
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: gcc@=7.5.0
-    paths:
-      cc: /usr/bin/gcc
-      cxx: /usr/bin/g++
-      f77: /usr/bin/gfortran
-      fc: /usr/bin/gfortran
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-    - libfabric/1.15.2.0
-    environment: {}
-    extra_rpaths: []
-- compiler:
-    spec: nvhpc@=23.9
-    paths:
-      cc: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc
-      cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc++
-      f77: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvfortran
-      fc: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvfortran
-    flags: {}
-    operating_system: sles15
-    target: x86_64
-    modules:
-      - nvhpc-nompi/23.9
-      - libfabric/1.15.2.0
-    environment:
-      prepend_path:
-        LD_LIBRARY_PATH: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/math_libs/lib64/stubs
-    extra_rpaths: []
 - compiler:
       spec: intel@=2021.6.0
       paths:
diff --git a/env/sles15/x86_64/sysconfigs/packages.yaml b/env/sles15/x86_64/sysconfigs/packages.yaml
index e22c692..9bb6cb7 100644
--- a/env/sles15/x86_64/sysconfigs/packages.yaml
+++ b/env/sles15/x86_64/sysconfigs/packages.yaml
@@ -27,6 +27,20 @@ packages:
     require: '%gcc@7.5.0'
   ca-certificates-mozilla:
     require: '%gcc@7.5.0'
+  cce:
+    externals:
+      - modules:
+        - libfabric/1.15.2.0
+        - PrgEnv-cray/8.5.0
+        - cce/17.0.0
+        spec: cce@=17.0.0
+        extra_attributes:
+          compilers:
+            c: cc
+            cxx: CC
+            fortran: ftn
+          operating_system: sles15
+          target: x86_64
   cairo:
     require: '%gcc@7.5.0'
   cmake:
@@ -92,7 +106,31 @@ packages:
   gawk:
     require: '%gcc@7.5.0'
   gcc:
-    require: '%gcc@7.5.0'
+    externals:
+      - prefix: /usr
+        spec: gcc@7.5.0
+        extra_attributes:
+          compilers:
+            c: /usr/bin/gcc
+            cxx: /usr/bin/g++
+            fortran: /usr/bin/gfortran
+          operating_system: sles15
+          target: x86_64
+        modules:
+          - libfabric/1.15.2.0
+      - prefix: /usr
+        spec: gcc@=12.3
+        extra_attributes:
+          compilers:
+            c: /usr/bin/gcc-12
+            cxx: /usr/bin/g++-12
+            fortran: /usr/bin/gfortran-12
+          operating_system: sles15
+          target: x86_64
+        modules:
+          - libfabric/1.15.2.0
+          - PrgEnv-gnu/8.5.0
+          - gcc-native/12.3
   gdbm:
     require: '%gcc@7.5.0'
   gettext:
@@ -199,8 +237,19 @@ packages:
   nvhpc:
     externals:
       - modules:
+        - libfabric/1.15.2.0
         - nvhpc-nompi/23.9
         spec: nvhpc@23.9
+        extra_attributes:
+          compilers:
+            c: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc
+            cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc++
+            fortran: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvfortran
+          operating_system: sles15
+          target: x86_64
+          environment:
+            prepend_path:
+              LD_LIBRARY_PATH: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/math_libs/lib64/stubs
   opal:
     require:
       - spec: '%gcc'