diff --git a/bin/run_tool.sh b/bin/run_tool.sh
index b61db70433..b890afb6ba 100755
--- a/bin/run_tool.sh
+++ b/bin/run_tool.sh
@@ -12,7 +12,7 @@ fi
 test_app=$*
 
 # ROC profiler library loaded by HSA runtime
-export HSA_TOOLS_LIB=librocprofiler64.so.1
+export HSA_TOOLS_LIB=librocprofiler64.so
 
 # tool library loaded by ROC profiler
 if [ -z "$ROCP_TOOL_LIB" ] ; then
diff --git a/build.sh b/build.sh
index eb7bfd8d9e..4027609bdd 100755
--- a/build.sh
+++ b/build.sh
@@ -70,6 +70,7 @@ if [ -z "$HIP_VDI" ] ; then HIP_VDI=0; fi
 if [ -n "$ROCM_RPATH" ] ; then LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rpath,${ROCM_RPATH}"; fi
 if [ -z "$TO_CLEAN" ] ; then TO_CLEAN=yes; fi
 if [ -z "$ASAN" ] ; then ASAN=False; fi
+if [ -z "$GPU_LIST" ] ; then GPU_LIST='gfx900 gfx906 gfx908 gfx90a gfx1030'; fi
 
 ROCPROFILER_ROOT=$(cd $ROCPROFILER_ROOT && echo $PWD)
 
@@ -88,9 +89,18 @@ cmake \
     -DCPACK_GENERATOR=${CPACKGEN:-'DEB;RPM'} \
     -DCMAKE_INSTALL_RPATH=${ROCM_RPATH} \
     -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
+    -DGPU_TARGETS="$GPU_LIST" \
     $ROCPROFILER_ROOT
 
-make -j
-make -j package
+popd
+
+MAKE_OPTS="-j -C $ROCPROFILER_ROOT/$BUILD_DIR"
+
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS doc
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS samples
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS mytest
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS tests
+cmake --build "$BUILD_DIR" -- $MAKE_OPTS package
 
 exit 0
diff --git a/test/run.sh b/test/run.sh
index 6fe934b15e..4392c391bf 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -84,7 +84,7 @@ unset ROCP_TOOL_LIB
 eval_test "Standalone sampling usage model test" ./test/standalone_test
 # Standalone intercepting test
 # ROC profiler library loaded by HSA runtime
-export HSA_TOOLS_LIB=librocprofiler64.so.1
+export HSA_TOOLS_LIB=librocprofiler64.so
 # enable intercepting mode in rocprofiler
 export ROCP_HSA_INTERCEPT=2
 # test macro for kernel iterations number
diff --git a/tests/featuretests/profiler/CMakeLists.txt b/tests/featuretests/profiler/CMakeLists.txt
index f03e5bfe8e..0eb430202e 100644
--- a/tests/featuretests/profiler/CMakeLists.txt
+++ b/tests/featuretests/profiler/CMakeLists.txt
@@ -1,12 +1,5 @@
 # Handle HSA Interception Tool Tests
 find_package(hsa-runtime64 REQUIRED CONFIG PATHS ${ROCM_PATH})
-file(GLOB PUBLIC_API_HEADERS "${PROJECT_SOURCE_DIR}/inc/*.h")
-foreach(header ${PUBLIC_API_HEADERS})
-  get_filename_component(header_subdir ${header} DIRECTORY)
-  install(FILES ${header}
-          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${header_subdir}
-          COMPONENT runtime)
-endforeach()
 
 get_property(HSA_RUNTIME_INCLUDE_DIRECTORIES TARGET hsa-runtime64::hsa-runtime64 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 find_file(HSA_H hsa.h
@@ -160,7 +153,7 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
   set(HSACO_TARGET_LIST ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/tests/featuretests/profiler/${OUTPUT_FILE} PARENT_SCOPE)
 endfunction(generate_hsaco)
 
-foreach(target_id ${GPU_TARGETS})
+foreach(target_id ${GPU_TARGETS_LIST})
   ## generate kernel bitcodes
   generate_hsaco(${target_id} ${CMAKE_CURRENT_SOURCE_DIR}/discretetests/binary/copy.cl ${target_id}_copy.hsaco)
 endforeach(target_id)
@@ -172,6 +165,7 @@ add_custom_target(hsaco_targets DEPENDS ${HSACO_TARGET_LIST})
  target_link_libraries(multiqueue_testapp PRIVATE ${ROCPROFILER_TARGET} hsa-runtime64::hsa-runtime64  GTest::gtest GTest::gtest_main stdc++fs Threads::Threads amd_comgr dl)
  add_dependencies(multiqueue_testapp hsaco_targets)
  add_dependencies(tests multiqueue_testapp )
+ install(TARGETS multiqueue_testapp RUNTIME DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests COMPONENT tests)
 
 add_executable(profiler_multiqueue_test discretetests/binary/multiqueue_test.cpp utils/csv_parser.cpp  utils/test_utils.cpp)
 target_include_directories(profiler_multiqueue_test PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/tests/featuretests/profiler)