diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index e7269dad..d97c6baf 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.9.4 as build
+
 RUN curl -sL https://github.com/alexellis/license-check/releases/download/0.2.2/license-check \
       > /usr/bin/license-check \
       && chmod +x /usr/bin/license-check
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index 8794f412..86f4f375 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.8.5
+FROM golang:1.9.4 as build
+
 RUN mkdir -p /go/src/github.com/openfaas/faas/watchdog
 WORKDIR /go/src/github.com/openfaas/faas/watchdog