diff --git a/gateway/build.sh b/gateway/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7787c53088d0da4dfac57e87fe50f394cf097ac5
--- /dev/null
+++ b/gateway/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo Building catservice:latest
+
+docker build -t catservice .
+
diff --git a/oneshot.sh b/oneshot.sh
index fe2b70ac8f2536930fbec64a391b4c23f57b95a0..53aac2e7be6967a078ef07a983d981d3321824b2 100755
--- a/oneshot.sh
+++ b/oneshot.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
- docker network create --driver overlay --attachable functions
- git clone https://github.com/alexellis/faas && cd faas
- cd watchdog
- ./build.sh
- docker build -t catservice .
- docker service rm catservice ; docker service create --network=functions --name catservice catservice
- cd ..
- cd gateway
- docker build -t server . ;docker rm -f server; docker run -d -v /var/run/docker.sock:/var/run/docker.sock --name server -p 8080:8080 --network=functions server
+docker network create --driver overlay --attachable functions
+git clone https://github.com/alexellis/faas && cd faas
+cd watchdog
+./build.sh
+docker build -t catservice .
+docker service rm catservice ; docker service create --network=functions --name catservice catservice
+cd ..
+cd gateway
+docker build -t server . ;docker rm -f server; docker run -d -v /var/run/docker.sock:/var/run/docker.sock --name server -p 8080:8080 --network=functions server
 
diff --git a/watchdog/build.sh b/watchdog/build.sh
index bd4bd47be8dd0b581c8461ffbe75754aadf2d72a..f9787e54c915f39f7ad76aafddf3e68e161d33df 100755
--- a/watchdog/build.sh
+++ b/watchdog/build.sh
@@ -1,4 +1,7 @@
-#!/bin/bash
+#!/bin/sh
+
+# Below makes use of "builder pattern" so that binary is extracted separate
+# from the golang runtime/SDK
 
 docker build -t watchdog:latest . -f Dockerfile.build
 docker create --name buildoutput watchdog:latest