diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml
index 09301eb1208..7c47cf0cf6a 100644
--- a/.github/workflows/nightly-mac-ci.yml
+++ b/.github/workflows/nightly-mac-ci.yml
@@ -6,37 +6,86 @@ on:
     - cron: '0 1 * * *'
 
 jobs:
-  nightly-sec-mac-ci:
+  nightly-mac-ci-master:
     strategy:
       fail-fast: false
       matrix:
-        fastdds-branch:
-          - 'master'
-          - '2.13.x'
-          - '2.12.x'
-          - '2.10.x'
-          - '2.6.x'
-          - '3.0.x-devel'
-    uses: ./.github/workflows/reusable-mac-ci.yml
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@master
     with:
-      label: 'nightly-sec-mac-ci-${{ matrix.fastdds-branch }}'
-      cmake-args: "-DSECURITY=ON"
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-master'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '${{ matrix.fastdds-branch }}'
+      fastdds-branch: 'master'
 
-  nightly-nosec-mac-ci:
+  nightly-mac-ci-2_13_x:
     strategy:
       fail-fast: false
       matrix:
-        fastdds-branch:
-          - 'master'
-          - '2.13.x'
-          - '2.12.x'
-          - '2.10.x'
-          - '2.6.x'
-    uses: ./.github/workflows/reusable-mac-ci.yml
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.13.x
     with:
-      label: 'nightly-nosec-mac-ci-${{ matrix.fastdds-branch }}'
-      cmake-args: "-DSECURITY=OFF"
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.13.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '${{ matrix.fastdds-branch }}'
+      fastdds-branch: '2.13.x'
+
+  nightly-mac-ci-2_12_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.12.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.12.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.12.x'
+
+  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'
+
+  nightly-mac-ci-2_6_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.6.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.6.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.6.x'
+
+  nightly-mac-ci-3_0_x-devel:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x-devel
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x-devel'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '3.0.x-devel'
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
index 075b511a9f2..3cee16a9ee2 100644
--- a/.github/workflows/nightly-ubuntu-ci.yml
+++ b/.github/workflows/nightly-ubuntu-ci.yml
@@ -6,24 +6,104 @@ on:
     - cron: '0 1 * * *'
 
 jobs:
-  nightly-sec-ubuntu-ci:
+  nightly-ubuntu-ci-master:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - 'ON'
+          - 'OFF'
+    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'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: 'master'
+
+  nightly-ubuntu-ci-2_13_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.13.x'
+
+  nightly-ubuntu-ci-2_12_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.12.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.12.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.12.x'
+
+  nightly-ubuntu-ci-2_10_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - 'ON'
+          - 'OFF'
+    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'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.10.x'
+
+  nightly-ubuntu-ci-2_6_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        os-image:
+          - 'ubuntu-22.04'
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
+    with:
+      os-image: ${{ matrix.os-image }}
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.6.x'
 
+  nightly-ubuntu-ci-3_0_x-devel:
     strategy:
       fail-fast: false
       matrix:
         os-image:
           - 'ubuntu-22.04'
-        fastdds-branch:
-          - 'master'
-          - '2.13.x'
-          - '2.12.x'
-          - '2.10.x'
-          - '2.6.x'
-          - '3.0.x-devel'
-    uses: ./.github/workflows/reusable-ubuntu-ci.yml
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x-devel
     with:
       os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-ubuntu-ci-${{ matrix.fastdds-branch }}'
-      cmake-args: "-DSECURITY=ON"
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x-devel'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '${{ matrix.fastdds-branch }}'
+      fastdds-branch: '3.0.x-devel'
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
index 904f61df4fb..7cdaef29718 100644
--- a/.github/workflows/nightly-windows-ci.yml
+++ b/.github/workflows/nightly-windows-ci.yml
@@ -6,37 +6,86 @@ on:
     - cron: '0 1 * * *'
 
 jobs:
-  nightly-sec-windows-ci:
+  nightly-windows-ci-master:
     strategy:
       fail-fast: false
       matrix:
-        fastdds-branch:
-          - 'master'
-          - '2.13.x'
-          - '2.12.x'
-          - '2.10.x'
-          - '2.6.x'
-          - '3.0.x-devel'
-    uses: ./.github/workflows/reusable-windows-ci.yml
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master
     with:
-      label: 'nightly-sec-windows-ci-${{ matrix.fastdds-branch }}'
-      cmake-args: "-DSECURITY=ON"
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-master'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds_branch: '${{ matrix.fastdds-branch }}'
+      fastdds_branch: 'master'
 
-  nightly-nosec-windows-ci:
+  nightly-windows-ci-2_13_x:
     strategy:
       fail-fast: false
       matrix:
-        fastdds-branch:
-          - 'master'
-          - '2.13.x'
-          - '2.12.x'
-          - '2.10.x'
-          - '2.6.x'
-    uses: ./.github/workflows/reusable-windows-ci.yml
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.13.x
     with:
-      label: 'nightly-nosec-windows-ci-${{ matrix.fastdds-branch }}'
-      cmake-args: "-DSECURITY=OFF"
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.13.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds_branch: '${{ matrix.fastdds-branch }}'
+      fastdds_branch: '2.13.x'
+
+  nightly-windows-ci-2_12_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.12.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.12.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '2.12.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'
+
+  nightly-windows-ci-2_6_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.6.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.6.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '2.6.x'
+
+  nightly-windows-ci-3_0_x-devel:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x-devel
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x-devel'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds_branch: '3.0.x-devel'