diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile
index e6dd2769..5a2d6578 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/0.5.6-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/0.6.0/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
index a8220299..bbb44a85 100755
--- a/sample-functions/NodeInfo/build.sh
+++ b/sample-functions/NodeInfo/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t functions/nodeinfo .
+docker build --squash -t functions/nodeinfo .
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index 9cd3cef7..de371d2a 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -9,5 +9,7 @@ COPY requesthandler_test.go .
 COPY types types
 
 RUN go test
+
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o watchdog .
 
+RUN GOARM=6 GOARCH=arm CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o watchdog-armhf .
diff --git a/watchdog/build.sh b/watchdog/build.sh
index 21118fcf..165a5e16 100755
--- a/watchdog/build.sh
+++ b/watchdog/build.sh
@@ -12,4 +12,6 @@ fi
 
 docker create --name buildoutput functions/watchdog:build echo
 docker cp buildoutput:/go/src/github.com/alexellis/faas/watchdog/watchdog ./fwatchdog
+docker cp buildoutput:/go/src/github.com/alexellis/faas/watchdog/watchdog-armhf ./fwatchdog-armhf
+
 docker rm buildoutput