diff --git a/services/tunnelbroker/CMakeLists.txt b/services/tunnelbroker/CMakeLists.txt
--- a/services/tunnelbroker/CMakeLists.txt
+++ b/services/tunnelbroker/CMakeLists.txt
@@ -29,9 +29,11 @@
 if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL "/transferred")
   # Inside the docker build contex
   set(_proto_path "grpc")
+  set(_shared_path "./lib/src")
 else()
   # Inside repo
   set(_proto_path "../../native/cpp/CommonCpp/grpc")
+  set(_shared_path "../lib/src")
 endif()
 
 # Shared Comm protos
@@ -40,6 +42,12 @@
   EXCLUDE_FROM_ALL
 )
 
+# Shared services code
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_shared_path}
+  ${CMAKE_CURRENT_BINARY_DIR}/common
+  EXCLUDE_FROM_ALL
+)
+
 set(BUILD_TESTING OFF CACHE BOOL "Turn off tests" FORCE)
 set(WITH_GFLAGS OFF CACHE BOOL "Turn off gflags" FORCE)
 
@@ -58,7 +66,6 @@
 set(RUST_LIBS "rust-notifications")
 
 file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")
-file(GLOB COMMON_CODE "${CMAKE_CURRENT_SOURCE_DIR}/../lib/src/*.cpp")
 
 set(
   SOURCE_CODE
@@ -66,13 +73,14 @@
   ${DOUBLE_CONVERSION_SOURCES}
   ${GENERATED_CODE}
   ${SOURCE_CODE}
-  ${COMMON_CODE}
 )
 
 set(
   LIBS
 
+  comm-services-common
   comm-tunnelbroker-grpc
+
   gRPC::grpc++_reflection
   gRPC::grpc++
   ${AWSSDK_LINK_LIBRARIES}
@@ -105,7 +113,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Tools
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Amqp
 
-  ${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
+  ${CMAKE_CURRENT_SOURCE_DIR}/${_shared_path}
 )
 
 target_link_libraries(
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -36,7 +36,7 @@
 COPY services/lib/docker/ scripts/
 COPY services/tunnelbroker/docker/* docker/
 COPY services/tunnelbroker/ .
-COPY services/lib/src/* src/
+COPY services/lib/src/ lib/src/
 
 RUN scripts/build_service.sh