diff --git a/services/tunnelbroker/CMakeLists.txt b/services/tunnelbroker/CMakeLists.txt
index ad0426641..c95656823 100644
--- a/services/tunnelbroker/CMakeLists.txt
+++ b/services/tunnelbroker/CMakeLists.txt
@@ -1,150 +1,154 @@
 PROJECT(tunnelbroker C CXX)
 
 cmake_minimum_required(VERSION 3.16)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)
 
 if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
 set(CMAKE_CXX_STANDARD 17)
 
 find_package(PkgConfig REQUIRED)
 
 find_package(double-conversion REQUIRED)
 find_package(Folly REQUIRED)
 find_package(protobuf REQUIRED)
 find_package(gRPC REQUIRED)
 
 # Find AMQP-CPP installation
 find_package(amqpcpp CONFIG REQUIRED)
 
 # Find Cryptopp installation
 pkg_check_modules(CRYPTOPP REQUIRED libcryptopp=8.6)
 
 # Find Libuv installation
 pkg_check_modules(LIBUV REQUIRED libuv>=1.43)
 
-if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL "/transferred")
+if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL "/transferred/tunnelbroker")
   # Inside the docker build contex
   set(_proto_path "grpc")
 else()
   # Inside repo
   set(_proto_path "../../native/cpp/CommonCpp/grpc")
 endif()
 
 # Shared Comm protos
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_proto_path}
   ${CMAKE_CURRENT_BINARY_DIR}/protos
   EXCLUDE_FROM_ALL
 )
 
+# Shared services code
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
+  ${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)
 
 find_package(AWSSDK REQUIRED COMPONENTS core dynamodb)
 find_package(Boost 1.40
   COMPONENTS program_options thread system context filesystem regex
   REQUIRED
 )
 find_package(OpenSSL REQUIRED)
 find_package(glog)
 
 # Corrosion Rust integration
 find_package(Corrosion REQUIRED)
 corrosion_import_crate(MANIFEST_PATH "rust-notifications/Cargo.toml")
 set(RUST_HEADERS_INCLUDE_DIR "rust-notifications/extern")
 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
 
   ${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}
   ${CRYPTOPP_LIBRARIES}
   ${LIBUV_LIBRARIES}
   ${Boost_LIBRARIES}
   ${RUST_LIBS}
   amqpcpp
   OpenSSL::SSL
   glog::glog
   double-conversion::double-conversion
   Folly::folly
 )
 
 # SERVER
 add_executable(
   tunnelbroker
 
   ${FOLLY_SOURCES}
   ${GENERATED_CODE}
   ${SOURCE_CODE}
 )
 
 target_include_directories(tunnelbroker
   PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Database
   ${CMAKE_CURRENT_SOURCE_DIR}/src/DeliveryBroker
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Service
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Tools
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Amqp
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
 )
 
 target_link_libraries(
   tunnelbroker
 
   ${LIBS}
 )
 
 install(
   TARGETS tunnelbroker
   RUNTIME DESTINATION bin/
 )
 
 # TEST
 if($ENV{COMM_TEST_SERVICES} MATCHES 1)
   file(GLOB TEST_CODE "./test/*.cpp")
   list(FILTER SOURCE_CODE EXCLUDE REGEX "./src/server.cpp")
   enable_testing()
 
   find_package(GTest REQUIRED)
   include_directories(${GTEST_INCLUDE_DIR})
 
   add_executable(
     runTests
 
     ${FOLLY_SOURCES}
     ${SOURCE_CODE}
     ${TEST_CODE}
   )
   target_link_libraries(
     runTests
 
     ${LIBS}
     gtest
     gtest_main
   )
 
   add_test(
     NAME runTests
     COMMAND runTests
   )
 endif()
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
index d15ad69a2..abbaa15f8 100644
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -1,43 +1,46 @@
 FROM commapp/services-base:1.3
 
 ARG MAKE_JOBS=4
 ENV MAKEFLAGS="-j${MAKE_JOBS}"
 
 WORKDIR /transferred/scripts
 
 # Install Curl
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
 
 # Install SDKs
 COPY services/tunnelbroker/docker/install_amqp_cpp.sh .
 RUN ./install_amqp_cpp.sh
 
 COPY services/tunnelbroker/docker/install_cryptopp.sh .
 RUN ./install_cryptopp.sh
 
 COPY services/tunnelbroker/docker/install_libuv.sh .
 RUN ./install_libuv.sh
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 
 COPY services/tunnelbroker/docker/install_corrosion.sh .
 RUN ./install_corrosion.sh
 
 ARG COMM_TEST_SERVICES
 ARG COMM_SERVICES_SANDBOX
 
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
 ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}
 
 WORKDIR /transferred
 
+COPY services/lib/src/ lib/src/
+
+WORKDIR /transferred/tunnelbroker
+
 ADD native/cpp/CommonCpp/grpc grpc
 COPY services/lib/cmake-components cmake-components
 COPY services/lib/docker/ scripts/
 COPY services/tunnelbroker/docker/* docker/
 COPY services/tunnelbroker/ .
-COPY services/lib/src/* src/
 
 RUN scripts/build_service.sh
 
 CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_service.sh; else scripts/run_service.sh; fi