diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 383d6a52..96eb3cca 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -17,7 +17,7 @@
     In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
     Please uncomment following line, adjusting the corresponding target branches for the backport.
 -->
-<!-- @Mergifyio backport 2.2.x 1.0.x -->
+<!-- @Mergifyio backport 2.3.x 2.2.x 1.0.x -->
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
index c31ada7d..e16e84ad 100644
--- a/.github/workflows/mirror.yml
+++ b/.github/workflows/mirror.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         dest_branch:
-          - '2.3.x'
+          - '2.4.x'
           - '2.x'
     steps:
     - name: Mirror action step
diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml
index b906e166..3de94c25 100644
--- a/.github/workflows/nightly-mac-ci.yml
+++ b/.github/workflows/nightly-mac-ci.yml
@@ -16,6 +16,16 @@ jobs:
       run-tests: true
       use-ccache: false
 
+  nightly-mac-ci-2_3_x:
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.3.x
+    with:
+      os-version: 'macos-15-intel'
+      label: 'nightly-mac-ci-2.3.x'
+      fastcdr-branch: '2.3.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   nightly-mac-ci-2_2_x:
     uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.2.x
     with:
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
index 4b2255a4..e4b298e9 100644
--- a/.github/workflows/nightly-ubuntu-ci.yml
+++ b/.github/workflows/nightly-ubuntu-ci.yml
@@ -16,6 +16,16 @@ jobs:
       run-tests: true
       use-ccache: false
 
+  nightly-ubuntu-ci-2_3_x:
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.3.x
+    with:
+      os-version: 'ubuntu-22.04'
+      label: 'nightly-ubuntu-ci-2.3.x'
+      fastcdr-branch: '2.3.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   nightly-ubuntu-ci-2_2_x:
     uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.2.x
     with:
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
index 5c805615..a6c77146 100644
--- a/.github/workflows/nightly-windows-ci.yml
+++ b/.github/workflows/nightly-windows-ci.yml
@@ -23,6 +23,23 @@ jobs:
       run-tests: true
       use-ccache: false
 
+  nightly-windows-ci-2_3_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        vs-toolset:
+          - 'v142'
+          - 'v143'
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.3.x
+    with:
+      os-version: 'windows-2022'
+      vs-toolset: ${{ matrix.vs-toolset }}
+      label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.3.x'
+      fastcdr-branch: '2.3.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   nightly-windows-ci-2_2_x:
     strategy:
       fail-fast: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62d7f55a..f8d010b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 ###############################################################################
 # Project                                                                     #
 ###############################################################################
-project(fastcdr VERSION 2.3.6 LANGUAGES CXX)
+project(fastcdr VERSION 2.4.0 LANGUAGES CXX)
 
 set(PROJECT_NAME_STYLED "FastCDR")
 set(PROJECT_NAME_LARGE "Fast CDR")
diff --git a/RELEASE_SUPPORT.md b/RELEASE_SUPPORT.md
index 2f1b7dea..5db73e33 100644
--- a/RELEASE_SUPPORT.md
+++ b/RELEASE_SUPPORT.md
@@ -10,7 +10,8 @@ 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.6](https://github.com/eProsima/Fast-CDR/releases/tag/v2.3.6)|
+|3.7 (pro)|2.4|[2.4.x](https://github.com/eProsima/Fast-CDR/tree/2.4.x)||
+|3.2, 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)|
 
diff --git a/package.xml b/package.xml
index c1c399bb..f5658412 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.6</version>
+  <version>2.4.0</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>
diff --git a/versions.md b/versions.md
index a7757949..e69691d5 100644
--- a/versions.md
+++ b/versions.md
@@ -1,3 +1,5 @@
+# v2.4.0
+
 # v2.3.0
 * Fix symbol visibility for exception classes