diff --git a/Dockerfile b/Dockerfile
index 023ab24..a22cddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,5 +5,8 @@ COPY . /usr/local/hk/hk-ToolApp
 RUN --mount=type=ssh mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 
 WORKDIR /usr/local/hk
+# Install hkToopApp, then enable all tools, then reinstall for proper linkage
 RUN --mount=type=ssh . /usr/local/hk/hk-pilot/setup.sh &&\
-    hkp install -r -e hk-ToolApp
+    hkp install -r -e hk-ToolApp &&\
+    hkp select --all &&\
+    hkp install hk-ToolApp
diff --git a/UserTools/CMakeLists.txt b/UserTools/CMakeLists.txt
index 79881c2..ac2e76a 100644
--- a/UserTools/CMakeLists.txt
+++ b/UserTools/CMakeLists.txt
@@ -35,10 +35,12 @@ ENDMACRO()
 SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR})
 
 MESSAGE(STATUS "List of tools dir to be added: ${SUBDIRS}")
+set (HKFACTORY_SRC_TOOLS "")
 FOREACH (dir ${SUBDIRS})
     hk_add_tool(${dir})
-    list( APPEND PUBLIC_EXT_LIBS ${dir})
 ENDFOREACH ()
 
+MESSAGE("Found cpp tools to link the HK factory against: ${HKFACTORY_SRC_TOOLS}")
 
+include_directories(. BEFORE)
 add_subdirectory(Factory)
diff --git a/UserTools/Factory/CMakeLists.txt b/UserTools/Factory/CMakeLists.txt
index 866d4ae..b392c05 100644
--- a/UserTools/Factory/CMakeLists.txt
+++ b/UserTools/Factory/CMakeLists.txt
@@ -3,12 +3,12 @@ file(GLOB_RECURSE SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Factory.cpp")
 pbuilder_library(
         TARGET HKFactory
         SOURCES ${SRC}
-        PROJECT_LIBRARIES ${TOOLS_LIBS}
-        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS} ${EXT_TOOLS_LIBS}
+        PROJECT_LIBRARIES ${HKFACTORY_SRC_TOOLS}
+        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS} ${TOOLS_LIBS}
         PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
 )
 
-pbuilder_install_headers(${HEADERS})
+#pbuilder_install_headers(${HEADERS})
 
 # Exporting library
 pbuilder_component_install_and_export(
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 1916af5..33b3ed0 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,7 +3,9 @@ file(GLOB_RECURSE EXE_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 pbuilder_executables (
         TARGETS_VAR progams
         SOURCES ${EXE_SRC}
-        PROJECT_LIBRARIES ToolFrameworkCore::ToolFrameworkCore HKToolChain
+        PROJECT_LIBRARIES HKToolChain
+        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBRARIES} # should contain at least ToolFrameworkCore::ToolFrameworkCore and hk-DataModel::DataModel
+        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
 )
 
 pbuilder_component_install_and_export(