diff --git a/systems/lanl-venado/compilers/cce/00-cce-18-compilers.yaml b/systems/lanl-venado/compilers/cce/00-cce-18-compilers.yaml
index cd6a0bce..7ce4aeb3 100644
--- a/systems/lanl-venado/compilers/cce/00-cce-18-compilers.yaml
+++ b/systems/lanl-venado/compilers/cce/00-cce-18-compilers.yaml
@@ -16,9 +16,10 @@ compilers:
     modules: []
     environment:
       prepend_path:
-        LD_LIBRARY_PATH: "/opt/cray/pe/cce/18.0.0/cce/aarch64/lib:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib64:/opt/cray/pe/gcc-libs"
+        LD_LIBRARY_PATH: "/opt/cray/pe/cce/18.0.0/cce/aarch64/lib:/opt/cray/libfabric/1.20.1/lib64:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib64:/opt/cray/pe/gcc-libs"
     extra_rpaths:
     - /opt/cray/pe/gcc-libs
     - /opt/cray/pe/cce/18.0.0/cce/aarch64/lib
+    - /opt/cray/libfabric/1.20.1/lib64
     - /usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib
     - /usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib64
diff --git a/systems/lanl-venado/system.py b/systems/lanl-venado/system.py
index 15b3cd8a..d572e3ad 100644
--- a/systems/lanl-venado/system.py
+++ b/systems/lanl-venado/system.py
@@ -142,7 +142,7 @@ def mpi_config(self):
       prefix: /opt/cray/pe/mpich/{mpi_version}/ofi/{mpi_compiler_suffix}
       extra_attributes:
         gtl_lib_path: /opt/cray/pe/mpich/{mpi_version}/gtl/lib
-        ldflags: "-L/opt/cray/pe/mpich/{mpi_version}/ofi/{mpi_compiler_suffix}/lib -lmpi -L/opt/cray/pe/mpich/{mpi_version}/gtl/lib -Wl,-rpath=/opt/cray/pe/mpich/{mpi_version}/gtl/lib"
+        ldflags: "-L/opt/cray/pe/mpich/{mpi_version}/ofi/{mpi_compiler_suffix}/lib -lmpi -L/opt/cray/pe/mpich/{mpi_version}/gtl/lib -Wl,-rpath=/opt/cray/pe/mpich/{mpi_version}/gtl/lib -lmpi_gtl_cuda"
 """
 
     def cuda_config(self, cuda_version):
@@ -177,12 +177,12 @@ def cuda_config(self, cuda_version):
   cublas:
     externals:
     - spec: cublas@{x}
-      prefix: /opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda/{x}
+      prefix: /opt/nvidia/hpc_sdk/Linux_aarch64/24.7/math_libs/{x}
     buildable: false
   cusolver:
     externals:
     - spec: cusolver@{x}
-      prefix: /opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda/{x}
+      prefix: /opt/nvidia/hpc_sdk/Linux_aarch64/24.7/math_libs/{x}
     buildable: false
 """
         return template.format(