diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 35da553..188ce55 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -16,7 +16,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 3.3.x 3.2.x 2.14.x -->
+=======
+<!-- @Mergifyio backport 3.4.x 3.2.x 2.14.x -->
+>>>>>>> a76acad (Update after 3.3.1 (#230))
 
 <!-- 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 0000000..ae59c3c
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-ci.yml
@@ -0,0 +1,47 @@
+name: Shapes Demo Ubuntu CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  nightly-ubuntu-ci-master:
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@master
+    with:
+      os-version: 'ubuntu-22.04'
+      label: 'nightly-ubuntu-ci-master'
+      shapes-demo-branch: 'master'
+      fastdds-branch: 'master'
+      run-build: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-3_4_x:
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@3.4.x
+    with:
+      os-version: 'ubuntu-22.04'
+      label: 'nightly-ubuntu-ci-3.4.x'
+      shapes-demo-branch: '3.4.x'
+      fastdds-branch: '3.4.x'
+      run-build: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-3_2_x:
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@3.2.x
+    with:
+      os-version: 'ubuntu-22.04'
+      label: 'nightly-ubuntu-ci-3.2.x'
+      shapes-demo-branch: '3.2.x'
+      fastdds-branch: '3.2.x'
+      run-build: true
+      use-ccache: false
+
+  nightly-ubuntu-ci-2_14_x:
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
+    with:
+      os-version: 'ubuntu-22.04'
+      label: 'nightly-ubuntu-ci-2.14.x'
+      shapes-demo-branch: '2.14.x'
+      fastdds-branch: '2.14.x'
+      run-build: true
+      use-ccache: false
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
new file mode 100644
index 0000000..37028b4
--- /dev/null
+++ b/.github/workflows/nightly-windows-ci.yml
@@ -0,0 +1,71 @@
+name: Shapes Demo Windows CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  nightly-windows-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        vs-toolset:
+          - 'v142'
+          - 'v143'
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@master
+    with:
+      os-version: 'windows-2022'
+      vs-toolset: ${{ matrix.vs-toolset }}
+      label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-master'
+      shapes-demo-branch: 'master'
+      fastdds-branch: 'master'
+      run-build: true
+
+  nightly-windows-ci-3_4_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        vs-toolset:
+          - 'v142'
+          - 'v143'
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@3.4.x
+    with:
+      os-version: 'windows-2022'
+      vs-toolset: ${{ matrix.vs-toolset }}
+      label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-3.4.x'
+      shapes-demo-branch: '3.4.x'
+      fastdds-branch: '3.4.x'
+      run-build: true
+
+  nightly-windows-ci-3_2_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        vs-toolset:
+          - 'v142'
+          - 'v143'
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@3.2.x
+    with:
+      os-version: 'windows-2022'
+      vs-toolset: ${{ matrix.vs-toolset }}
+      label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-3.2.x'
+      shapes-demo-branch: '3.2.x'
+      fastdds-branch: '3.2.x'
+      run-build: true
+
+  nightly-windows-ci-2_14_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        vs-toolset:
+          - 'v142'
+          - 'v143'
+    uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@2.14.x
+    with:
+      os-version: 'windows-2022'
+      vs-toolset: ${{ matrix.vs-toolset }}
+      label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.14.x'
+      shapes-demo-branch: '2.14.x'
+      fastdds-branch: '2.14.x'
+      run-build: true