diff --git a/Utilities/DataSampling/CMakeLists.txt b/Utilities/DataSampling/CMakeLists.txt
index 549f87122175f..a4225b23c20ca 100644
--- a/Utilities/DataSampling/CMakeLists.txt
+++ b/Utilities/DataSampling/CMakeLists.txt
@@ -61,27 +61,27 @@ endforeach()
 
 o2_data_file(COPY etc/exampleDataSamplingConfig.json DESTINATION etc)
 
-o2_add_dpl_workflow(standalone
+o2_add_executable(standalone
   SOURCES src/dataSamplingStandalone.cxx
   COMPONENT_NAME DataSampling
-  PUBLIC_LINK_LIBRARIES O2::DataSampling)
+  PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)
 
-o2_add_dpl_workflow(datasampling-pod-and-root
+o2_add_executable(datasampling-pod-and-root
   SOURCES test/dataSamplingPodAndRoot.cxx
   COMPONENT_NAME DataSampling
-  PUBLIC_LINK_LIBRARIES O2::DataSampling)
+PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)
 
-o2_add_dpl_workflow(datasampling-parallel
+o2_add_executable(datasampling-parallel
   SOURCES test/dataSamplingParallel.cxx
   COMPONENT_NAME DataSampling
-  PUBLIC_LINK_LIBRARIES O2::DataSampling)
+PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)
 
-o2_add_dpl_workflow(datasampling-time-pipeline
+o2_add_executable(datasampling-time-pipeline
   SOURCES test/dataSamplingTimePipeline.cxx
   COMPONENT_NAME DataSampling
-  PUBLIC_LINK_LIBRARIES O2::DataSampling)
+  PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)
 
 o2_add_dpl_workflow(datasampling-benchmark
   SOURCES test/dataSamplingBenchmark.cxx
   COMPONENT_NAME DataSampling
-  PUBLIC_LINK_LIBRARIES O2::DataSampling)
\ No newline at end of file
+  PUBLIC_LINK_LIBRARIES O2::DataSampling)
diff --git a/cmake/O2AddWorkflow.cmake b/cmake/O2AddWorkflow.cmake
index 17a5febf0b911..4471fe06b36b3 100644
--- a/cmake/O2AddWorkflow.cmake
+++ b/cmake/O2AddWorkflow.cmake
@@ -49,7 +49,7 @@ function(o2_add_dpl_workflow baseTargetName)
 
   add_custom_command(
     TARGET ${targetExeName} POST_BUILD
-    COMMAND $<TARGET_FILE:${targetExeName}> -b | cat > ${jsonFile})
+    COMMAND ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $<TARGET_FILE:${targetExeName}> -b --dump-workflow --dump-workflow-file ${jsonFile})
 
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${jsonFile}