diff --git a/CMakeLists.txt b/CMakeLists.txt
index c930e31b84f..b22f5a78165 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,12 +579,12 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE
 
 # Install xml validators
 install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_profiles.xsd
-    DESTINATION ${DATA_INSTALL_DIR}
+    DESTINATION ${DATA_INSTALL_DIR}/fastdds
     COMPONENT xsd
     )
 
 install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_static_discovery.xsd
-    DESTINATION ${DATA_INSTALL_DIR}
+    DESTINATION ${DATA_INSTALL_DIR}/fastdds
     COMPONENT xsd
     )
 
diff --git a/tools/fastdds/xml_ci/parser.py b/tools/fastdds/xml_ci/parser.py
index df6a8d1c635..269aeb8bf1d 100644
--- a/tools/fastdds/xml_ci/parser.py
+++ b/tools/fastdds/xml_ci/parser.py
@@ -108,4 +108,4 @@ def xsd_dir(self):
         """
         tool_path = Path(os.path.dirname(os.path.realpath(__file__)))
         # We assume the schema path is relative to our installation path
-        return tool_path / '../../../share/fastdds_profiles.xsd'
+        return tool_path / '../../../share/fastdds/fastdds_profiles.xsd'
diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt
index 8e6008952a8..007033f63c1 100644
--- a/tools/fds/CMakeLists.txt
+++ b/tools/fds/CMakeLists.txt
@@ -101,12 +101,6 @@ install(EXPORT ${PROJECT_NAME}-targets
         COMPONENT cmake
         )
 
-# export xsd schema
-install(FILES ../../resources/xsd/fastdds_profiles.xsd
-        DESTINATION ${DATA_INSTALL_DIR}
-        COMPONENT cmake
-        )
-
 # symlink creation requires:
 #   - install( CODE using generator expressions (legacy code is provided for all cmake versions)
 #   - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)