diff --git a/services/backup/contents/build_and_run_server.sh b/services/backup/contents/build_server.sh
similarity index 70%
rename from services/backup/contents/build_and_run_server.sh
rename to services/backup/contents/build_server.sh
index e2d29b512..21bd7073c 100755
--- a/services/backup/contents/build_and_run_server.sh
+++ b/services/backup/contents/build_server.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
 
 set -e
 
-cd transferred/server
+pushd transferred/server
 
 rm -rf _generated
 mkdir _generated
 
 rm -rf cmake/build
 mkdir -p cmake/build
 
 ./generate.sh
 ./build.sh
-./cmake/build/bin/backup
+
+popd # transferred/server
diff --git a/services/backup/contents/run_server.sh b/services/backup/contents/run_server.sh
new file mode 100755
index 000000000..3b9ef6c07
--- /dev/null
+++ b/services/backup/contents/run_server.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+/transferred/server/cmake/build/bin/backup
diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile
index ae0073b10..addcee509 100644
--- a/services/backup/docker-server/Dockerfile
+++ b/services/backup/docker-server/Dockerfile
@@ -1,8 +1,10 @@
 FROM commapp/backup-base:1.0
 
 ENV SHELL=/bin/bash
 
 COPY services/backup/contents /transferred
 COPY native/cpp/CommonCpp/grpc/protos/backup.proto /transferred/server/protos/backup.proto
 
-CMD /transferred/build_and_run_server.sh && /bin/bash
+RUN /transferred/build_server.sh
+
+CMD /transferred/run_server.sh && /bin/bash
diff --git a/services/tunnelbroker/contents/build_and_run_server.sh b/services/tunnelbroker/contents/build_server.sh
similarity index 88%
rename from services/tunnelbroker/contents/build_and_run_server.sh
rename to services/tunnelbroker/contents/build_server.sh
index e59702768..0e467bc28 100755
--- a/services/tunnelbroker/contents/build_and_run_server.sh
+++ b/services/tunnelbroker/contents/build_server.sh
@@ -1,26 +1,27 @@
 #!/bin/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
 
-cd transferred/server
+pushd transferred/server
 
 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
 
 rm -rf cmake/build
 mkdir -p cmake/build
 
 ./generate.sh
 ./build.sh
-./cmake/build/bin/tunnelbroker
+
+popd # transferred/server
diff --git a/services/tunnelbroker/contents/run_server.sh b/services/tunnelbroker/contents/run_server.sh
new file mode 100755
index 000000000..8e7f95704
--- /dev/null
+++ b/services/tunnelbroker/contents/run_server.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+/transferred/server/cmake/build/bin/tunnelbroker
diff --git a/services/tunnelbroker/docker-server/Dockerfile b/services/tunnelbroker/docker-server/Dockerfile
index 62062ec6f..f0568aa92 100644
--- a/services/tunnelbroker/docker-server/Dockerfile
+++ b/services/tunnelbroker/docker-server/Dockerfile
@@ -1,9 +1,11 @@
 FROM commapp/tunnelbroker-base:1.0
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SHELL=/bin/bash
 
 COPY services/tunnelbroker/contents /transferred
 COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto /transferred/server/protos/tunnelbroker.proto
 
-CMD /transferred/build_and_run_server.sh && /bin/bash
+RUN /transferred/build_server.sh
+
+CMD /transferred/run_server.sh && /bin/bash