diff --git a/src/blas/backends/rocblas/CMakeLists.txt b/src/blas/backends/rocblas/CMakeLists.txt
index 9b11aa2ce..3a71eda1c 100644
--- a/src/blas/backends/rocblas/CMakeLists.txt
+++ b/src/blas/backends/rocblas/CMakeLists.txt
@@ -21,7 +21,8 @@
 
 set(LIB_NAME onemkl_blas_rocblas)
 set(LIB_OBJ ${LIB_NAME}_obj)
-find_package(rocblas 2.46.0 REQUIRED) # Corresponds to ROCm 5.4.3
+find_package(hip REQUIRED)
+find_package(rocblas REQUIRED)
 find_package(Threads REQUIRED)
 
 set(SOURCES rocblas_level1.cpp 
@@ -57,7 +58,7 @@ else()
     target_link_options(ONEMKL::SYCL::SYCL INTERFACE)
 endif()
 
-target_link_libraries(${LIB_OBJ} PRIVATE roc::rocblas Threads::Threads)
+target_link_libraries(${LIB_OBJ} PRIVATE roc::rocblas hip::host Threads::Threads)
 target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
 target_compile_features(${LIB_OBJ} PUBLIC cxx_std_17)
 set_target_properties(${LIB_OBJ} PROPERTIES
diff --git a/src/lapack/backends/rocsolver/CMakeLists.txt b/src/lapack/backends/rocsolver/CMakeLists.txt
index 722c76df6..c91089118 100644
--- a/src/lapack/backends/rocsolver/CMakeLists.txt
+++ b/src/lapack/backends/rocsolver/CMakeLists.txt
@@ -21,7 +21,8 @@
 
 set(LIB_NAME onemkl_lapack_rocsolver)
 set(LIB_OBJ ${LIB_NAME}_obj)
-find_package(rocsolver 3.20.0 REQUIRED) # Version for ROCm 5.4.3
+find_package(hip REQUIRED)
+find_package(rocsolver REQUIRED)
 find_package(Threads REQUIRED)
 
 set(SOURCES rocsolver_lapack.cpp
@@ -40,7 +41,7 @@ target_include_directories(${LIB_OBJ}
           ${ONEMKL_GENERATED_INCLUDE_PATH}
 )
 target_compile_options(${LIB_OBJ} PRIVATE ${ONEMKL_BUILD_COPT})
-target_link_libraries(${LIB_OBJ} PRIVATE roc::rocsolver Threads::Threads)
+target_link_libraries(${LIB_OBJ} PRIVATE roc::rocsolver hip::host Threads::Threads)
 target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
 target_compile_features(${LIB_OBJ} PUBLIC cxx_std_17)
 set_target_properties(${LIB_OBJ} PROPERTIES