diff --git a/DEV.md b/DEV.md
index 56d0ed8b..045a532b 100644
--- a/DEV.md
+++ b/DEV.md
@@ -26,7 +26,7 @@ You can find the [reference documentation for the Watchdog here](https://github.
 This is the basis of a function which generates HTML from MarkDown:
 
 ```
-FROM golang:1.9.4
+FROM golang:1.9.7
 RUN mkdir -p /go/src/app
 COPY handler.go /go/src/app
 WORKDIR /go/src/app
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index 3b8ac03a..26adc11c 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4 as build
+FROM golang:1.9.7 as build
 
 RUN curl -sL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \
       > /usr/bin/license-check \
diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64
index e920c1cb..e2efc1ec 100644
--- a/gateway/Dockerfile.arm64
+++ b/gateway/Dockerfile.arm64
@@ -1,5 +1,4 @@
-#FROM alexellis2/golang:1.9-arm64 as build
-FROM golang:1.9.2 as build
+FROM golang:1.9.7 as build
 WORKDIR /go/src/github.com/openfaas/faas/gateway
 
 #RUN curl -sL https://github.com/alexellis/license-check/releases/download/0.1/license-check > /usr/bin/license-check && chmod +x /usr/bin/license-check
diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf
index 52782639..be84d164 100644
--- a/gateway/Dockerfile.armhf
+++ b/gateway/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM golang:1.9.6 as build
+FROM golang:1.9.7 as build
 
 WORKDIR /go/src/github.com/openfaas/faas/gateway
 
diff --git a/sample-functions/ApiKeyProtected-Secrets/Dockerfile b/sample-functions/ApiKeyProtected-Secrets/Dockerfile
index a7274d2d..60b8eda4 100644
--- a/sample-functions/ApiKeyProtected-Secrets/Dockerfile
+++ b/sample-functions/ApiKeyProtected-Secrets/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine as builder
+FROM golang:1.9.7-alpine as builder
 
 MAINTAINER alex@openfaas.com
 ENTRYPOINT []
diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile
index 92b42cb2..7eb141ac 100644
--- a/sample-functions/BaseFunctions/golang/Dockerfile
+++ b/sample-functions/BaseFunctions/golang/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine
+FROM golang:1.9.7-alpine
 
 MAINTAINER alexellis2@gmail.com
 ENTRYPOINT []
diff --git a/sample-functions/BaseFunctions/golang/Dockerfile.win b/sample-functions/BaseFunctions/golang/Dockerfile.win
index 41a60a03..57103e7d 100644
--- a/sample-functions/BaseFunctions/golang/Dockerfile.win
+++ b/sample-functions/BaseFunctions/golang/Dockerfile.win
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-windowsservercore
+FROM golang:1.9.7-windowsservercore
 MAINTAINER alexellis2@gmail.com
 ENTRYPOINT []
 
diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile
index 7881e42c..053cf41f 100644
--- a/sample-functions/DockerHubStats/Dockerfile
+++ b/sample-functions/DockerHubStats/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine as builder
+FROM golang:1.9.7-alpine as builder
 
 MAINTAINER alex@openfaas.com
 ENTRYPOINT []
diff --git a/sample-functions/DockerHubStats/Dockerfile.armhf b/sample-functions/DockerHubStats/Dockerfile.armhf
index 41763521..6ef0904d 100644
--- a/sample-functions/DockerHubStats/Dockerfile.armhf
+++ b/sample-functions/DockerHubStats/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine as builder
+FROM golang:1.9.7-alpine as builder
 
 MAINTAINER alex@openfaas.com
 ENTRYPOINT []
diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile
index b798b2bb..58ffa390 100644
--- a/sample-functions/MarkdownRender/Dockerfile
+++ b/sample-functions/MarkdownRender/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine as builder
+FROM golang:1.9.7-alpine as builder
 
 MAINTAINER alex@openfaas.com
 ENTRYPOINT []
diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile
index c7dada33..d56d500d 100644
--- a/sample-functions/WebhookStash/Dockerfile
+++ b/sample-functions/WebhookStash/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine as builder
+FROM golang:1.9.7-alpine as builder
 
 MAINTAINER alex@openfaas.com
 ENTRYPOINT []
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index a02427e6..9045950f 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4 as build
+FROM golang:1.9.7 as build
 ARG VERSION
 ARG GIT_COMMIT