diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile
index 96afdbb4f..c19d2159e 100644
--- a/services/backup/Dockerfile
+++ b/services/backup/Dockerfile
@@ -1,22 +1,22 @@
 FROM commapp/services-base:1.1
 
 RUN apt-get update && \
   apt-get install -y uuid-dev && \
   rm -rf /var/lib/apt/lists/*
 
 ARG COMM_TEST_SERVICES
 ARG COMM_SERVICES_DEV_MODE
 
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
 ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
 
 WORKDIR /transferred
 
 COPY native/cpp/CommonCpp/grpc/protos/backup.proto native/cpp/CommonCpp/grpc/protos/blob.proto protos/
-COPY services/backup/docker/ scripts/
 COPY services/lib/ .
+COPY services/lib/docker/ scripts/
 COPY services/backup/ .
 
-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_tests.sh; else scripts/run_service.sh; fi
diff --git a/services/backup/docker/generate.sh b/services/backup/docker/generate.sh
deleted file mode 100755
index fd7ed511f..000000000
--- a/services/backup/docker/generate.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "generating files from protos..."
-
-protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/backup.proto
-protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/blob.proto
-
-echo "success - code generated from protos"
diff --git a/services/backup/docker/run_server.sh b/services/backup/docker/run_server.sh
deleted file mode 100755
index 0cbd90677..000000000
--- a/services/backup/docker/run_server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cmake/build/bin/backup
diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
index bb0aa0b4a..d49df91ba 100644
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -1,22 +1,22 @@
 FROM commapp/services-base:1.1
 
 RUN apt-get update && \
   apt-get install -y uuid-dev && \
   rm -rf /var/lib/apt/lists/*
 
 WORKDIR /transferred
 
 COPY native/cpp/CommonCpp/grpc/protos/blob.proto protos/blob.proto
-COPY services/blob/docker/ scripts/
 COPY services/lib/ .
+COPY services/lib/docker/ scripts/
 COPY services/blob/ .
 
 ARG COMM_SERVICES_DEV_MODE
 ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
 
 ARG COMM_TEST_SERVICES
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
 
-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_tests.sh; else scripts/run_service.sh; fi
diff --git a/services/blob/docker/build.sh b/services/blob/docker/build.sh
deleted file mode 100755
index 4b180f053..000000000
--- a/services/blob/docker/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-NPROC=0
-
-NPROC=$(nproc 2> /dev/null || echo 1)
-if [[ $NPROC -eq 1 ]]; then
-  NPROC=$(sysctl -n hw.physicalcpu 2> /dev/null || echo 1)
-fi
-
-echo "building the server (nproc=$NPROC)..."
-
-pushd cmake/build
-cmake ../..
-make -j $NPROC
-
-popd
-
-echo "success - server built"
diff --git a/services/blob/docker/build_server.sh b/services/blob/docker/build_server.sh
old mode 100755
new mode 100644
index 9ed5c8706..a4583ad39
--- a/services/blob/docker/build_server.sh
+++ b/services/blob/docker/build_server.sh
@@ -1,23 +1,23 @@
 #!/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
 
 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
 
-scripts/generate.sh
+scripts/proto_codegen.sh
 scripts/build.sh
diff --git a/services/blob/docker/generate.sh b/services/blob/docker/generate.sh
deleted file mode 100755
index 454859061..000000000
--- a/services/blob/docker/generate.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "generating files from protos..."
-
-protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/blob.proto
-
-echo "success - code generated from protos"
diff --git a/services/blob/docker/run_server.sh b/services/blob/docker/run_server.sh
deleted file mode 100755
index 4591797df..000000000
--- a/services/blob/docker/run_server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cmake/build/bin/blob
diff --git a/services/blob/docker/run_tests.sh b/services/blob/docker/run_tests.sh
deleted file mode 100755
index 1fae22919..000000000
--- a/services/blob/docker/run_tests.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd cmake/build
-make test ARGS="-V"
-popd # cmake/build
diff --git a/services/backup/docker/build_server.sh b/services/lib/docker/build_service.sh
similarity index 88%
rename from services/backup/docker/build_server.sh
rename to services/lib/docker/build_service.sh
index 9ed5c8706..c182ea9fe 100755
--- a/services/backup/docker/build_server.sh
+++ b/services/lib/docker/build_service.sh
@@ -1,23 +1,23 @@
 #!/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
 
 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
 
-scripts/generate.sh
-scripts/build.sh
+scripts/proto_codegen.sh
+scripts/build_sources.sh
diff --git a/services/backup/docker/build.sh b/services/lib/docker/build_sources.sh
similarity index 100%
rename from services/backup/docker/build.sh
rename to services/lib/docker/build_sources.sh
diff --git a/services/lib/docker/proto_codegen.sh b/services/lib/docker/proto_codegen.sh
new file mode 100755
index 000000000..aa795c8ff
--- /dev/null
+++ b/services/lib/docker/proto_codegen.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+echo "generating files from protos..."
+
+for PROTO_FILE in $(ls ./protos); do
+  protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/$PROTO_FILE
+done
+
+echo "success - code generated from protos"
diff --git a/services/lib/docker/run_service.sh b/services/lib/docker/run_service.sh
new file mode 100755
index 000000000..828f75ffb
--- /dev/null
+++ b/services/lib/docker/run_service.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+EXE_PATH="./cmake/build/bin"
+
+EXE=`ls $EXE_PATH`
+EXES=`ls $EXE_PATH | wc -l`
+
+if [[ $EXES -ne 1 ]]; then
+  echo "there should be exactly one executable of a service, $EXES found";
+  exit 1;
+fi
+
+$EXE_PATH/$EXE
diff --git a/services/backup/docker/run_tests.sh b/services/lib/docker/run_tests.sh
similarity index 100%
rename from services/backup/docker/run_tests.sh
rename to services/lib/docker/run_tests.sh