diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 07f74f4..4ad7b40 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,8 +22,8 @@ Code or shell commands ready to be copy-pasted are welcome.
 A clear and concise description of what you expected to happen.
 
 **System information (please complete the following information):**
- - OS: [e.g. WIndows 10, Ubuntu 16.04, ...]
- - ROS 2 [e.g. Dashing, Foxy, ...]
+ - OS: [e.g. Windows 11, Ubuntu 24.04, ...]
+ - ROS 2 [e.g. Lyrical, Jazzy, ...]
  - Version [e.g. commit hash, tag, ...]
 
 **Additional context**
diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
index 3ac587d..b6deb5c 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, lyrical, 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..fa9f607 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'
+        - 'lyrical'
     schedule:
       - cron: '33 6 * * *'
 
@@ -15,15 +15,15 @@ jobs:
         fail-fast: false
         matrix:
           os: [ ubuntu-latest ]
-          ros_distribution: [ rolling ]
+          ros_distribution: [ lyrical ]
           include:
-            - docker_image: ubuntu:24.04
-              ros_distribution: rolling
+            - docker_image: ubuntu:26.04
+              ros_distribution: lyrical
       container:
         image: ${{ matrix.docker_image }}
       steps:
       - uses: actions/checkout@v4
-      - uses: ros-tooling/setup-ros@0.7.13
+      - uses: ros-tooling/setup-ros@0.7.19
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
@@ -31,7 +31,7 @@ jobs:
         run: |
           apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
           apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
-      - uses : ros-tooling/action-ros-ci@0.4.3
+      - uses : ros-tooling/action-ros-ci@0.4.8
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}