diff --git a/.github/workflows/nightly-mac-2.10.x.yml b/.github/workflows/nightly-mac-2.10.x.yml
new file mode 100644
index 00000000000..088a424c431
--- /dev/null
+++ b/.github/workflows/nightly-mac-2.10.x.yml
@@ -0,0 +1,23 @@
+name: Fast DDS MacOS CI (nightly 2.10.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-mac-ci-2_10_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.10.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.10.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.10.x'
+      use-ccache: false
+
diff --git a/.github/workflows/nightly-mac-2.14.x.yml b/.github/workflows/nightly-mac-2.14.x.yml
new file mode 100644
index 00000000000..9fde82889fc
--- /dev/null
+++ b/.github/workflows/nightly-mac-2.14.x.yml
@@ -0,0 +1,22 @@
+name: Fast DDS MacOS CI (nightly 2.14.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-mac-ci-2_14_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.14.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.14.x'
+      use-ccache: false
diff --git a/.github/workflows/nightly-mac-3.0.x.yml b/.github/workflows/nightly-mac-3.0.x.yml
new file mode 100644
index 00000000000..69f3c2ac407
--- /dev/null
+++ b/.github/workflows/nightly-mac-3.0.x.yml
@@ -0,0 +1,22 @@
+name: Fast DDS MacOS CI (nightly 3.0.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-mac-ci-3_0_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '3.0.x'
+      use-ccache: false
diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml
deleted file mode 100644
index c5974204183..00000000000
--- a/.github/workflows/nightly-mac-ci.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: Fast DDS MacOS CI (nightly)
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 1 * * *'
-
-jobs:
-  nightly-mac-ci-master:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@master
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-mac-ci-master'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds-branch: 'master'
-      use-ccache: false
-
-  nightly-mac-ci-3_0_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds-branch: '3.0.x'
-      use-ccache: false
-
-  nightly-mac-ci-2_14_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.14.x
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds-branch: '2.14.x'
-      use-ccache: false
-
-  nightly-mac-ci-2_10_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.10.x
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.10.x'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds-branch: '2.10.x'
-      use-ccache: false
-
diff --git a/.github/workflows/nightly-mac-master.yml b/.github/workflows/nightly-mac-master.yml
new file mode 100644
index 00000000000..d2533b2e846
--- /dev/null
+++ b/.github/workflows/nightly-mac-master.yml
@@ -0,0 +1,23 @@
+name: Fast DDS MacOS CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-mac-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@master
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-master'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: 'master'
+      use-ccache: false
+
diff --git a/.github/workflows/nightly-sanitizers-2.10.x.yml b/.github/workflows/nightly-sanitizers-2.10.x.yml
new file mode 100644
index 00000000000..2d46f313324
--- /dev/null
+++ b/.github/workflows/nightly-sanitizers-2.10.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Sanitizers CI (nightly 2.10.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-sanitizers-ci-2_10_x:
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.10.x
+    with:
+      label: 'nightly-sec-sanitizers-ci-2.10.x'
+      run_asan_fastdds: true
+      run_asan_discovery_server: true
+      run_tsan_fastdds: true
+      colcon_build_args: ''
+      colcon_test_args: ''
+      cmake_args: ''
+      ctest_args: ''
+      fastdds_ref: '2.10.x'
+      discovery_server_ref: 'v1.2.1'
diff --git a/.github/workflows/nightly-sanitizers-2.14.x.yml b/.github/workflows/nightly-sanitizers-2.14.x.yml
new file mode 100644
index 00000000000..46001da2097
--- /dev/null
+++ b/.github/workflows/nightly-sanitizers-2.14.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Sanitizers CI (nightly 2.14.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-sanitizers-ci-2_14_x:
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
+    with:
+      label: 'nightly-sec-sanitizers-ci-2.14.x'
+      run_asan_fastdds: true
+      run_asan_discovery_server: true
+      run_tsan_fastdds: true
+      colcon_build_args: ''
+      colcon_test_args: ''
+      cmake_args: ''
+      ctest_args: ''
+      fastdds_ref: '2.14.x'
+      discovery_server_ref: 'v1.2.2'
diff --git a/.github/workflows/nightly-sanitizers-3.0.x.yml b/.github/workflows/nightly-sanitizers-3.0.x.yml
new file mode 100644
index 00000000000..8154a38abbb
--- /dev/null
+++ b/.github/workflows/nightly-sanitizers-3.0.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Sanitizers CI (nightly 3.0.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-sanitizers-ci-3_0_x:
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@3.0.x
+    with:
+      label: 'nightly-sec-sanitizers-ci-3.0.x'
+      run_asan_fastdds: true
+      run_asan_discovery_server: true
+      run_tsan_fastdds: true
+      colcon_build_args: ''
+      colcon_test_args: ''
+      cmake_args: ''
+      ctest_args: ''
+      fastdds_ref: '3.0.x'
+      discovery_server_ref: '2.0.x'
diff --git a/.github/workflows/nightly-sanitizers-ci.yml b/.github/workflows/nightly-sanitizers-ci.yml
deleted file mode 100644
index 24d8286f7a7..00000000000
--- a/.github/workflows/nightly-sanitizers-ci.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: Fast DDS Sanitizers CI (nightly)
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 1 * * *'
-
-jobs:
-  nightly-sanitizers-ci-master:
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@master
-    with:
-      label: 'nightly-sec-sanitizers-ci-master'
-      run_asan_fastdds: true
-      run_asan_discovery_server: true
-      run_tsan_fastdds: true
-      colcon_build_args: ''
-      colcon_test_args: ''
-      cmake_args: ''
-      ctest_args: ''
-      fastdds_ref: 'master'
-      discovery_server_ref: 'master'
-
-  nightly-sanitizers-ci-3_0_x:
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@3.0.x
-    with:
-      label: 'nightly-sec-sanitizers-ci-3.0.x'
-      run_asan_fastdds: true
-      run_asan_discovery_server: true
-      run_tsan_fastdds: true
-      colcon_build_args: ''
-      colcon_test_args: ''
-      cmake_args: ''
-      ctest_args: ''
-      fastdds_ref: '3.0.x'
-      discovery_server_ref: '2.0.x'
-
-  nightly-sanitizers-ci-2_14_x:
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
-    with:
-      label: 'nightly-sec-sanitizers-ci-2.14.x'
-      run_asan_fastdds: true
-      run_asan_discovery_server: true
-      run_tsan_fastdds: true
-      colcon_build_args: ''
-      colcon_test_args: ''
-      cmake_args: ''
-      ctest_args: ''
-      fastdds_ref: '2.14.x'
-      discovery_server_ref: 'v1.2.2'
-
-  nightly-sanitizers-ci-2_10_x:
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.10.x
-    with:
-      label: 'nightly-sec-sanitizers-ci-2.10.x'
-      run_asan_fastdds: true
-      run_asan_discovery_server: true
-      run_tsan_fastdds: true
-      colcon_build_args: ''
-      colcon_test_args: ''
-      cmake_args: ''
-      ctest_args: ''
-      fastdds_ref: '2.10.x'
-      discovery_server_ref: 'v1.2.1'
diff --git a/.github/workflows/nightly-sanitizers-master.yml b/.github/workflows/nightly-sanitizers-master.yml
new file mode 100644
index 00000000000..764ad87442f
--- /dev/null
+++ b/.github/workflows/nightly-sanitizers-master.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Sanitizers CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-sanitizers-ci-master:
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@master
+    with:
+      label: 'nightly-sec-sanitizers-ci-master'
+      run_asan_fastdds: true
+      run_asan_discovery_server: true
+      run_tsan_fastdds: true
+      colcon_build_args: ''
+      colcon_test_args: ''
+      cmake_args: ''
+      ctest_args: ''
+      fastdds_ref: 'master'
+      discovery_server_ref: 'master'
diff --git a/.github/workflows/nightly-ubuntu-2.10.x.yml b/.github/workflows/nightly-ubuntu-2.10.x.yml
new file mode 100644
index 00000000000..bfbd9603919
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-2.10.x.yml
@@ -0,0 +1,27 @@
+name: Fast DDS Ubuntu CI (nightly 2.10.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-ubuntu-ci-2_10_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - true
+          - false
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.10.x'
+      security: ${{ matrix.security }}
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/.github/workflows/nightly-ubuntu-2.14.x.yml b/.github/workflows/nightly-ubuntu-2.14.x.yml
new file mode 100644
index 00000000000..8a65b1e9d90
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-2.14.x.yml
@@ -0,0 +1,27 @@
+name: Fast DDS Ubuntu CI (nightly 2.14.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-ubuntu-ci-2_14_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - true
+          - false
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.14.x'
+      security: ${{ matrix.security }}
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/.github/workflows/nightly-ubuntu-3.0.x.yml b/.github/workflows/nightly-ubuntu-3.0.x.yml
new file mode 100644
index 00000000000..3a30e48c11e
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-3.0.x.yml
@@ -0,0 +1,27 @@
+name: Fast DDS Ubuntu CI (nightly 3.0.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-ubuntu-ci-3_0_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - true
+          - false
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x'
+      ctest-args: "-LE xfail"
+      fastdds-branch: '3.0.x'
+      security: ${{ matrix.security }}
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
deleted file mode 100644
index 632e41a86d3..00000000000
--- a/.github/workflows/nightly-ubuntu-ci.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Fast DDS Ubuntu CI (nightly)
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 1 * * *'
-
-jobs:
-  nightly-ubuntu-ci-master:
-    strategy:
-      fail-fast: false
-      matrix:
-        os-image:
-          - 'ubuntu-22.04'
-        security:
-          - true
-          - false
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@master
-    with:
-      os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-master'
-      ctest-args: "-LE xfail"
-      fastdds-branch: 'master'
-      security: ${{ matrix.security }}
-      run-build: true
-      run-tests: true
-      use-ccache: false
-
-  nightly-ubuntu-ci-3_0_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        os-image:
-          - 'ubuntu-22.04'
-        security:
-          - true
-          - false
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x
-    with:
-      os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x'
-      ctest-args: "-LE xfail"
-      fastdds-branch: '3.0.x'
-      security: ${{ matrix.security }}
-      run-build: true
-      run-tests: true
-      use-ccache: false
-
-  nightly-ubuntu-ci-2_14_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        os-image:
-          - 'ubuntu-22.04'
-        security:
-          - true
-          - false
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
-    with:
-      os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
-      ctest-args: "-LE xfail"
-      fastdds-branch: '2.14.x'
-      security: ${{ matrix.security }}
-      run-build: true
-      run-tests: true
-      use-ccache: false
-
-  nightly-ubuntu-ci-2_10_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        os-image:
-          - 'ubuntu-22.04'
-        security:
-          - true
-          - false
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
-    with:
-      os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
-      ctest-args: "-LE xfail"
-      fastdds-branch: '2.10.x'
-      security: ${{ matrix.security }}
-      run-build: true
-      run-tests: true
-      use-ccache: false
-
diff --git a/.github/workflows/nightly-ubuntu-master.yml b/.github/workflows/nightly-ubuntu-master.yml
new file mode 100644
index 00000000000..31c6531ae9d
--- /dev/null
+++ b/.github/workflows/nightly-ubuntu-master.yml
@@ -0,0 +1,27 @@
+name: Fast DDS Ubuntu CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-ubuntu-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - true
+          - false
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@master
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-master'
+      ctest-args: "-LE xfail"
+      fastdds-branch: 'master'
+      security: ${{ matrix.security }}
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/.github/workflows/nightly-windows-2.10.x.yml b/.github/workflows/nightly-windows-2.10.x.yml
new file mode 100644
index 00000000000..ee85a125457
--- /dev/null
+++ b/.github/workflows/nightly-windows-2.10.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Windows CI (nightly 2.10.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-windows-ci-2_10_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.10.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.10.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '2.10.x'
diff --git a/.github/workflows/nightly-windows-2.14.x.yml b/.github/workflows/nightly-windows-2.14.x.yml
new file mode 100644
index 00000000000..fd084f39c52
--- /dev/null
+++ b/.github/workflows/nightly-windows-2.14.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Windows CI (nightly 2.14.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-windows-ci-2_14_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.14.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.14.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '2.14.x'
diff --git a/.github/workflows/nightly-windows-3.0.x.yml b/.github/workflows/nightly-windows-3.0.x.yml
new file mode 100644
index 00000000000..b65549140dc
--- /dev/null
+++ b/.github/workflows/nightly-windows-3.0.x.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Windows CI (nightly 3.0.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-windows-ci-3_0_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '3.0.x'
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
deleted file mode 100644
index c01770e54eb..00000000000
--- a/.github/workflows/nightly-windows-ci.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Fast DDS Windows CI (nightly)
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 1 * * *'
-
-jobs:
-  nightly-windows-ci-master:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-windows-ci-master'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds_branch: 'master'
-
-  nightly-windows-ci-3_0_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds_branch: '3.0.x'
-
-  nightly-windows-ci-2_14_x:
-      strategy:
-        fail-fast: false
-        matrix:
-          security:
-            - 'ON'
-            - 'OFF'
-      uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.14.x
-      with:
-        label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.14.x'
-        cmake-args: "-DSECURITY=${{ matrix.security }}"
-        ctest-args: "-LE xfail"
-        fastdds_branch: '2.14.x'
-
-  nightly-windows-ci-2_10_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.10.x
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.10.x'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds_branch: '2.10.x'
-
diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml
new file mode 100644
index 00000000000..2c10afb70a7
--- /dev/null
+++ b/.github/workflows/nightly-windows-master.yml
@@ -0,0 +1,21 @@
+name: Fast DDS Windows CI (nightly)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 22 * * *' # At 22:00 GMT
+
+jobs:
+  nightly-windows-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-master'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: 'master'
diff --git a/.github/workflows/weekly-mac-ci.yml b/.github/workflows/weekly-mac-2.6.x.yml
similarity index 92%
rename from .github/workflows/weekly-mac-ci.yml
rename to .github/workflows/weekly-mac-2.6.x.yml
index 3c244ee0669..6fe1a6f5702 100644
--- a/.github/workflows/weekly-mac-ci.yml
+++ b/.github/workflows/weekly-mac-2.6.x.yml
@@ -1,4 +1,4 @@
-name: Fast DDS MacOS CI (weekly)
+name: Fast DDS MacOS CI (weekly 2.6.x)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/weekly-sanitizers-ci.yml b/.github/workflows/weekly-sanitizers-2.6.x.yml
similarity index 92%
rename from .github/workflows/weekly-sanitizers-ci.yml
rename to .github/workflows/weekly-sanitizers-2.6.x.yml
index b85ae85f31c..f20014d8f1e 100644
--- a/.github/workflows/weekly-sanitizers-ci.yml
+++ b/.github/workflows/weekly-sanitizers-2.6.x.yml
@@ -1,4 +1,4 @@
-name: Fast DDS Sanitizers CI (weekly)
+name: Fast DDS Sanitizers CI (weekly 2.6.x)
 
 on:
     workflow_dispatch:
diff --git a/.github/workflows/weekly-ubuntu-ci.yml b/.github/workflows/weekly-ubuntu-2.14.x.yml
similarity index 58%
rename from .github/workflows/weekly-ubuntu-ci.yml
rename to .github/workflows/weekly-ubuntu-2.14.x.yml
index c742836d246..e7367d03655 100644
--- a/.github/workflows/weekly-ubuntu-ci.yml
+++ b/.github/workflows/weekly-ubuntu-2.14.x.yml
@@ -1,4 +1,4 @@
-name: Fast DDS Ubuntu CI (weekly)
+name: Fast DDS Ubuntu CI (weekly 2.14.x)
 
 on:
   workflow_dispatch:
@@ -6,7 +6,6 @@ on:
     - cron: '0 0 * * 1' # Run at minute 0 on Monday
 
 jobs:
-
   weekly-ubuntu-ci-2_14_x:
     strategy:
       fail-fast: false
@@ -28,21 +27,3 @@ jobs:
       run-build: true
       run-tests: true
       use-ccache: false
-
-  weekly-ubuntu-ci-2_6_x:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - true
-          - false
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
-    with:
-      os-image: 'ubuntu-20.04'
-      label: 'weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
-      ctest-args: "-LE xfail"
-      fastdds-branch: '2.6.x'
-      security: ${{ matrix.security }}
-      run-build: true
-      run-tests: true
-      use-ccache: false
diff --git a/.github/workflows/weekly-ubuntu-2.6.x.yml b/.github/workflows/weekly-ubuntu-2.6.x.yml
new file mode 100644
index 00000000000..a80af693c15
--- /dev/null
+++ b/.github/workflows/weekly-ubuntu-2.6.x.yml
@@ -0,0 +1,25 @@
+name: Fast DDS Ubuntu CI (weekly 2.6.x)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 1' # Run at minute 0 on Monday
+
+jobs:
+  weekly-ubuntu-ci-2_6_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - true
+          - false
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
+    with:
+      os-image: 'ubuntu-20.04'
+      label: 'weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.6.x'
+      security: ${{ matrix.security }}
+      run-build: true
+      run-tests: true
+      use-ccache: false
diff --git a/.github/workflows/weekly-windows-ci.yml b/.github/workflows/weekly-windows-2.6.x.yml
similarity index 92%
rename from .github/workflows/weekly-windows-ci.yml
rename to .github/workflows/weekly-windows-2.6.x.yml
index ae0124533a5..cf78bab2b2e 100644
--- a/.github/workflows/weekly-windows-ci.yml
+++ b/.github/workflows/weekly-windows-2.6.x.yml
@@ -1,4 +1,4 @@
-name: Fast DDS Windows CI (weekly)
+name: Fast DDS Windows CI (weekly 2.6.x)
 
 on:
   workflow_dispatch:
@@ -6,7 +6,6 @@ on:
     - cron: '0 0 * * 1' # Run at minute 0 on Monday
 
 jobs:
-
   weekly-windows-ci-2_6_x:
     strategy:
       fail-fast: false