diff --git a/projects/roctracer/README.md b/projects/roctracer/README.md
index 8ee36d2364..b9682832c6 100644
--- a/projects/roctracer/README.md
+++ b/projects/roctracer/README.md
@@ -99,7 +99,7 @@ To use the rocTX API you need the API header and to link your application with `
   1. For Ubuntu 18.04 and Ubuntu 20.04 the following adds the needed packages:
 
    ````shell
-   apt install python3 python3-pip gcc g++ libatomic1 make rocm-llvm-dev \
+   apt install python3 python3-pip gcc g++ make rocm-llvm-dev \
     cmake doxygen graphviz texlive-full
    ````
 
@@ -107,7 +107,7 @@ To use the rocTX API you need the API header and to link your application with `
 
    ````shell
    yum install -y python3 python3-pip gcc gcc-g++ make rocm-llvm-devel \
-    cmake libatomic doxygen graphviz texlive \
+    cmake doxygen graphviz texlive \
     texlive-xtab texlive-multirow texlive-sectsty \
     texlive-tocloft texlive-tabu texlive-adjustbox
    ````
@@ -116,7 +116,7 @@ To use the rocTX API you need the API header and to link your application with `
 
    ````shell
    zypper in python3 python3-pip gcc gcc-g++ make rocm-llvm-devel \
-    cmake libatomic doxygen graphviz \
+    cmake doxygen graphviz \
     texlive-scheme-medium texlive-hanging texlive-stackengine \
     texlive-tocloft texlive-etoc texlive-tabu
    ````
diff --git a/projects/roctracer/src/CMakeLists.txt b/projects/roctracer/src/CMakeLists.txt
index 0c15c4d120..9572b8dc2e 100644
--- a/projects/roctracer/src/CMakeLists.txt
+++ b/projects/roctracer/src/CMakeLists.txt
@@ -229,7 +229,7 @@ target_include_directories(roctracer_tool
     ${PROJECT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/roctracer
     ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(roctracer_tool util roctracer hsa-runtime64::hsa-runtime64 stdc++fs Threads::Threads atomic dl)
+target_link_libraries(roctracer_tool util roctracer hsa-runtime64::hsa-runtime64 stdc++fs Threads::Threads -Wl,-Bstatic atomic -Wl,-Bdynamic dl)
 target_link_options(roctracer_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/tracer_tool/exportmap -Wl,--no-undefined)
 
 install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime)
diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index 95563d5b9f..aca9b27a42 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -141,13 +141,13 @@ add_dependencies(mytest load_unload_reload_test)
 ## Build the trace_buffer test
 add_executable(trace_buffer directed/trace_buffer.cpp)
 target_include_directories(trace_buffer PRIVATE ${PROJECT_SOURCE_DIR}/src/tracer_tool)
-target_link_libraries(trace_buffer Threads::Threads atomic)
+target_link_libraries(trace_buffer Threads::Threads -Wl,-Bstatic atomic -Wl,-Bdynamic)
 add_dependencies(mytest trace_buffer)
 
 ## Build the memory_pool test
 add_executable(memory_pool directed/memory_pool.cpp)
 target_include_directories(memory_pool PRIVATE ${PROJECT_SOURCE_DIR}/src/roctracer ${PROJECT_SOURCE_DIR}/inc)
-target_link_libraries(memory_pool Threads::Threads atomic)
+target_link_libraries(memory_pool Threads::Threads -Wl,-Bstatic atomic -Wl,-Bdynamic)
 add_dependencies(mytest memory_pool)
 
 ## Build the activity_and_callback test