diff --git a/cmake/FindrocBLAS.cmake b/cmake/FindrocBLAS.cmake
deleted file mode 100644
index bbcb56664..000000000
--- a/cmake/FindrocBLAS.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-#==========================================================================
-#  Copyright 2020-2022 Intel Corporation
-#  Copyright (C) Codeplay Software Limited
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  For your convenience, a copy of the License has been included in this
-#  repository.
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#=========================================================================
-
-if(NOT DEFINED HIP_PATH)
-    if(NOT DEFINED ENV{HIP_PATH})
-        set(HIP_PATH "/opt/rocm/hip" CACHE PATH "Path to which HIP has been installed")
-    else()
-        set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to which HIP has been installed")
-    endif()
-endif()
-
-set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_PREFIX_PATH
-    "${HIP_PATH}/lib/cmake"
-    "${HIP_PATH}/../lib/cmake"
-)
-
-find_package(HIP QUIET)
-find_package(rocblas REQUIRED)
-
-# this is work around to avoid duplication half creation in both HIP and SYCL
-add_compile_definitions(HIP_NO_HALF)
-
-find_package(Threads REQUIRED)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rocBLAS
-    REQUIRED_VARS
-      HIP_INCLUDE_DIRS
-      HIP_LIBRARIES
-      ROCBLAS_INCLUDE_DIR
-      ROCBLAS_LIBRARIES
-)
-# OPENCL_INCLUDE_DIR
-if(NOT TARGET ONEMKL::rocBLAS::rocBLAS)
-  add_library(ONEMKL::rocBLAS::rocBLAS SHARED IMPORTED)
-  set_target_properties(ONEMKL::rocBLAS::rocBLAS PROPERTIES
-      IMPORTED_LOCATION "${HIP_PATH}/../rocblas/lib/librocblas.so"
-      INTERFACE_INCLUDE_DIRECTORIES "${ROCBLAS_INCLUDE_DIR};${HIP_INCLUDE_DIRS};"
-      INTERFACE_LINK_LIBRARIES "Threads::Threads;${ROCBLAS_LIBRARIES};"
-  )
-
-endif()
diff --git a/cmake/FindrocRAND.cmake b/cmake/FindrocRAND.cmake
deleted file mode 100644
index 9d8cb7c35..000000000
--- a/cmake/FindrocRAND.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#===============================================================================
-# Copyright 2022 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-#
-# SPDX-License-Identifier: Apache-2.0
-#===============================================================================
-
-if(NOT DEFINED HIP_PATH)
-  if(NOT DEFINED ENV{HIP_PATH})
-    set(HIP_PATH "/opt/rocm/hip" CACHE PATH "Path to which HIP has been installed") 
-  else() 
-    set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to which HIP has been installed") 
-  endif() 
-endif()
-
-set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH}) 
-list(APPEND CMAKE_PREFIX_PATH 
-	"${HIP_PATH}/lib/cmake"
-	"${HIP_PATH}/../lib/cmake"
-	"${HIP_PATH}/../lib/cmake/rocrand/rocrand")
-
-find_package(rocrand REQUIRED)
-find_package(hip QUIET)
-
-# this is work around to avoid duplication half creation in both hip and SYCL
-add_compile_definitions(HIP_NO_HALF)
-
-find_package(Threads REQUIRED)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rocRAND
-  REQUIRED_VARS
-      HIP_INCLUDE_DIRS
-      rocrand_INCLUDE_DIR
-      rocrand_LIBRARIES)
-
-if(NOT TARGET ONEMKL::rocRAND::rocRAND)
-  add_library(ONEMKL::rocRAND::rocRAND SHARED IMPORTED)
-  set_target_properties(ONEMKL::rocRAND::rocRAND PROPERTIES
-      IMPORTED_LOCATION "${HIP_PATH}/../rocrand/lib/librocrand.so"
-      INTERFACE_INCLUDE_DIRECTORIES "${rocrand_INCLUDE_DIR};${HIP_INCLUDE_DIRS};"
-      INTERFACE_LINK_LIBRARIES "Threads::Threads;hip::host;${rocrand_LIBRARIES};")
-endif()
diff --git a/cmake/FindrocSOLVER.cmake b/cmake/FindrocSOLVER.cmake
deleted file mode 100644
index c1145443e..000000000
--- a/cmake/FindrocSOLVER.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-#===============================================================================
-# Copyright 2022 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-#
-# SPDX-License-Identifier: Apache-2.0
-#===============================================================================
-
-if(NOT DEFINED HIP_PATH)
-  if(NOT DEFINED ENV{HIP_PATH})
-    set(HIP_PATH "/opt/rocm/hip" CACHE PATH "Path to which HIP has been installed") 
-  else() 
-    set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to which HIP has been installed") 
-  endif() 
-endif()
-
-set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH}) 
-list(APPEND CMAKE_PREFIX_PATH 
-	"${HIP_PATH}/lib/cmake"
-	"${HIP_PATH}/../lib/cmake"
-	"${HIP_PATH}/../lib/cmake/rocsolver")
-
-find_package(HIP QUIET) 
-find_package(rocsolver REQUIRED)
-
-# this is work around to avoid duplication half creation in both hip and SYCL
-add_compile_definitions(HIP_NO_HALF)
-
-find_package(Threads REQUIRED)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rocSOLVER
-  REQUIRED_VARS
-      HIP_INCLUDE_DIRS
-      rocsolver_INCLUDE_DIR
-      rocsolver_LIBRARIES)
-
-if(NOT TARGET ONEMKL::rocSOLVER::rocSOLVER)
-	add_library(ONEMKL::rocSOLVER::rocSOLVER SHARED IMPORTED)
-	set_target_properties(ONEMKL::rocSOLVER::rocSOLVER PROPERTIES
-      IMPORTED_LOCATION "${HIP_PATH}/../rocsolver/lib/librocsolver.so"
-      INTERFACE_INCLUDE_DIRECTORIES "${rocsolver_INCLUDE_DIR};${HIP_INCLUDE_DIRS};"
-      INTERFACE_LINK_LIBRARIES "Threads::Threads;hip::host;${rocsolver_LIBRARIES};")
-endif()
-
diff --git a/src/blas/backends/rocblas/CMakeLists.txt b/src/blas/backends/rocblas/CMakeLists.txt
index 0d5559155..3a71eda1c 100644
--- a/src/blas/backends/rocblas/CMakeLists.txt
+++ b/src/blas/backends/rocblas/CMakeLists.txt
@@ -21,7 +21,10 @@
 
 set(LIB_NAME onemkl_blas_rocblas)
 set(LIB_OBJ ${LIB_NAME}_obj)
-find_package(rocBLAS REQUIRED)
+find_package(hip REQUIRED)
+find_package(rocblas REQUIRED)
+find_package(Threads REQUIRED)
+
 set(SOURCES rocblas_level1.cpp 
                 rocblas_level2.cpp 
                 rocblas_level3.cpp 
@@ -55,7 +58,8 @@ else()
     target_link_options(ONEMKL::SYCL::SYCL INTERFACE)
 endif()
 
-target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ONEMKL::rocBLAS::rocBLAS)
+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
   POSITION_INDEPENDENT_CODE ON)
diff --git a/src/lapack/backends/rocsolver/CMakeLists.txt b/src/lapack/backends/rocsolver/CMakeLists.txt
index 1162cca5b..c91089118 100644
--- a/src/lapack/backends/rocsolver/CMakeLists.txt
+++ b/src/lapack/backends/rocsolver/CMakeLists.txt
@@ -21,7 +21,10 @@
 
 set(LIB_NAME onemkl_lapack_rocsolver)
 set(LIB_OBJ ${LIB_NAME}_obj)
-find_package(rocSOLVER REQUIRED)
+find_package(hip REQUIRED)
+find_package(rocsolver REQUIRED)
+find_package(Threads REQUIRED)
+
 set(SOURCES rocsolver_lapack.cpp
 		rocsolver_batch.cpp
 	        $<$<STREQUAL:${ONEMKL_SYCL_IMPLEMENTATION},dpc++>:rocsolver_scope_handle.cpp>
@@ -38,7 +41,8 @@ target_include_directories(${LIB_OBJ}
           ${ONEMKL_GENERATED_INCLUDE_PATH}
 )
 target_compile_options(${LIB_OBJ} PRIVATE ${ONEMKL_BUILD_COPT})
-target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ONEMKL::rocSOLVER::rocSOLVER)
+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
   POSITION_INDEPENDENT_CODE ON)
diff --git a/src/rng/backends/rocrand/CMakeLists.txt b/src/rng/backends/rocrand/CMakeLists.txt
index b3c1d04bd..47929703b 100644
--- a/src/rng/backends/rocrand/CMakeLists.txt
+++ b/src/rng/backends/rocrand/CMakeLists.txt
@@ -54,7 +54,9 @@
 
 set(LIB_NAME onemkl_rng_rocrand)
 set(LIB_OBJ ${LIB_NAME}_obj)
-find_package(rocRAND REQUIRED)
+find_package(hip REQUIRED)
+find_package(rocrand REQUIRED)
+find_package(Threads REQUIRED)
 
 set(SOURCES philox4x32x10.cpp mrg32k3a.cpp $<$<BOOL:${BUILD_SHARED_LIBS}>:
             mkl_rng_rocrand_wrappers.cpp>)
@@ -67,8 +69,8 @@ target_include_directories(
   ${LIB_OBJ} PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src
                      ${CMAKE_BINARY_DIR}/bin ${MKL_INCLUDE} ${ONEMKL_GENERATED_INCLUDE_PATH})
 
-target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL
-                                        ONEMKL::rocRAND::rocRAND)
+target_link_libraries(${LIB_OBJ} PRIVATE roc::rocrand hip::host Threads::Threads)
+target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
 target_compile_features(${LIB_OBJ} PUBLIC cxx_std_11)
 set_target_properties(${LIB_OBJ} PROPERTIES POSITION_INDEPENDENT_CODE ON)