diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
index 1ab34e121e0..a013c23d26f 100644
--- a/.github/workflows/reusable-ubuntu-ci.yml
+++ b/.github/workflows/reusable-ubuntu-ci.yml
@@ -696,3 +696,35 @@ jobs:
           cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
           cmake_build_type: ${{ matrix.cmake-build-type }}
           workspace: ${{ github.workspace }}
+<<<<<<< HEAD
+=======
+
+      - name: Clean workspace - No enforce log info
+        if: ${{ always() }}
+        run: |
+          cd ${{ github.workspace }}
+          rm -rf build install log
+
+      - name: No shared libs colcon build
+        continue-on-error: true
+        if: ${{ always() }}
+        uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
+        with:
+          colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build.meta
+          colcon_build_args: ${{ inputs.colcon-args }}
+          cmake_args: '-DBUILD_SHARED_LIBS=OFF ${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}'
+          cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
+          cmake_build_type: ${{ matrix.cmake-build-type }}
+          workspace: ${{ github.workspace }}
+
+      - name: Clean workspace - No shared libs
+        run: |
+          cd ${{ github.workspace }}
+          rm -rf build install log
+          
+      - name: Vanilla colcon build
+        uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
+        with:
+          cmake_build_type: ${{ matrix.cmake-build-type }}
+          workspace: ${{ github.workspace }}
+>>>>>>> 55ca0aac4 (Fix windows CI and add vanilla build step in ubuntu CI (#5095))
diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
index 0ca56015ab9..e9a89638529 100644
--- a/.github/workflows/reusable-windows-ci.yml
+++ b/.github/workflows/reusable-windows-ci.yml
@@ -141,6 +141,7 @@ jobs:
           destination_workspace: src
           skip_existing: 'true'
 
+<<<<<<< HEAD
       - name: Prepare build meta file
         run: |
             $build_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta'
@@ -159,12 +160,14 @@ jobs:
             # Write the combined content to the build test meta file
             $combined_content | Out-File -FilePath $build_test_meta_file -Encoding UTF8
 
+=======
+>>>>>>> 55ca0aac4 (Fix windows CI and add vanilla build step in ubuntu CI (#5095))
       - name: Build
         id: build
         continue-on-error: false
         uses: eProsima/eProsima-CI/windows/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build_test.meta
+          colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_test.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           # The following Fast DDS CMake options need to be specified here instead of in the meta files
           # because they vary from platform to platform