diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
index c44aa79afff..a27a48e7aad 100644
--- a/.github/workflows/reusable-mac-ci.yml
+++ b/.github/workflows/reusable-mac-ci.yml
@@ -51,7 +51,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds-branch }}
 
       - uses: eProsima/eProsima-CI/external/setup-python@v0
diff --git a/.github/workflows/reusable-sanitizers-ci.yml b/.github/workflows/reusable-sanitizers-ci.yml
index 3e35d06629c..72a4d3f5000 100644
--- a/.github/workflows/reusable-sanitizers-ci.yml
+++ b/.github/workflows/reusable-sanitizers-ci.yml
@@ -58,7 +58,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds_ref }}
 
       - name: Install Fix Python version
@@ -337,7 +342,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds_ref }}
 
       - name: Install Fix Python version
diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
index 7a31a184bec..5ea7e1d753b 100644
--- a/.github/workflows/reusable-ubuntu-ci.yml
+++ b/.github/workflows/reusable-ubuntu-ci.yml
@@ -86,7 +86,12 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
+<<<<<<< HEAD
           path: src/fastrtps
+=======
+          path: src/fastdds
+          submodules: true
+>>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
           ref: ${{ inputs.fastdds-branch }}
 
       - name: Install Fix Python version