diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2244d01d..62d7f55a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 ###############################################################################
 # Project                                                                     #
 ###############################################################################
-project(fastcdr VERSION 2.3.5 LANGUAGES CXX)
+project(fastcdr VERSION 2.3.6 LANGUAGES CXX)
 
 set(PROJECT_NAME_STYLED "FastCDR")
 set(PROJECT_NAME_LARGE "Fast CDR")
diff --git a/RELEASE_SUPPORT.md b/RELEASE_SUPPORT.md
index b06a2213..2f1b7dea 100644
--- a/RELEASE_SUPPORT.md
+++ b/RELEASE_SUPPORT.md
@@ -10,7 +10,7 @@ Please, refer to the [master branch](https://github.com/eProsima/Fast-CDR/blob/m
 
 |Fast DDS Version|Fast CDR Version|Fast CDR Version branch|Fast CDR Latest Release|
 |----------------|----------------|-----------------------|-----------------------|
-|3.2, 3.4, 3.6|2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.5](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.5)|
+|3.2, 3.4, 3.6|2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.6](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.6)|
 |2.14|2.2|[2.2.x](https://github.com/eProsima/Fast-CDR/tree/2.2.x)|[v2.2.6](https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.6)|
 |2.6|1.0|[1.0.x](https://github.com/eProsima/Fast-CDR/tree/1.0.x)|[v1.0.28](https://github.com/eProsima/Fast-CDR/releases/tag/v1.0.28)|
 
@@ -18,13 +18,14 @@ Please, refer to the [master branch](https://github.com/eProsima/Fast-CDR/blob/m
 
 |Fast DDS Version|Fast CDR Version|Fast CDR Version branch|Fast CDR Latest Release|Release Date|EOL Date|
 |----------------|----------------|-----------------------|-----------------------|------------|--------|
-|3.5 |2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.5](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.5)|March 2025 | January 2026 [^*]|
-|3.3 |2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.4](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.4)|March 2025 | November 2025 [^*]|
-|3.1 |2.2|[2.2.x](https://github.com/eProsima/Fast-CDR/tree/2.2.x)|[v2.2.6](https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.6)|February 2023 | March 2025 [^*]|
-|2.13|2.1|[2.1.x](https://github.com/eProsima/Fast-CDR/tree/2.1.x)|[v2.1.3](https://github.com/eProsima/Fast-CDR/releases/tag/v2.1.3)|December 2023|July 2024|
-|2.12|2.0|[2.0.x](https://github.com/eProsima/Fast-CDR/tree/2.0.x)|[v2.0.0](https://github.com/eProsima/Fast-CDR/releases/tag/v2.0.0)|September 2023|March 2024|
-|2.11|1.1|[1.1.x](https://github.com/eProsima/Fast-CDR/tree/1.1.x)|[v1.1.1](https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.1)|May 2023|February 2024|
-|2.10|1.0|[1.0.x](https://github.com/eProsima/Fast-CDR/tree/1.0.x)|[v1.0.28](https://github.com/eProsima/Fast-CDR/releases/tag/v1.0.28)| November 2018 | July 2024|
+|3.5 |2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.5](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.5)  |March 2025    |January 2026 [^*]|
+|3.4 |2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.5](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.6)  |March 2025    |June 2026 [^*]|
+|3.3 |2.3|[2.3.x](https://github.com/eProsima/Fast-CDR/tree/2.3.x)|[v2.3.4](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.4)  |March 2025    |November 2025 [^*]|
+|3.1 |2.2|[2.2.x](https://github.com/eProsima/Fast-CDR/tree/2.2.x)|[v2.2.6](https://github.com/eProsima/Fast-CDR/releases/tag/v2.2.6)  |February 2023 |March 2025 [^*]|
+|2.13|2.1|[2.1.x](https://github.com/eProsima/Fast-CDR/tree/2.1.x)|[v2.1.3](https://github.com/eProsima/Fast-CDR/releases/tag/v2.1.3)  |December 2023 |July 2024|
+|2.12|2.0|[2.0.x](https://github.com/eProsima/Fast-CDR/tree/2.0.x)|[v2.0.0](https://github.com/eProsima/Fast-CDR/releases/tag/v2.0.0)  |September 2023|March 2024|
+|2.11|1.1|[1.1.x](https://github.com/eProsima/Fast-CDR/tree/1.1.x)|[v1.1.1](https://github.com/eProsima/Fast-CDR/releases/tag/v1.1.1)  |May 2023      |February 2024|
+|2.10|1.0|[1.0.x](https://github.com/eProsima/Fast-CDR/tree/1.0.x)|[v1.0.28](https://github.com/eProsima/Fast-CDR/releases/tag/v1.0.28)|November 2018 |July 2024|
 
 [^*]: Support may be extended.
 
diff --git a/package.xml b/package.xml
index 78f53c60..c1c399bb 100644
--- a/package.xml
+++ b/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>fastcdr</name>
-  <version>2.3.5</version>
+  <version>2.3.6</version>
   <description>
     *eProsima Fast CDR* is a C++ serialization library implementing the Common Data Representation (CDR) mechanism defined by the Object Management Group (OMG) consortium. CDR is the serialization mechanism used in DDS for the DDS Interoperability Wire Protocol (DDSI-RTPS).
   </description>