diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile
index 67e22dee..a9dc6779 100644
--- a/sample-functions/AlpineFunction/Dockerfile
+++ b/sample-functions/AlpineFunction/Dockerfile
@@ -1,9 +1,8 @@
 FROM alpine:3.7
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-
-# COPY ./fwatchdog /usr/bin/
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 # Populate example here
 # ENV fprocess="wc -l"
diff --git a/sample-functions/BaseFunctions/R/Dockerfile b/sample-functions/BaseFunctions/R/Dockerfile
index cb0e2154..78f81d23 100644
--- a/sample-functions/BaseFunctions/R/Dockerfile
+++ b/sample-functions/BaseFunctions/R/Dockerfile
@@ -1,7 +1,8 @@
 FROM artemklevtsov/r-alpine:latest
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 WORKDIR /root/
 
diff --git a/sample-functions/BaseFunctions/cobol/Dockerfile b/sample-functions/BaseFunctions/cobol/Dockerfile
index ed61fd9a..4e0068fe 100644
--- a/sample-functions/BaseFunctions/cobol/Dockerfile
+++ b/sample-functions/BaseFunctions/cobol/Dockerfile
@@ -1,7 +1,9 @@
 FROM toricls/gnucobol:latest
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apt-get update && apt-get install -y curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /root/
 
diff --git a/sample-functions/BaseFunctions/coffee/Dockerfile b/sample-functions/BaseFunctions/coffee/Dockerfile
index d84e1646..c8cead07 100644
--- a/sample-functions/BaseFunctions/coffee/Dockerfile
+++ b/sample-functions/BaseFunctions/coffee/Dockerfile
@@ -1,7 +1,8 @@
 FROM node:6.9.1-alpine
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 WORKDIR /root/
 
diff --git a/sample-functions/BaseFunctions/dncore/Dockerfile b/sample-functions/BaseFunctions/dncore/Dockerfile
index 6fc6c94f..5b3a847a 100644
--- a/sample-functions/BaseFunctions/dncore/Dockerfile
+++ b/sample-functions/BaseFunctions/dncore/Dockerfile
@@ -1,7 +1,9 @@
 FROM microsoft/dotnet:sdk
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apt-get update && apt-get install -y curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
 
diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile
index 8f3fe1bb..4d89004a 100644
--- a/sample-functions/BaseFunctions/golang/Dockerfile
+++ b/sample-functions/BaseFunctions/golang/Dockerfile
@@ -8,8 +8,9 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
 
 RUN go install
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/go/bin/golang"
 HEALTHCHECK --interval=1s CMD [ -e /tmp/.lock ] || exit 1
diff --git a/sample-functions/BaseFunctions/java/Dockerfile b/sample-functions/BaseFunctions/java/Dockerfile
index c9c68fba..41282cc0 100644
--- a/sample-functions/BaseFunctions/java/Dockerfile
+++ b/sample-functions/BaseFunctions/java/Dockerfile
@@ -1,7 +1,8 @@
 FROM openjdk:8u121-jdk-alpine
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 WORKDIR /root/
 
diff --git a/sample-functions/BaseFunctions/node/Dockerfile b/sample-functions/BaseFunctions/node/Dockerfile
index a25bffd9..f85c59fa 100644
--- a/sample-functions/BaseFunctions/node/Dockerfile
+++ b/sample-functions/BaseFunctions/node/Dockerfile
@@ -1,8 +1,8 @@
 FROM node:6.9.1-alpine
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
-
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 WORKDIR /root/
 
 COPY package.json .
diff --git a/sample-functions/BaseFunctions/python/Dockerfile b/sample-functions/BaseFunctions/python/Dockerfile
index 423932f0..985fb6a5 100644
--- a/sample-functions/BaseFunctions/python/Dockerfile
+++ b/sample-functions/BaseFunctions/python/Dockerfile
@@ -1,7 +1,8 @@
 FROM python:2.7-alpine
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 WORKDIR /root/
 
diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile
index 81b8a1ad..0f3e369c 100644
--- a/sample-functions/CaptainsIntent/Dockerfile
+++ b/sample-functions/CaptainsIntent/Dockerfile
@@ -1,8 +1,9 @@
 FROM alpine:3.7
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
 COPY handler.js     .
diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile
index 86ca8518..9f979af6 100644
--- a/sample-functions/ChangeColorIntent/Dockerfile
+++ b/sample-functions/ChangeColorIntent/Dockerfile
@@ -1,9 +1,9 @@
 FROM alpine:3.7
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-#COPY ./fwatchdog /usr/bin/
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 COPY package.json           .
 RUN npm i
diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile
index 1ebc4b47..1055d728 100644
--- a/sample-functions/HostnameIntent/Dockerfile
+++ b/sample-functions/HostnameIntent/Dockerfile
@@ -1,8 +1,9 @@
 FROM alpine:3.7
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .
 COPY handler.js     .
diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile
index 77912f4b..5f7f3850 100644
--- a/sample-functions/NodeInfo/Dockerfile
+++ b/sample-functions/NodeInfo/Dockerfile
@@ -2,8 +2,9 @@ FROM alpine:3.7
 
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 COPY package.json .
 COPY main.js .
diff --git a/sample-functions/Phantomjs/Dockerfile b/sample-functions/Phantomjs/Dockerfile
index 7b1a8f20..32cf9bd7 100644
--- a/sample-functions/Phantomjs/Dockerfile
+++ b/sample-functions/Phantomjs/Dockerfile
@@ -1,7 +1,9 @@
 FROM alexellis2/phantomjs-docker:latest
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apt-get update && apt-get install -y curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENV fprocess="phantomjs /dev/stdin"
 
diff --git a/sample-functions/ResizeImageMagick/Dockerfile b/sample-functions/ResizeImageMagick/Dockerfile
index c11ed1fe..a2ed7156 100644
--- a/sample-functions/ResizeImageMagick/Dockerfile
+++ b/sample-functions/ResizeImageMagick/Dockerfile
@@ -1,7 +1,8 @@
 FROM v4tech/imagemagick
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "convert - -resize 50% fd:1"
 
diff --git a/sample-functions/SentimentAnalysis/Dockerfile b/sample-functions/SentimentAnalysis/Dockerfile
index 500bb2f2..1553ccd3 100644
--- a/sample-functions/SentimentAnalysis/Dockerfile
+++ b/sample-functions/SentimentAnalysis/Dockerfile
@@ -3,8 +3,9 @@ FROM python:2.7-alpine
 RUN pip install textblob && \
     python -m textblob.download_corpora
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 WORKDIR /root/
 
diff --git a/sample-functions/figlet/Dockerfile b/sample-functions/figlet/Dockerfile
index 9059213f..04026925 100644
--- a/sample-functions/figlet/Dockerfile
+++ b/sample-functions/figlet/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.7
 
-ADD https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+RUN apk --no-cache add curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.9.0/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
 RUN apk add --no-cache figlet