diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -22,9 +22,10 @@
 
 COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto protos/tunnelbroker.proto
 COPY services/lib/cmake-components cmake-components
-COPY services/tunnelbroker/docker/ scripts/
+COPY services/lib/docker/ scripts/
+COPY services/tunnelbroker/docker/* docker/
 COPY services/tunnelbroker/ .
 
-RUN scripts/build_server.sh
+RUN scripts/build_service.sh
 
-CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_server.sh; fi
+CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_service.sh; else scripts/run_service.sh; fi
diff --git a/services/tunnelbroker/docker/build_server.sh b/services/tunnelbroker/docker/build_server.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker/build_server.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-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 cmake/build
-mkdir -p cmake/build
-
-echo "building the server (MAKEFLAGS=$MAKEFLAGS)..."
-pushd cmake/build
-cmake ../..
-make
-popd # cmake/build
diff --git a/services/tunnelbroker/docker/install_folly.sh b/services/tunnelbroker/docker/install_folly.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker/install_folly.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-pushd /usr/lib
-
-git clone https://github.com/facebook/folly.git --branch v2020.01.13.00 --single-branch
-git clone https://github.com/google/glog.git --branch v0.4.0 --single-branch
-git clone https://github.com/google/double-conversion.git --branch  v3.1.5 --single-branch
-
-popd # /usr/lib
diff --git a/services/tunnelbroker/docker/run_server.sh b/services/tunnelbroker/docker/run_server.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker/run_server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cmake/build/bin/tunnelbroker
diff --git a/services/tunnelbroker/docker/run_tests.sh b/services/tunnelbroker/docker/run_tests.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker/run_tests.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-pushd cmake/build
-make test ARGS="-V"
-popd # cmake/build