diff --git a/dependencies.repos b/dependencies.repos
index 6552573d..8303fb8d 100644
--- a/dependencies.repos
+++ b/dependencies.repos
@@ -2,4 +2,4 @@ repositories:
   ros_industrial_cmake_boilerplate:
     type: git
     url: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
-    version: 0.5.4
+    version: 0.6.2
diff --git a/rct_common/CMakeLists.txt b/rct_common/CMakeLists.txt
index afee2496..4cfe7000 100644
--- a/rct_common/CMakeLists.txt
+++ b/rct_common/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.0)
 
 # Extract package name and version from package.xml
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
@@ -19,7 +19,7 @@ endif()
 find_gtest()
 
 add_library(${PROJECT_NAME} INTERFACE)
-target_compile_options(${PROJECT_NAME} INTERFACE -std=c++11)
+target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11)
 target_include_directories(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                                                      "$<INSTALL_INTERFACE:include>")
 target_link_libraries(${PROJECT_NAME} INTERFACE Eigen3::Eigen)
diff --git a/rct_examples/CMakeLists.txt b/rct_examples/CMakeLists.txt
index e74e7c1e..18fa2e8f 100644
--- a/rct_examples/CMakeLists.txt
+++ b/rct_examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.0)
 
 # Extract package name and version from package.xml
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
diff --git a/rct_image_tools/CMakeLists.txt b/rct_image_tools/CMakeLists.txt
index d0f80941..d7195b2d 100644
--- a/rct_image_tools/CMakeLists.txt
+++ b/rct_image_tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.0)
 
 # Extract package name and version from package.xml
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
@@ -30,7 +30,7 @@ add_library(
   src/${PROJECT_NAME}/aruco_finder.cpp
   src/${PROJECT_NAME}/charuco_grid_target.cpp
   src/${PROJECT_NAME}/charuco_finder.cpp)
-target_compile_options(${PROJECT_NAME} PUBLIC -std=c++11)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                                                   "$<INSTALL_INTERFACE:include>")
@@ -49,7 +49,7 @@ target_link_libraries(
 
 # Modified circle grid finder executable TODO: turn this into a unit test
 add_executable(${PROJECT_NAME}_test src/target_finder_tests.cpp)
-target_compile_options(${PROJECT_NAME}_test PUBLIC -std=c++11)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
 target_compile_options(${PROJECT_NAME}_test PRIVATE -Wall -Wextra)
 target_include_directories(${PROJECT_NAME}_test PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                                                        "$<INSTALL_INTERFACE:include>")
diff --git a/rct_optimizations/CMakeLists.txt b/rct_optimizations/CMakeLists.txt
index e183033d..238fb71b 100644
--- a/rct_optimizations/CMakeLists.txt
+++ b/rct_optimizations/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.0)
 
 # Extract package name and version from package.xml
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
@@ -40,7 +40,7 @@ add_library(
   # DH Chain Kinematic Calibration
   src/${PROJECT_NAME}/dh_chain.cpp
   src/${PROJECT_NAME}/dh_chain_kinematic_calibration.cpp)
-target_compile_options(${PROJECT_NAME} PUBLIC -std=c++11)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
 target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                                                   "$<INSTALL_INTERFACE:include>")
diff --git a/rct_ros_tools/CMakeLists.txt b/rct_ros_tools/CMakeLists.txt
index 3feaea2c..8a4e9e67 100644
--- a/rct_ros_tools/CMakeLists.txt
+++ b/rct_ros_tools/CMakeLists.txt
@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.0)
 project(rct_ros_tools)
 
-add_compile_options(-std=c++11 -Wall -Wextra)
+add_compile_options(-Wall -Wextra)
 
 find_package(rct_common REQUIRED)
 find_package(rct_optimizations REQUIRED)
@@ -71,6 +71,7 @@ target_link_libraries(
   rct::rct_optimizations
   rct::rct_image_tools
   rct::rct_common)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 
 add_library(${PROJECT_NAME}_target_loader_plugins src/target_loader_plugins.cpp)
 target_link_libraries(
@@ -78,6 +79,7 @@ target_link_libraries(
   ${catkin_LIBRARIES}
   yaml-cpp
   rct::rct_image_tools)
+target_compile_features(${PROJECT_NAME}_target_loader_plugins PUBLIC cxx_std_11)
 
 # Executable for collecting data sets via subscribers and triggered with services See readme (TODO: Write a readme)
 add_executable(${PROJECT_NAME}_cmd src/command_line_cal.cpp)
@@ -88,6 +90,7 @@ target_link_libraries(
   ${catkin_LIBRARIES}
   ${PROJECT_NAME}
   rct::rct_image_tools)
+target_compile_features(${PROJECT_NAME}_cmd PRIVATE cxx_std_11)
 
 # ######################################################################################################################
 # Testing ##
@@ -104,6 +107,7 @@ if(CATKIN_ENABLE_TESTING AND RCT_BUILD_TESTS)
     GTest::GTest
     GTest::Main
     ${catkin_LIBRARIES})
+  target_compile_features(${PROJECT_NAME}_target_finder_plugin_utest PRIVATE cxx_std_11)
 endif()
 
 # ######################################################################################################################
diff --git a/robot_cal_tools/CMakeLists.txt b/robot_cal_tools/CMakeLists.txt
index eb9cfa12..7cd6cded 100644
--- a/robot_cal_tools/CMakeLists.txt
+++ b/robot_cal_tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.16.0)
 project(robot_cal_tools)
 find_package(catkin REQUIRED)
 catkin_metapackage()