diff --git a/gazebo_ros2_control/CHANGELOG.rst b/gazebo_ros2_control/CHANGELOG.rst
index d72e8ce8..78c6e768 100644
--- a/gazebo_ros2_control/CHANGELOG.rst
+++ b/gazebo_ros2_control/CHANGELOG.rst
@@ -2,6 +2,26 @@
 Changelog for package gazebo_ros2_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.6.5 (2024-03-21)
+------------------
+* Update gazebo_ros2_control_plugin.cpp (`#286 <https://github.com/ros-controls/gazebo_ros2_control/issues/286>`_) (`#288 <https://github.com/ros-controls/gazebo_ros2_control/issues/288>`_)
+  (cherry picked from commit 5e1f9a52bcd1bf4164186dbb3c8b5cf070ed156e)
+  Co-authored-by: Tobias Fischer <info@tobiasfischer.info>
+* set the robot description parameter (`#277 <https://github.com/ros-controls/gazebo_ros2_control/issues/277>`_) (`#284 <https://github.com/ros-controls/gazebo_ros2_control/issues/284>`_)
+  (cherry picked from commit 7f23568a31ec812c3745af89d1f3bc54ac787af0)
+  Co-authored-by: AB <banonran@gmx.de>
+* Fix crashing due to an invalid parameter in the initial value. (backport `#271 <https://github.com/ros-controls/gazebo_ros2_control/issues/271>`_) (`#283 <https://github.com/ros-controls/gazebo_ros2_control/issues/283>`_)
+  * Fix crashing due to an invalid parameter in the initial value. (`#271 <https://github.com/ros-controls/gazebo_ros2_control/issues/271>`_)
+  Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
+  (cherry picked from commit cdae6b8a8f638d87146482e99bf76cf36530e5a6)
+  # Conflicts:
+  #	gazebo_ros2_control/src/gazebo_system.cpp
+  * Fixed crash
+  ---------
+  Co-authored-by: Wiktor Bajor <69388767+Wiktor-99@users.noreply.github.com>
+  Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
+* Contributors: mergify[bot]
+
 0.6.4 (2024-01-24)
 ------------------
 * Load the URDF to the resource_manager before parsing it to CM  (`#262 <https://github.com/ros-controls/gazebo_ros2_control//issues/262>`_) (`#267 <https://github.com/ros-controls/gazebo_ros2_control//issues/267>`_)
diff --git a/gazebo_ros2_control_demos/CHANGELOG.rst b/gazebo_ros2_control_demos/CHANGELOG.rst
index 1ae9b20b..e129df37 100644
--- a/gazebo_ros2_control_demos/CHANGELOG.rst
+++ b/gazebo_ros2_control_demos/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package gazebo_ros2_control_demos
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.6.5 (2024-03-21)
+------------------
+* Cleanup of demos (`#290 <https://github.com/ros-controls/gazebo_ros2_control/issues/290>`_) (`#293 <https://github.com/ros-controls/gazebo_ros2_control/issues/293>`_)
+  (cherry picked from commit 03b853b5337f6b8e9b8d4c0c8a3d814d7f34a97c)
+  Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
+* Contributors: mergify[bot]
+
 0.6.4 (2024-01-24)
 ------------------