diff --git a/.github/workflows/industrial_ci_build_and_test.yml b/.github/workflows/industrial_ci_build_and_test.yml
index c453f1be..c318e196 100644
--- a/.github/workflows/industrial_ci_build_and_test.yml
+++ b/.github/workflows/industrial_ci_build_and_test.yml
@@ -7,9 +7,9 @@ jobs:
       matrix:
         env:
           - {ROS_DISTRO: rolling}
-          - {ROS_DISTRO: humble, PRERELEASE: true}
-          - {ROS_DISTRO: iron, PRERELEASE: true}
+          - {ROS_DISTRO: humble}
           - {ROS_DISTRO: jazzy}
+          - {ROS_DISTRO: kilted}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/octomap_server/include/octomap_server/octomap_server.hpp b/octomap_server/include/octomap_server/octomap_server.hpp
index b7cfcf05..7a9c8185 100644
--- a/octomap_server/include/octomap_server/octomap_server.hpp
+++ b/octomap_server/include/octomap_server/octomap_server.hpp
@@ -53,11 +53,11 @@
 #include "pcl_conversions/pcl_conversions.h"
 #include "pcl_ros/transforms.hpp"
 
-#include "tf2_ros/buffer.h"
-#include "tf2_ros/create_timer_ros.h"
-#include "tf2_ros/message_filter.h"
-#include "tf2_ros/transform_listener.h"
-#include "message_filters/subscriber.h"
+#include "tf2_ros/buffer.hpp"
+#include "tf2_ros/create_timer_ros.hpp"
+#include "tf2_ros/message_filter.hpp"
+#include "tf2_ros/transform_listener.hpp"
+#include "message_filters/subscriber.hpp"
 #include "octomap_msgs/msg/octomap.hpp"
 #include "octomap_msgs/srv/get_octomap.hpp"
 #include "octomap_msgs/srv/bounding_box_query.hpp"