diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ab4aaa87..cdfca969 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -17,7 +17,11 @@
     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.
 -->
+<<<<<<< HEAD
 <!-- @Mergifyio backport 4.1.x 4.0.x 3.3.x 2.1.x -->
+=======
+<!-- @Mergifyio backport 4.2.x 4.0.x 3.3.x 2.1.x -->
+>>>>>>> 662d9dd (Update 'RELEASE_SUPPORT.md' with EOL of 4.1.x (#554))
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
new file mode 100644
index 00000000..8ae6e07a
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-ci.yml
@@ -0,0 +1,94 @@
+name: Fast DDS Gen Ubuntu CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  nightly-ubuntu-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version:
+          - 'openjdk-17-jdk'
+          - 'openjdk-21-jdk'
+    uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@master
+    with:
+      os-version: 'ubuntu-22.04'
+      java-version: ${{ matrix.java-version }}
+      label: 'nightly-ubuntu-ci-master'
+      fastddsgen-branch: 'master'
+      fastdds-branch: 'master'
+      fastcdr-branch: 'master'
+      fastdds-python-branch: 'main'
+      discovery-server-branch: 'master'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-4_2_x-fast-3_4_x:
+      strategy:
+        fail-fast: false
+        matrix:
+          java-version:
+            - 'openjdk-11-jdk'
+            - 'openjdk-17-jdk'
+      uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.2.x
+      with:
+        os-version: 'ubuntu-22.04'
+        java-version: ${{ matrix.java-version }}
+        label: 'nightly-ubuntu-ci-4.2.x-3.4.x'
+        fastddsgen-branch: '4.2.x'
+        fastdds-branch: '3.4.x'
+        fastcdr-branch: '2.3.x'
+        fastdds-python-branch: '2.3.x'
+        discovery-server-branch: 'v2.0.0'
+        run-build: true
+        run-tests: true
+        use-ccache: false
+
+  nightly-ubuntu-ci-4_0_x-fast-3_2_x:
+      strategy:
+        fail-fast: false
+        matrix:
+          java-version:
+            - 'openjdk-11-jdk'
+            - 'openjdk-17-jdk'
+      uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.0.x
+      with:
+        os-version: 'ubuntu-22.04'
+        java-version: ${{ matrix.java-version }}
+        label: 'nightly-ubuntu-ci-4.0.x-3.2.x'
+        fastddsgen-branch: '4.0.x'
+        fastdds-branch: '3.2.x'
+        fastcdr-branch: '2.3.x'
+        fastdds-python-branch: '2.2.x'
+        discovery-server-branch: 'v2.0.0'
+        run-build: true
+        run-tests: true
+        use-ccache: false
+
+  nightly-ubuntu-ci-3_3_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version:
+          - 'openjdk-11-jdk'
+          - 'openjdk-17-jdk'
+        fastcdr-branch:
+          - '1.1.x'
+          - '2.x'
+    uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@3.3.x
+    with:
+      os-version: 'ubuntu-22.04'
+      java-version: ${{ matrix.java-version }}
+      label: 'nightly-ubuntu-ci-3.3.x'
+      fastddsgen-branch: '3.3.x'
+      fastdds-branch: '2.14.x'
+      fastcdr-branch: ${{ matrix.fastcdr-branch }}
+      fastdds-python-branch: '1.4.x'
+      discovery-server-branch: 'v1.2.2'
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/RELEASE_SUPPORT.md b/RELEASE_SUPPORT.md
index 5731afe5..5808b8de 100644
--- a/RELEASE_SUPPORT.md
+++ b/RELEASE_SUPPORT.md
@@ -11,7 +11,6 @@ Please, refer to the [master branch](https://github.com/eProsima/Fast-DDS-Gen/bl
 |Fast DDS Version|Fast DDS-Gen Version|Fast DDS-Gen Version branch|Fast DDS-Gen Latest Release|
 |----------------|--------------------|---------------------------|---------------------------|
 |3.4|4.2|[4.2.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.2.x)|[v4.2.0](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.2.0)|
-|3.3|4.1|[4.1.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.1.x)|[v4.1.0](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.1.0)|
 |3.2|4.0|[4.0.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.0.x)|[v4.0.5](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.0.5)|
 |2.14|3.3|[3.3.x](https://github.com/eProsima/Fast-DDS-Gen/tree/3.3.x)|[v3.3.1](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v3.3.1)|
 |2.6|2.1|[2.1.x](https://github.com/eProsima/Fast-DDS-Gen/tree/2.1.x)|[v2.1.3](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v2.1.3)|
@@ -20,6 +19,7 @@ Please, refer to the [master branch](https://github.com/eProsima/Fast-DDS-Gen/bl
 
 |Fast DDS Version|Fast DDS-Gen Version|Fast DDS-Gen Version branch|Fast DDS-Gen Latest Release|Release Date|EOL Date|
 |----------------|----------------|-----------------------|-----------------------|------------|--------|
+|3.3|4.1|[4.1.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.1.x)|[v4.1.1](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.1.1)|July 2025|January 2026|
 |3.1|4.0|[4.0.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.0.x)|[v4.0.4](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.0.4)|August 2024|February 2025|
 |3.0|4.0|[4.0.x](https://github.com/eProsima/Fast-DDS-Gen/tree/4.0.x)|[v4.0.3](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v4.0.3)|August 2024|February 2025|
 |2.13|3.2|[3.2.x](https://github.com/eProsima/Fast-DDS-Gen/tree/3.2.x)|[v3.2.1](https://github.com/eProsima/Fast-DDS-Gen/releases/tag/v3.2.1)|December 2023|July 2024|