diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml
index 8af58e0..d4610bc 100644
--- a/env/rhel7/x86_64/admin/stable/spack.yaml
+++ b/env/rhel7/x86_64/admin/stable/spack.yaml
@@ -23,6 +23,9 @@ spack:
     default:
       roots:
         tcl: $spack/opt/spack/stable/modulefiles
+      lmod:
+        core_compilers:
+        - gcc@=4.8.5
   specs:
   - matrix:
     - [$compilers]
diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml
index 9e566bd..db1242e 100644
--- a/env/sles15/aarch64/sysconfigs/packages.yaml
+++ b/env/sles15/aarch64/sysconfigs/packages.yaml
@@ -268,8 +268,8 @@ packages:
         spec: openldap@2.4.46
   openmpi:
     require:
-      - spec: "schedulers=slurm fabrics=ofi"
-        when: "@5.0.0"
+      - spec: "schedulers=slurm fabrics=ofi +cuda"
+        when: "@5.0.0:"
       - spec:  "schedulers=slurm fabrics=ofi +cxx +cxx_exceptions +cuda +legacylaunchers"
         when: "@:5.0.0"
   openssh: