diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
index 3ac587d1..5cf697b5 100644
--- a/.github/ISSUE_TEMPLATE/general-issue.md
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -12,7 +12,7 @@ assignees: ''
 - Hardware description: <!-- hardware where you are using micro-ROS -->
 - RTOS: <!-- RTOS where you are using micro-ROS -->
 - Installation type: <!-- micro_ros_setup, modules, etc  -->
-- Version or commit hash: <!-- version of micro-ROS used: foxy, rolling  -->
+- Version or commit hash: <!-- version of micro-ROS used: humble, jazzy, kilted, rolling  -->
 
 #### Steps to reproduce the issue
 <!-- Detailed instructions on how to reliably reproduce this issue http://sscce.org/-->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0ca5128..dea3d7d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,8 @@ on:
     push:
       branches:
         - humble
-        - iron
+        - jazzy
+        - kilted
         - rolling
     pull_request:
       branches:
@@ -13,7 +14,7 @@ on:
 jobs:
     rmw_microxrcedds_ci:
         runs-on: ubuntu-latest
-        container: microros/micro-ros-agent:rolling
+        container: microros/micro-ros-agent:kilted
 
         steps:
         - uses: actions/checkout@v3
@@ -25,8 +26,8 @@ jobs:
             apt update && apt install -y python3-pip git python3-rosdep python3-colcon-common-extensions curl ros-$ROS_DISTRO-performance-test-fixture gcovr
             git clone -b ros2 https://github.com/eProsima/Micro-CDR src/Micro-CDR
             git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client
-            git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
-            git clone -b rolling https://github.com/ros2/rmw src/rmw
+            git clone -b kilted https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
+            git clone -b kilted https://github.com/ros2/rmw src/rmw
             touch src/rosidl_typesupport_microxrcedds/test/COLCON_IGNORE
 
             # Install coverage tools
diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml
index 8a7107cc..27f62341 100644
--- a/.github/workflows/uncrustify.yml
+++ b/.github/workflows/uncrustify.yml
@@ -8,7 +8,7 @@ jobs:
     run_uncrustify:
       if: contains(github.event.comment.html_url, '/pull/') && contains(github.event.comment.body, 'Marie Kondo')
       runs-on: ubuntu-latest
-      container: ros:rolling
+      container: ros:kilted
       steps:
         - uses: xt0rted/pull-request-comment-branch@v1
           id: comment-branch