diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index a70b0872c98516d229715c67c7f86b14d8102a83..82f767e3bf236841a09e069d45d99814b5d0f8cf 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -57,6 +57,7 @@ add_subdirectory(log)
 add_subdirectory(data)
 add_subdirectory(kf)
 add_subdirectory(ca)
+add_subdirectory(base)
 #add_subdirectory(kfp) # For KFParticleOnline
 
 # exclude unittests from being build inside the container
@@ -212,6 +213,7 @@ target_include_directories(Algo
 
 target_link_libraries(Algo
   PUBLIC    OnlineData
+            CbmYamlInterface
             KfCore
             CaCore
             ROOT::GenVector
@@ -286,6 +288,7 @@ if (NOT CBM_ONLINE_STANDALONE)
 
   target_link_libraries(AlgoOffline
     PUBLIC    CbmData
+              CbmYamlInterface
               KfCoreOffline
               CaCoreOffline
               ROOT::GenVector
@@ -331,7 +334,7 @@ endif()
 
 install(TARGETS Algo DESTINATION lib)
 install(DIRECTORY base/compat TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY base/yaml TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
+#install(DIRECTORY base/yaml TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY base/util TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY base/gpu TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY data/sts TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
diff --git a/algo/base/CMakeLists.txt b/algo/base/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..93b295fe0a83615d30852967c9754863bd3cd2d8
--- /dev/null
+++ b/algo/base/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(yaml)
diff --git a/algo/base/yaml/CMakeLists.txt b/algo/base/yaml/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f943052cf1f7d73e4aa6de75e5d3cc374c2381b7
--- /dev/null
+++ b/algo/base/yaml/CMakeLists.txt
@@ -0,0 +1,25 @@
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_library(CbmYamlInterface INTERFACE)
+
+target_include_directories(CbmYamlInterface
+  INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(CbmYamlInterface
+  INTERFACE GSL
+            xpu 
+            fmt::fmt 
+            external::yaml-cpp
+)
+
+install(
+  FILES 
+    BaseTypes.h
+    Property.h
+    Yaml.h
+  DESTINATION
+    include/yaml/
+)