diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -3,15 +3,9 @@
   base:
     build: base-image
     image: commapp/services-base:1.0
-  # tunnelbroker
-  tunnelbroker-base:
-    build:
-      dockerfile: services/tunnelbroker/docker-base/Dockerfile
-      context: ../
-    image: commapp/tunnelbroker-base:2.0
   tunnelbroker-server:
     build:
-      dockerfile: services/tunnelbroker/docker-server/Dockerfile
+      dockerfile: services/tunnelbroker/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile
new file mode 100644
--- /dev/null
+++ b/services/tunnelbroker/Dockerfile
@@ -0,0 +1,32 @@
+FROM commapp/services-base:1.0
+
+ENV SHELL=/bin/bash
+
+RUN apk update
+RUN apk add curl-dev openssl-dev zlib-dev
+
+# Install SDKs
+COPY services/tunnelbroker/docker/install_folly.sh /transferred/
+RUN /transferred/install_folly.sh
+
+COPY services/tunnelbroker/docker/install_aws_sdk.sh /transferred/
+RUN /transferred/install_aws_sdk.sh
+
+COPY services/tunnelbroker/docker/install_amqp_cpp.sh /transferred/
+RUN /transferred/install_amqp_cpp.sh
+
+COPY services/tunnelbroker/docker/install_cryptopp.sh /transferred/
+RUN /transferred/install_cryptopp.sh
+
+COPY services/tunnelbroker/docker/install_libuv.sh /transferred/
+RUN /transferred/install_libuv.sh
+
+ARG COMM_TEST_SERVICES
+ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
+
+COPY services/tunnelbroker/docker-server/contents /transferred
+COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto /transferred/server/protos/tunnelbroker.proto
+
+RUN /transferred/build_server.sh
+
+CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then /transferred/run_tests.sh; else /transferred/run_server.sh; fi
diff --git a/services/tunnelbroker/docker-base/Dockerfile b/services/tunnelbroker/docker-base/Dockerfile
deleted file mode 100644
--- a/services/tunnelbroker/docker-base/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM commapp/services-base:1.0
-
-ENV SHELL=/bin/bash
-
-COPY services/tunnelbroker/docker-base/contents /transferred
-
-RUN apk update
-RUN apk add curl-dev openssl-dev zlib-dev
-
-# Install SDKs
-RUN /transferred/install_folly.sh
-RUN /transferred/install_aws_sdk.sh
-RUN /transferred/install_amqp_cpp.sh
-RUN /transferred/install_cryptopp.sh
-RUN /transferred/install_libuv.sh
-
-CMD /bin/bash
diff --git a/services/tunnelbroker/docker-server/Dockerfile b/services/tunnelbroker/docker-server/Dockerfile
deleted file mode 100644
--- a/services/tunnelbroker/docker-server/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM commapp/tunnelbroker-base:2.0
-
-ARG COMM_TEST_SERVICES
-
-ENV SHELL=/bin/bash
-ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
-
-COPY services/tunnelbroker/docker-server/contents /transferred
-COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto /transferred/server/protos/tunnelbroker.proto
-
-RUN /transferred/build_server.sh
-
-CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then /transferred/run_tests.sh; else /transferred/run_server.sh; fi
diff --git a/services/tunnelbroker/docker-base/contents/install_amqp_cpp.sh b/services/tunnelbroker/docker/install_amqp_cpp.sh
rename from services/tunnelbroker/docker-base/contents/install_amqp_cpp.sh
rename to services/tunnelbroker/docker/install_amqp_cpp.sh
diff --git a/services/tunnelbroker/docker-base/contents/install_aws_sdk.sh b/services/tunnelbroker/docker/install_aws_sdk.sh
rename from services/tunnelbroker/docker-base/contents/install_aws_sdk.sh
rename to services/tunnelbroker/docker/install_aws_sdk.sh
diff --git a/services/tunnelbroker/docker-base/contents/install_cryptopp.sh b/services/tunnelbroker/docker/install_cryptopp.sh
rename from services/tunnelbroker/docker-base/contents/install_cryptopp.sh
rename to services/tunnelbroker/docker/install_cryptopp.sh
diff --git a/services/tunnelbroker/docker-base/contents/install_folly.sh b/services/tunnelbroker/docker/install_folly.sh
rename from services/tunnelbroker/docker-base/contents/install_folly.sh
rename to services/tunnelbroker/docker/install_folly.sh
diff --git a/services/tunnelbroker/docker-base/contents/install_libuv.sh b/services/tunnelbroker/docker/install_libuv.sh
rename from services/tunnelbroker/docker-base/contents/install_libuv.sh
rename to services/tunnelbroker/docker/install_libuv.sh