diff --git a/legacy/systems/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml b/legacy/systems/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml
index 1c050e72..2528cb68 100644
--- a/legacy/systems/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml
+++ b/legacy/systems/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml
@@ -302,6 +302,7 @@ packages:
         gtl_cutoff_size: 4096
         fi_cxi_ats: 0
         gtl_lib_path: /opt/cray/pe/mpich/8.1.26/gtl/lib
+        gtl_libs: ["libmpi_gtl_hsa"]
         ldflags: "-L/opt/cray/pe/mpich/8.1.26/ofi/crayclang/16.0/lib -lmpi -L/opt/cray/pe/mpich/8.1.26/gtl/lib -Wl,-rpath=/opt/cray/pe/mpich/8.1.26/gtl/lib -lmpi_gtl_hsa"
     - spec: cray-mpich@8.1.26%cce@16.0.0 ~gtl +wrappers
       prefix: /opt/cray/pe/mpich/8.1.26/ofi/crayclang/16.0
diff --git a/repo/cray-mpich/package.py b/repo/cray-mpich/package.py
index e3ce521b..36d80d64 100644
--- a/repo/cray-mpich/package.py
+++ b/repo/cray-mpich/package.py
@@ -17,8 +17,8 @@ def libs(self):
 
         if self.spec.satisfies("+gtl"):
             gtl_lib_prefix = self.spec.extra_attributes["gtl_lib_path"]
-            libraries = ["libmpi_gtl_hsa", "libmpi_gtl_cuda"]
-            libs += find_libraries(libraries, root=gtl_lib_prefix, recursive=True)
+            gtl_libs = self.spec.extra_attributes["gtl_libs"]
+            libs += find_libraries(gtl_libs, root=gtl_lib_prefix, recursive=True)
 
         return libs
 
diff --git a/systems/lanl-venado/system.py b/systems/lanl-venado/system.py
index d572e3ad..b95ab0f5 100644
--- a/systems/lanl-venado/system.py
+++ b/systems/lanl-venado/system.py
@@ -142,6 +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
+        gtl_libs: ["libmpi_gtl_cuda"]
         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"
 """
 
diff --git a/systems/llnl-elcapitan/system.py b/systems/llnl-elcapitan/system.py
index dbb1142c..b87435f4 100644
--- a/systems/llnl-elcapitan/system.py
+++ b/systems/llnl-elcapitan/system.py
@@ -163,6 +163,7 @@ def mpi_config(self, cce_version):
         gtl_cutoff_size: 4096
         fi_cxi_ats: 0
         gtl_lib_path: /opt/cray/pe/mpich/{mpi_version}/gtl/lib
+        gtl_libs: ["libmpi_gtl_hsa"]
         ldflags: "-L/opt/cray/pe/mpich/{mpi_version}/ofi/crayclang/{short_cce_version}/lib -lmpi -L/opt/cray/pe/mpich/{mpi_version}/gtl/lib -Wl,-rpath=/opt/cray/pe/mpich/{mpi_version}/gtl/lib -lmpi_gtl_hsa"
 """