diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml
index cc7698e..3bcb51d 100644
--- a/env/rhel7/x86_64/admin/unstable/spack.yaml
+++ b/env/rhel7/x86_64/admin/unstable/spack.yaml
@@ -30,7 +30,7 @@ spack:
   modules:
     default:
       roots:
-        tcl: $spack/opt/spack/unstable/modulefiles
+        lmod: $spack/opt/spack/unstable/modulefiles
   specs:
   - matrix:
     - [$gcc_12.3.0]
diff --git a/env/rhel7/x86_64/sysconfigs/packages.yaml b/env/rhel7/x86_64/sysconfigs/packages.yaml
index 3e83b2b..90cdd0f 100644
--- a/env/rhel7/x86_64/sysconfigs/packages.yaml
+++ b/env/rhel7/x86_64/sysconfigs/packages.yaml
@@ -169,7 +169,7 @@ packages:
       prefix: /usr
   openmpi:
     require:
-      - spec: schedulers=slurm fabrics=auto pmi-interface=pmi2 +cxx +cuda +legacylaunchers
+      - spec: schedulers=slurm fabrics=auto +internal-pmix +cxx +cuda +legacylaunchers
       - spec: '+cxx_exceptions'
         when: '%gcc'
   openssh:
diff --git a/env/sles15/aarch64/admin/testing/spack.yaml b/env/sles15/aarch64/admin/testing/spack.yaml
index 9eadfd0..38c9753 100644
--- a/env/sles15/aarch64/admin/testing/spack.yaml
+++ b/env/sles15/aarch64/admin/testing/spack.yaml
@@ -14,8 +14,8 @@ spack:
   modules:
     default:
       roots:
-        tcl: $spack/opt/spack/testing/modulefiles
-      tcl:
+        lmod: $spack/opt/spack/testing/modulefiles
+      lmod:
         cray-mpich:
           environment:
             set:
diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml
index 44b210c..670a9a8 100644
--- a/env/sles15/x86_64/admin/stable/spack.yaml
+++ b/env/sles15/x86_64/admin/stable/spack.yaml
@@ -36,6 +36,7 @@ spack:
           environment:
             set:
               SLURM_MPI_TYPE: 'pmix'
+              LD_LIBRARY_PATH: /opt/cray/libfabric/1.15.2.0/lib64
         openmpi:
           environment:
             set:
diff --git a/env/sles15/x86_64/admin/testing/spack.yaml b/env/sles15/x86_64/admin/testing/spack.yaml
index b27b5db..c5f6564 100644
--- a/env/sles15/x86_64/admin/testing/spack.yaml
+++ b/env/sles15/x86_64/admin/testing/spack.yaml
@@ -16,12 +16,13 @@ spack:
   modules:
     default:
       roots:
-        tcl: $spack/opt/spack/testing/modulefiles
-      tcl:
+        lmod: $spack/opt/spack/testing/modulefiles
+      lmod:
         cray-mpich:
           environment:
             set:
-              SLURM_MPI_TYPE: 'pmix'
+              SLURM_MPI_TYPE: pmix
+              LD_LIBRARY_PATH: /opt/cray/libfabric/1.15.2.0/lib64
         openmpi:
           environment:
             set:
diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml
index 1e911fa..e7f2646 100644
--- a/env/sles15/x86_64/admin/unstable/spack.yaml
+++ b/env/sles15/x86_64/admin/unstable/spack.yaml
@@ -55,6 +55,7 @@ spack:
           environment:
             set:
               SLURM_MPI_TYPE: 'pmix'
+              LD_LIBRARY_PATH: /opt/cray/libfabric/1.15.2.0/lib64
         openmpi:
           environment:
             set: