diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile
index 1c245f4814272bad4d50a8434e45425cbe77cafc..8ef0a2985ea9a8ff9b5ba5098e730b33e758b7d0 100644
--- a/sample-functions/AlpineFunction/Dockerfile
+++ b/sample-functions/AlpineFunction/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 # Populate example here
diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile
index 76563499bdb662295c23e6520d47c246c759b91d..134a7ba4b825a7b0c903975c28db21f4a741ef17 100644
--- a/sample-functions/CaptainsIntent/Dockerfile
+++ b/sample-functions/CaptainsIntent/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 RUN apk --update add nodejs
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile
index 043c82d1e1df0a801a4ef774eb64979240c5c176..b70b8ebff2879910fb0bce22553ba5b451d7b6ae 100644
--- a/sample-functions/ChangeColorIntent/Dockerfile
+++ b/sample-functions/ChangeColorIntent/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 RUN apk --update add nodejs
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 #COPY ./fwatchdog /usr/bin/
 RUN chmod +x /usr/bin/fwatchdog
 
diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile
index 7c45dcc6b9c7af0b329493ccaa425ac235f24bf7..3f15395594ccb81a39d1e1deff3ce2e6d106f191 100644
--- a/sample-functions/DockerHubStats/Dockerfile
+++ b/sample-functions/DockerHubStats/Dockerfile
@@ -8,7 +8,7 @@ COPY . /go/src/github.com/alexellis/faas/sample-functions/DockerHubStats
 
 RUN make
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/go/bin/DockerHubStats"
diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile
index 32c3963dd7409961b1a8c95c999116f0f4cb2afd..bd526a3acedf1ce6aa225265235a52e21f177a75 100644
--- a/sample-functions/HostnameIntent/Dockerfile
+++ b/sample-functions/HostnameIntent/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 RUN apk --update add nodejs
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile
index 1ef8f96015c171738127a59cb7bc44004b479f8f..8159a82bf1ab5591c21c57472eb3e6f64cf61fb6 100644
--- a/sample-functions/MarkdownRender/Dockerfile
+++ b/sample-functions/MarkdownRender/Dockerfile
@@ -6,7 +6,7 @@ EXPOSE 8080
 ENV http_proxy      ""
 ENV https_proxy     ""
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 # COPY fwatchdog  /usr/bin/
 
diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile
index f14a61cc1b50137e0e03109cdc0325ac91ca6d21..78a8c2a3c909a6a254aadd92f230c96437418b05 100644
--- a/sample-functions/NodeInfo/Dockerfile
+++ b/sample-functions/NodeInfo/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 RUN apk --update add nodejs
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json .
diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile
index 911eae7223d2357af9ff1dd91355bb27a3c24e5e..5d2f75041439eb83ff534537e501f662136c5775 100644
--- a/sample-functions/WebhookStash/Dockerfile
+++ b/sample-functions/WebhookStash/Dockerfile
@@ -6,7 +6,7 @@ RUN go get -d -v
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
 
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 # COPY fwatchdog  /usr/bin/
 
diff --git a/sample-functions/build_all.sh b/sample-functions/build_all.sh
new file mode 100755
index 0000000000000000000000000000000000000000..15bca726e39b605c279376fc879f2eeb50a96d36
--- /dev/null
+++ b/sample-functions/build_all.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export current=$(pwd)
+
+for dir in `ls`;
+do
+    test -d "$dir" || continue
+    cd $dir
+    echo $dir
+
+    if [ -e ./build.sh ]
+    then
+        ./build.sh
+    fi
+    cd ..
+done
diff --git a/sample-functions/catservice/Dockerfile b/sample-functions/catservice/Dockerfile
index e91be1efbec5f817cab5667d74cf813deaa77f64..871ada904b784b3c89568f496ce4d8c9e7c22402 100644
--- a/sample-functions/catservice/Dockerfile
+++ b/sample-functions/catservice/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 ENTRYPOINT []
 
-ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/bin/cat"