diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 608f6a291341fdacc454bc52e17064b302479d29..60b03bb598371140669132cfc17c3f4326f3b65e 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -31,7 +31,8 @@ endif()
 include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
 
 set(CONAN_REQUIRES
-    Boost/1.64.0@conan/stable
+    boost_optional/1.66.0@bincrafters/stable
+    boost_property_tree/1.66.0@bincrafters/stable
     Eigen3/3.2.9@bilke/stable
     VTK/8.1.1@bilke/stable
     CACHE INTERNAL ""
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index b44bd0d2e513efd29cd2f00ca58acac33c5fff8c..9bff63e4d8fab073b767020353a0efaef99dff1b 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -60,8 +60,10 @@ find_program(MODULE_CMD modulecmd
 ######################
 ### Find libraries ###
 ######################
-find_package(Boost REQUIRED)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+if(NOT OGS_USE_CONAN)
+    find_package(Boost REQUIRED)
+    include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+endif()
 
 find_package(VTK 8.1.0 REQUIRED)
 include(${VTK_USE_FILE})