diff --git a/dijkstra_mesh_planner/CMakeLists.txt b/dijkstra_mesh_planner/CMakeLists.txt
index d62b6cd5..02dddfb9 100644
--- a/dijkstra_mesh_planner/CMakeLists.txt
+++ b/dijkstra_mesh_planner/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.8)
 project(dijkstra_mesh_planner)
 
-find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_ros REQUIRED)
 find_package(mbf_mesh_core REQUIRED)
 find_package(mbf_msgs REQUIRED)
diff --git a/mbf_mesh_core/CMakeLists.txt b/mbf_mesh_core/CMakeLists.txt
index 43b0c37f..b9e8233b 100644
--- a/mbf_mesh_core/CMakeLists.txt
+++ b/mbf_mesh_core/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(mbf_mesh_core)
 
 
-find_package(ament_cmake REQUIRED)
+find_package(ament_cmake_ros REQUIRED)
 set(dependencies
   mbf_abstract_core
   mesh_map
diff --git a/mbf_mesh_nav/CMakeLists.txt b/mbf_mesh_nav/CMakeLists.txt
index b5fc314d..e1e3ddc1 100644
--- a/mbf_mesh_nav/CMakeLists.txt
+++ b/mbf_mesh_nav/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 17)
 endif()
 
-find_package(ament_cmake REQUIRED)
+find_package(ament_cmake_ros REQUIRED)
 set(dependencies
   geometry_msgs
   LVR2
diff --git a/mesh_client/CMakeLists.txt b/mesh_client/CMakeLists.txt
index 40881bff..6b4fd04f 100644
--- a/mesh_client/CMakeLists.txt
+++ b/mesh_client/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 17)
 endif()
 
-find_package(ament_cmake REQUIRED)
+find_package(ament_cmake_ros REQUIRED)
 set(dependencies
   rclcpp
   LVR2
diff --git a/mesh_map/CMakeLists.txt b/mesh_map/CMakeLists.txt
index 09e143fa..910b2a4a 100644
--- a/mesh_map/CMakeLists.txt
+++ b/mesh_map/CMakeLists.txt
@@ -1,11 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(mesh_map)
 
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-endif()
-
-find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_ros REQUIRED)
 set(dependencies
   geometry_msgs