diff --git a/.github/ISSUE_TEMPLATE/0-troubleshooting.yml b/.github/ISSUE_TEMPLATE/0-troubleshooting.yml
index bb9d690..53c86a0 100644
--- a/.github/ISSUE_TEMPLATE/0-troubleshooting.yml
+++ b/.github/ISSUE_TEMPLATE/0-troubleshooting.yml
@@ -28,6 +28,7 @@ body:
         - Select One
         - Galactic
         - Humble
+        - Jazzy
     validations:
       required: true
   - type: dropdown
@@ -50,6 +51,7 @@ body:
         - Select One
         - Ubuntu 20.04
         - Ubuntu 22.04
+        - Ubuntu 24.04
         - Other Linux
         - Windows / MAC
     validations:
diff --git a/.github/ISSUE_TEMPLATE/1-bug.yml b/.github/ISSUE_TEMPLATE/1-bug.yml
index e1d2ea5..e80731e 100644
--- a/.github/ISSUE_TEMPLATE/1-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -30,6 +30,7 @@ body:
         - Select One
         - Galactic
         - Humble
+        - Jazzy
     validations:
       required: true
   - type: dropdown
@@ -52,6 +53,7 @@ body:
         - Select One
         - Ubuntu 20.04
         - Ubuntu 22.04
+        - Ubuntu 24.04
         - Other Linux
         - Windows / MAC
     validations:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2e39ee0..1ee7c75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,13 +4,13 @@ on: [push, pull_request]
 
 jobs:
   turtlebot4_humble_ci:
-    name: Humble
-    runs-on: ubuntu-22.04
+    name: Jazzy
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2.3.4
       - uses: ros-tooling/setup-ros@v0.7
         with:
-          required-ros-distributions: humble
+          required-ros-distributions: jazzy
       - uses: ros-tooling/action-ros-ci@v0.3
         id: action_ros_ci_step
         with: