diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fcc1add..93ffb14 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,9 +11,9 @@ assignees: ''
 **Required Information**
 
 - Operating System:
-  - <!-- OS and version (e.g. Ubuntu 22.04...) -->
+  - <!-- OS and version (e.g. Ubuntu 24.04...) -->
 - ROS distribution
-  - <!-- ROS 2 (e.g. Humble / Iron / Rolling...) -->
+  - <!-- ROS 2 (e.g. Humble / Iron / Jazzy / Rolling...) -->
 - RMW Implementation
   - <!-- RMW (e.g. rmw_fastrtps...) -->
 - ROS 2 Persistent Parameter Server Commit ID
diff --git a/README.md b/README.md
index b96cf9c..1b48d4f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![humble](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/humble.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/humble.yml) [![iron](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/iron.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/iron.yml) [![rolling](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/rolling.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/rolling.yml)
+[![humble](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/humble.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/humble.yml) [![iron](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/iron.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/iron.yml) [![jazzy](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/jazzy.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/jazzy.yml) [![rolling](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/rolling.yml/badge.svg)](https://github.com/fujitatomoya/ros2_persist_parameter_server/actions/workflows/rolling.yml)
 
 # ROS2 Persistent Parameter Server
 <!-- TOC -->
@@ -18,7 +18,6 @@
     - [Build](#build)
     - [Run](#run)
   - [Test](#test)
-    - [Build (Deprecated)](#build-deprecated)
     - [Run](#run-1)
   - [Known Issues](#known-issues)
   - [Authors](#authors)
@@ -129,6 +128,7 @@ all of the configuration options will be passed via arguments as followings.
 ### Supported Distribution
 
 - [ROS 2 Rolling Ridley](https://docs.ros.org/en/rolling/index.html)
+- [ROS 2 Jazzy Jalisco](https://docs.ros.org/en/jazzy/index.html)
 - [ROS 2 Iron Irwini](https://docs.ros.org/en/iron/index.html)
 - [ROS 2 Humble Hawksbill](https://docs.ros.org/en/humble/index.html)