diff --git a/README.md b/README.md
index d81541aa..5c77c729 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,19 @@ Ros2cs is also an independent part of [Ros2 For Unity](https://github.com/Robote
 ### Platforms
 
 Supported OSes:
+- Ubuntu 24.04 (bash)
 - Ubuntu 22.04 (bash)
 - Ubuntu 20.04 (bash)
-- Windows 10 (powershell)
-- Windows 11* (powershel)
+- Windows 10* (powershell)
+- Windows 11* (powershell)
 
 > \* ROS2 Galactic and Humble support only Windows 10 ([ROS 2 Windows system requirements](https://docs.ros.org/en/humble/Installation/Windows-Install-Binary.html#system-requirements)), but it is proven that it also works fine on Windows 11.
 
 Supported ROS2 distributions:
-- Galactic
+- Jazzy
 - Humble
+- Galactic
+- Foxy
 
 ### Flavours
 
diff --git a/build.sh b/build.sh
index a3506627..c8fa9932 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ display_usage() {
 }
 
 if [ -z "${ROS_DISTRO}" ]; then
-    echo "Source your ros2 distro first (foxy, galactic, humble or rolling are supported)"
+    echo "Source your ros2 distro first (foxy, galactic, humble, jazzy or rolling are supported)"
     exit 1
 fi
 
diff --git a/ros2_jazzy.repos b/ros2_jazzy.repos
new file mode 100644
index 00000000..4723a34b
--- /dev/null
+++ b/ros2_jazzy.repos
@@ -0,0 +1,45 @@
+repositories:
+  ros2/rosidl_defaults:
+    type: git
+    url: https://github.com/ros2/rosidl_defaults.git
+    version: jazzy
+  ros2/rosidl_core:
+    type: git
+    url: https://github.com/ros2/rosidl_core.git
+    version: jazzy
+  ros2/rosidl_dynamic_typesupport_fastrtps:
+    type: git
+    url: https://github.com/ros2/rosidl_dynamic_typesupport_fastrtps.git
+    version: jazzy
+  ros2/common_interfaces:
+    type: git
+    url: https://github.com/ros2/common_interfaces.git
+    version: jazzy
+  ros2/example_interfaces:
+    type: git
+    url: https://github.com/ros2/example_interfaces.git
+    version: jazzy
+  ros2/unique_identifier_msgs:
+    type: git
+    url: https://github.com/ros2/unique_identifier_msgs.git
+    version: jazzy
+  ros2/rcl_interfaces:
+    type: git
+    url: https://github.com/ros2/rcl_interfaces.git
+    version: jazzy
+  ros2/geometry2:
+    type: git
+    url: https://github.com/ros2/geometry2.git
+    version: jazzy
+  ros2/test_interface_files:
+    type: git
+    url: https://github.com/ros2/test_interface_files.git
+    version: jazzy
+  external/build_tools/dotnet_cmake_module:
+    type: git
+    url: https://github.com/RobotecAI/dotnet_cmake_module
+    version: 1.1.0
+  external/build_tools/ament_cmake_export_assemblies:
+    type: git
+    url: https://github.com/RobotecAI/ament_cmake_export_assemblies
+    version: master
diff --git a/src/ros2cs/ros2cs_core/CMakeLists.txt b/src/ros2cs/ros2cs_core/CMakeLists.txt
index d5f2955a..2b8c0563 100644
--- a/src/ros2cs/ros2cs_core/CMakeLists.txt
+++ b/src/ros2cs/ros2cs_core/CMakeLists.txt
@@ -238,7 +238,7 @@ if(STANDALONE_BUILD)
       endif()
 
       # Get rmw_cyclonedds_cpp for humble
-      if("${_library_name}" STREQUAL "rmw_cyclonedds_cpp" AND (ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling"))
+      if("${_library_name}" STREQUAL "rmw_cyclonedds_cpp" AND (ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "jazzy" OR ros2_distro STREQUAL "rolling"))
         fetch_target_lib(rmw_cyclonedds_cpp::rmw_cyclonedds_cpp)
         list(APPEND REQ_STANDALONE_LIBS ${rmw_cyclonedds_cpp_rmw_cyclonedds_cpp_LIB_PATH})
       endif()
@@ -377,7 +377,7 @@ if(STANDALONE_BUILD)
     rosidl_typesupport_introspection_cpp
     spdlog
     tracetools
-    yaml
+    yaml-cpp
     tinyxml2
   )
   
diff --git a/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake b/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake
index b263cb8c..09eb1a39 100644
--- a/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake
+++ b/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake
@@ -245,7 +245,7 @@ foreach(_generated_msg_c_ts_file ${_generated_msg_c_ts_files})
 
   set(ros2_distro "$ENV{ROS_DISTRO}")
 
-  if(ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling")
+  if(${rosidl_cmake_VERSION} VERSION_GREATER 2.5.0)
     rosidl_get_typesupport_target(c_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_c")
     target_link_libraries(${_target_name} "${c_typesupport_target}")
   else()
@@ -352,7 +352,7 @@ foreach(_generated_srv_c_ts_file ${_generated_srv_c_ts_files})
 
   set(ros2_distro "$ENV{ROS_DISTRO}")
 
-  if(ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling")
+  if(${rosidl_cmake_VERSION} VERSION_GREATER 2.5.0)
     rosidl_get_typesupport_target(c_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_c")
     target_link_libraries(${_target_name} "${c_typesupport_target}")
   else()