diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7544a9..ab1874b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: humble, ROS_REPO: main}
+          - {ROS_DISTRO: jazzy, ROS_REPO: main}
     runs-on: ubuntu-latest
     env:
       UPSTREAM_WORKSPACE: upstream.repos
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0729d10..b8e61fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wall -Wextra -Wpedantic)
 endif()
 
-set(THIS_PACKAGE_INCLUDE_DEPENDS ai_msgs cv_bridge rclcpp sensor_msgs)
+set(THIS_PACKAGE_INCLUDE_DEPENDS ai_msgs ament_index_cpp cv_bridge rclcpp
+                                 sensor_msgs)
 
 find_package(ament_cmake REQUIRED)
 find_package(CURL REQUIRED)
diff --git a/include/ros2_openai_server/convert_image_to_base_64.hpp b/include/ros2_openai_server/convert_image_to_base_64.hpp
index ba00ca6..84aed75 100644
--- a/include/ros2_openai_server/convert_image_to_base_64.hpp
+++ b/include/ros2_openai_server/convert_image_to_base_64.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <b64/encode.h>
-#include <cv_bridge/cv_bridge.h>
+#include <cv_bridge/cv_bridge.hpp>
 #include <iostream>
 #include <opencv2/opencv.hpp>
 #include <optional>
diff --git a/package.xml b/package.xml
index 1f811e1..e03b4c8 100644
--- a/package.xml
+++ b/package.xml
@@ -10,6 +10,7 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <depend>ai_msgs</depend>
+  <depend>ament_index_cpp</depend>
   <depend>cv_bridge</depend>
   <depend>rclcpp</depend>
   <depend>sensor_msgs</depend>
diff --git a/src/example_client.cpp b/src/example_client.cpp
index 1603d11..0ca0cf7 100644
--- a/src/example_client.cpp
+++ b/src/example_client.cpp
@@ -4,7 +4,7 @@
 #include <ament_index_cpp/get_package_share_directory.hpp>
 #include <chrono>
 #include <cstdlib>
-#include <cv_bridge/cv_bridge.h>
+#include <cv_bridge/cv_bridge.hpp>
 #include <memory>
 #include <opencv2/opencv.hpp>