diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -20,7 +20,7 @@
       - $HOME/.aws/config:/root/.aws/config:ro
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
       - ./tunnelbroker/tunnelbroker.ini:/root/tunnelbroker/tunnelbroker.ini:ro
-      - ./tunnelbroker/tunnelbroker-dev.ini:/root/tunnelbroker/tunnelbroker-dev.ini:ro
+      - ./tunnelbroker/tunnelbroker-sandbox.ini:/root/tunnelbroker/tunnelbroker-sandbox.ini:ro
   # backup
   backup-server:
     depends_on:
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
--- a/services/tunnelbroker/Dockerfile
+++ b/services/tunnelbroker/Dockerfile
@@ -1,9 +1,8 @@
 FROM commapp/services-base:1.3.2
 
-ARG MAKE_JOBS=4
-ENV MAKEFLAGS="-j${MAKE_JOBS}"
+ARG CARGO_PATH="/root/.cargo/bin/cargo"
 
-WORKDIR /transferred/scripts
+WORKDIR /transferred/services/scripts
 
 # Install Curl
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
@@ -20,9 +19,6 @@
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 
-COPY services/lib/docker/install_corrosion.sh .
-RUN ./install_corrosion.sh
-
 ARG COMM_TEST_SERVICES
 ARG COMM_SERVICES_SANDBOX
 
@@ -31,17 +27,13 @@
 
 WORKDIR /transferred
 
-COPY services/lib/src/ lib/src/
+COPY services/lib/src/ services/lib/src/
 COPY shared/ shared/
 
-WORKDIR /transferred/tunnelbroker
+WORKDIR /transferred/services/tunnelbroker
 
-ADD shared/protos grpc
-COPY services/lib/cmake-components cmake-components
-COPY services/lib/docker/ scripts/
-COPY services/tunnelbroker/docker/* docker/
 COPY services/tunnelbroker/ .
 
-RUN scripts/build_service.sh
+RUN ${CARGO_PATH} build
 
-CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi
+CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then ${CARGO_PATH} test; else ${CARGO_PATH} run; fi