diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb9d7e67618d9ebe1105331d93816e06a2d6c78c..6cff54fd7ff2fd212fb5c103494682fb28db059c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.15)
 
 exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --dirty --always --exclude '*'" OUTPUT_VARIABLE SOURCE_VERSION)
 
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
index f21bdd622cd1be8fc103f4ee6295a473e6c2afb1..2cb6174c78a4c4ddf1aacad39f3d8414ff3816f4 100644
--- a/Src/CMakeLists.txt
+++ b/Src/CMakeLists.txt
@@ -9,13 +9,8 @@ if( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR )
 endif()
 target_link_libraries(${target} biotracker-interfaces)
 
-find_package(Boost REQUIRED system filesystem chrono timer)
-target_link_libraries(${target} 
-  ${Boost_FILESYSTEM_LIBRARY}
-  ${Boost_SYSTEM_LIBRARY}
-  ${Boost_CHRONO_LIBRARY}
-  ${Boost_TIMER_LIBRARY}
-)
+find_package(Boost REQUIRED COMPONENTS system filesystem chrono timer)
+target_link_libraries(${target} Boost::headers Boost::system Boost::filesystem Boost::chrono Boost::timer)
 
 install(
     TARGETS