diff --git a/.dockerignore b/.dockerignore
--- a/.dockerignore
+++ b/.dockerignore
@@ -17,7 +17,7 @@
 !native/.flowconfig
 !native/ios/Podfile
 !native/ios/pod-patch
-!native/cpp/CommonCpp/grpc/protos
+!native/cpp/CommonCpp/grpc
 
 web/node_modules
 web/dist
diff --git a/services/lib/docker/build_service.sh b/services/lib/docker/build_service.sh
--- a/services/lib/docker/build_service.sh
+++ b/services/lib/docker/build_service.sh
@@ -3,23 +3,11 @@
 set -e
 
 # folly hack - https://github.com/facebook/folly/pull/1231
-sed -i 's/#if __has_include(<demangle.h>)/#if __has_include(<Demangle.h>)/g' /usr/lib/folly/folly/detail/Demangle.h
-
-rm -rf lib
-mkdir lib
-pushd lib
-ln -s /usr/lib/folly
-ln -s /usr/lib/glog
-ln -s /usr/lib/double-conversion
-popd # lib
-
-rm -rf _generated
-mkdir _generated
+sed -i 's/#if __has_include(<demangle.h>)/#if __has_include(<Demangle.h>)/g' /usr/local/include/folly/detail/Demangle.h
 
 rm -rf cmake/build
 mkdir -p cmake/build
 
 # Allow scripts to be called from anywhere
 SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd -P)
-"${SCRIPT_DIR}"/proto_codegen.sh
 "${SCRIPT_DIR}"/build_sources.sh
diff --git a/services/tunnelbroker/CMakeLists.txt b/services/tunnelbroker/CMakeLists.txt
--- a/services/tunnelbroker/CMakeLists.txt
+++ b/services/tunnelbroker/CMakeLists.txt
@@ -12,9 +12,10 @@
 
 find_package(PkgConfig REQUIRED)
 
-# FIND LIBS
-include(./cmake-components/grpc.cmake)
-include(./cmake-components/folly.cmake)
+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)
@@ -25,12 +26,30 @@
 # Find Libuv installation
 pkg_check_modules(LIBUV REQUIRED libuv>=1.43)
 
+if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL "/transferred")
+  # 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
+)
+
 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 REQUIRED)
+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)
@@ -38,53 +57,8 @@
 set(RUST_HEADERS_INCLUDE_DIR "rust-notifications/extern")
 set(RUST_LIBS "rust-notifications")
 
-add_subdirectory(./lib/glog)
-
-# Generated sources
-get_filename_component(proto "protos/tunnelbroker.proto" ABSOLUTE)
-get_filename_component(proto_path "${proto}" PATH)
-
-set(GENERATED_BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}/gen")
-set(GENERATED_CODE_DIR "${GENERATED_BASE_DIR}/_generated")
-file(MAKE_DIRECTORY ${GENERATED_CODE_DIR})
-
-set(_proto_srcs "${GENERATED_CODE_DIR}/tunnelbroker.pb.cc")
-set(_proto_hdrs "${GENERATED_CODE_DIR}/tunnelbroker.pb.h")
-set(_grpc_srcs "${GENERATED_CODE_DIR}/tunnelbroker.grpc.pb.cc")
-set(_grpc_hdrs "${GENERATED_CODE_DIR}/tunnelbroker.grpc.pb.h")
-add_custom_command(
-  OUTPUT "${_proto_srcs}" "${_proto_hdrs}" "${_grpc_srcs}" "${_grpc_hdrs}"
-  COMMAND ${_PROTOBUF_PROTOC}
-  ARGS --grpc_out "${GENERATED_CODE_DIR}"
-  --cpp_out "${GENERATED_CODE_DIR}"
-  -I "${proto_path}"
-  --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
-  "${proto}"
-  DEPENDS "${proto}"
-  COMMENT "Generate protobuf files"
-)
-
 file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")
-set(GENERATED_CODE ${_proto_srcs} ${_proto_hdrs} ${_grpc_srcs} ${_grpc_hdrs})
-file(GLOB DOUBLE_CONVERSION_SOURCES
-  "./lib/double-conversion/double-conversion/*.cc"
-)
-
-include_directories(
-  ./src
-  ./src/Database
-  ./src/DeliveryBroker
-  ./src/Service
-  ./src/Tools
-  ./src/Amqp
-  ${GENERATED_BASE_DIR}
-  ${FOLLY_INCLUDES}
-  ./lib/double-conversion
-  ${Boost_INCLUDE_DIR}
-  ${CRYPTOPP_INCLUDE_DIRS}
-  ${LIBUV_INCLUDE_DIRS}
-  ${RUST_HEADERS_INCLUDE_DIR}
-)
+file(GLOB COMMON_CODE "${CMAKE_CURRENT_SOURCE_DIR}/../lib/src/*.cpp")
 
 set(
   SOURCE_CODE
@@ -92,14 +66,15 @@
   ${DOUBLE_CONVERSION_SOURCES}
   ${GENERATED_CODE}
   ${SOURCE_CODE}
+  ${COMMON_CODE}
 )
 
 set(
   LIBS
 
-  ${GRPC_LIBS}
-  ${_PROTOBUF_LIBPROTOBUF}
-  ${_REFLECTION}
+  comm-tunnelbroker-grpc
+  gRPC::grpc++_reflection
+  gRPC::grpc++
   ${AWSSDK_LINK_LIBRARIES}
   ${CRYPTOPP_LIBRARIES}
   ${LIBUV_LIBRARIES}
@@ -108,6 +83,8 @@
   amqpcpp
   OpenSSL::SSL
   glog::glog
+  double-conversion::double-conversion
+  Folly::folly
 )
 
 # SERVER
@@ -119,6 +96,18 @@
   ${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
 
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -1,4 +1,4 @@
-FROM commapp/services-base:1.2
+FROM commapp/services-base:latest
 
 ARG MAKE_JOBS=4
 ENV MAKEFLAGS="-j${MAKE_JOBS}"
@@ -31,7 +31,7 @@
 
 WORKDIR /transferred
 
-COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto protos/tunnelbroker.proto
+ADD native/cpp/CommonCpp/grpc grpc
 COPY services/lib/cmake-components cmake-components
 COPY services/lib/docker/ scripts/
 COPY services/tunnelbroker/docker/* docker/
diff --git a/services/tunnelbroker/src/Database/DatabaseManager.h b/services/tunnelbroker/src/Database/DatabaseManager.h
--- a/services/tunnelbroker/src/Database/DatabaseManager.h
+++ b/services/tunnelbroker/src/Database/DatabaseManager.h
@@ -4,6 +4,10 @@
 #include "Constants.h"
 #include "DatabaseEntitiesTools.h"
 #include "DatabaseManagerBase.h"
+#include "DeviceSessionItem.h"
+#include "MessageItem.h"
+#include "PublicKeyItem.h"
+#include "SessionSignItem.h"
 #include "Tools.h"
 
 #include <aws/core/Aws.h>
diff --git a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
--- a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
+++ b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <_generated/tunnelbroker.grpc.pb.h>
-#include <_generated/tunnelbroker.pb.h>
+#include <tunnelbroker.grpc.pb.h>
+#include <tunnelbroker.pb.h>
 
 #include <grpcpp/grpcpp.h>