diff --git a/TestDrive.md b/TestDrive.md
index 69407d7d64db411327b38ded9eb0fc2a523a4e38..d82f7fcc3eed06a790bcabe6569ddd21ac1d503d 100644
--- a/TestDrive.md
+++ b/TestDrive.md
@@ -18,8 +18,6 @@ This one-shot script clones the code, initialises Docker swarm mode and then dep
 # docker swarm init --advertise-addr=$(ifconfig eth0| grep 'inet addr:'| cut -d: -f2 | awk '{ print $1}') && \
   git clone https://github.com/alexellis/faas && \
   cd faas && \
-  git checkout labels_metrics && \
-  (cd gateway && ./build.sh) && \
   ./deploy_stack.sh && \
   docker service ls
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index 0dda03fde9d53a069a16a7ba8d49037eb212fe3d..8c41d872c60313ed7cd348bf9bcd100f05194787 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
             - "/var/run/docker.sock:/var/run/docker.sock"
         ports:
             - 8080:8080
-        image: alexellis2/faas-gateway:latest-dev3
+        image: alexellis2/faas-gateway:latest
         networks:
             - functions
         deploy:
diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile
index bbb83675234e86684f76b076827ee801a2b806a6..1c245f4814272bad4d50a8434e45425cbe77cafc 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-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 2a96cd1bab313247a8d8fe1ae919fb3849b1692c..76563499bdb662295c23e6520d47c246c759b91d 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-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 54450d36ca4e6e28546ac543b4f16d58d04bdfca..5a083c0790a624d44b46134313642a9504ddd8c2 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile
index 7586cc92d6b97e49bc1d4e88913faf17c89cb86f..0f87ecb2fa457ea76d5e5dbe24bd8f7b68488226 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/go/bin/DockerHubStats"
diff --git a/sample-functions/DockerHubStats/build.sh b/sample-functions/DockerHubStats/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d855b94699a7d4d3dcad63c4da066bba25abba71
--- /dev/null
+++ b/sample-functions/DockerHubStats/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t alexellis2/faas-hubstats .
diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile
index 0c93412747267f3f0149933053cfb0c531d0db6d..32c3963dd7409961b1a8c95c999116f0f4cb2afd 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile
index b44946becea5c948e1b6dac93026eba2877cb083..f14a61cc1b50137e0e03109cdc0325ac91ca6d21 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json .
diff --git a/sample-functions/NodeInfo/build.sh b/sample-functions/NodeInfo/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5f0a45782df7b1ffe17f4b264e4dfb71e1ae2ef9
--- /dev/null
+++ b/sample-functions/NodeInfo/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t alexellis2/faas-nodeinfo .
diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile
index 9816f29734d8640b698e9051fb1edc8a5c413ae4..3ae9c48d7d8749755e58e8f83923ee5ce73dbff3 100644
--- a/sample-functions/WebhookStash/Dockerfile
+++ b/sample-functions/WebhookStash/Dockerfile
@@ -5,7 +5,8 @@ WORKDIR /go/src/app
 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.1-alpha/fwatchdog /usr/bin
+
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 # COPY fwatchdog  /usr/bin/
 
diff --git a/sample-functions/WebhookStash/build.sh b/sample-functions/WebhookStash/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e7cda97102687a1dd90b843d1cee0e2a607baf9e
--- /dev/null
+++ b/sample-functions/WebhookStash/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t alexellis2/faas-webhookstash .
diff --git a/sample-functions/catservice/Dockerfile b/sample-functions/catservice/Dockerfile
index 24b37abd3bf80b5aada312301044233621ef6076..e91be1efbec5f817cab5667d74cf813deaa77f64 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.1-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/bin/cat"