diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
index 3ac587d..5cf697b 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 77ab0a1..93a7f2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI micro-ROS Agent
 on:
     pull_request:
       branches:
-        - 'rolling'
+        - 'kilted'
     schedule:
       - cron: '33 6 * * *'
 
@@ -15,10 +15,10 @@ jobs:
         fail-fast: false
         matrix:
           os: [ ubuntu-latest ]
-          ros_distribution: [ rolling ]
+          ros_distribution: [ kilted ]
           include:
             - docker_image: ubuntu:24.04
-              ros_distribution: rolling
+              ros_distribution: kilted
       container:
         image: ${{ matrix.docker_image }}
       steps: