diff --git a/Dockerfile b/Dockerfile
index fd974b68..4aa501a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
 FROM golang:1.11 as build
+RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh
+RUN mv ./license-check /usr/bin/license-check && chmod +x /usr/bin/license-check
 
 RUN mkdir -p /go/src/github.com/openfaas/faas-swarm/
 
@@ -6,12 +8,10 @@ WORKDIR /go/src/github.com/openfaas/faas-swarm
 
 COPY . .
 
-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
-RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
+RUN license-check -path /go/src/github.com/openfaas/faas-swarm/ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
 
 RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
-    && go test $(go list ./... | grep -v /vendor/) -cover \
+    && CGO_ENABLED=0 go test $(go list ./... | grep -v /vendor/) -cover \
     && VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
     && GIT_COMMIT=$(git rev-list -1 HEAD) \
     && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
@@ -19,8 +19,7 @@ RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
     -X github.com/openfaas/faas-swarm/version.Version=${VERSION}" \
     -a -installsuffix cgo -o faas-swarm .
 
-# Release stage
-FROM alpine:3.8
+FROM alpine:3.10 as ship
 
 LABEL org.label-schema.license="MIT" \
       org.label-schema.vcs-url="https://github.com/openfaas/faas-swarm" \
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 8f381b94..4aa501a4 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,5 +1,6 @@
-# Build stage
-FROM golang:1.10.4 as build
+FROM golang:1.11 as build
+RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh
+RUN mv ./license-check /usr/bin/license-check && chmod +x /usr/bin/license-check
 
 RUN mkdir -p /go/src/github.com/openfaas/faas-swarm/
 
@@ -7,21 +8,25 @@ WORKDIR /go/src/github.com/openfaas/faas-swarm
 
 COPY . .
 
-#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
-#RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
+RUN license-check -path /go/src/github.com/openfaas/faas-swarm/ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
 
 RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
-  && go test $(go list ./... | grep -v /vendor/) -cover \
-  && VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
-  && GIT_COMMIT=$(git rev-list -1 HEAD) \
-  && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-  -X github.com/openfaas/faas-swarm/version.GitCommit=${GIT_COMMIT}\
-  -X github.com/openfaas/faas-swarm/version.Version=${VERSION}" \
-  -a -installsuffix cgo -o faas-swarm .
-
-# Release stage
-FROM alpine:3.8
+    && CGO_ENABLED=0 go test $(go list ./... | grep -v /vendor/) -cover \
+    && VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
+    && GIT_COMMIT=$(git rev-list -1 HEAD) \
+    && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
+    -X github.com/openfaas/faas-swarm/version.GitCommit=${GIT_COMMIT}\
+    -X github.com/openfaas/faas-swarm/version.Version=${VERSION}" \
+    -a -installsuffix cgo -o faas-swarm .
+
+FROM alpine:3.10 as ship
+
+LABEL org.label-schema.license="MIT" \
+      org.label-schema.vcs-url="https://github.com/openfaas/faas-swarm" \
+      org.label-schema.vcs-type="Git" \
+      org.label-schema.name="openfaas/faas-swarm" \
+      org.label-schema.vendor="openfaas" \
+      org.label-schema.docker.schema-version="1.0"
 
 RUN apk --no-cache add ca-certificates
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 53ee0d80..4aa501a4 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,5 +1,6 @@
-# Build stage
-FROM golang:1.9.7 as build
+FROM golang:1.11 as build
+RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh
+RUN mv ./license-check /usr/bin/license-check && chmod +x /usr/bin/license-check
 
 RUN mkdir -p /go/src/github.com/openfaas/faas-swarm/
 
@@ -7,21 +8,25 @@ WORKDIR /go/src/github.com/openfaas/faas-swarm
 
 COPY . .
 
-#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
-#RUN license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
+RUN license-check -path /go/src/github.com/openfaas/faas-swarm/ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
 
 RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
-  && go test $(go list ./... | grep -v /vendor/) -cover \
-  && VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
-  && GIT_COMMIT=$(git rev-list -1 HEAD) \
-  && GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-  -X github.com/openfaas/faas-swarm/version.GitCommit=${GIT_COMMIT}\
-  -X github.com/openfaas/faas-swarm/version.Version=${VERSION}" \
-  -a -installsuffix cgo -o faas-swarm .
-
-# Release stage
-FROM alpine:3.7
+    && CGO_ENABLED=0 go test $(go list ./... | grep -v /vendor/) -cover \
+    && VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
+    && GIT_COMMIT=$(git rev-list -1 HEAD) \
+    && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
+    -X github.com/openfaas/faas-swarm/version.GitCommit=${GIT_COMMIT}\
+    -X github.com/openfaas/faas-swarm/version.Version=${VERSION}" \
+    -a -installsuffix cgo -o faas-swarm .
+
+FROM alpine:3.10 as ship
+
+LABEL org.label-schema.license="MIT" \
+      org.label-schema.vcs-url="https://github.com/openfaas/faas-swarm" \
+      org.label-schema.vcs-type="Git" \
+      org.label-schema.name="openfaas/faas-swarm" \
+      org.label-schema.vendor="openfaas" \
+      org.label-schema.docker.schema-version="1.0"
 
 RUN apk --no-cache add ca-certificates
 
diff --git a/handlers/deploy_test.go b/handlers/deploy_test.go
index a48bdeac..bad7b2f1 100644
--- a/handlers/deploy_test.go
+++ b/handlers/deploy_test.go
@@ -71,7 +71,7 @@ func Test_BuildLabels_NoAnnotations(t *testing.T) {
 func Test_BuildLabels_KeyClash(t *testing.T) {
 	request := &requests.CreateFunctionRequest{
 		Labels: &map[string]string{
-			"function_name":                                      "echo",
+			"function_name": "echo",
 			fmt.Sprintf("%scurrent-time", annotationLabelPrefix): "foo",
 		},
 		Annotations: &map[string]string{"current-time": "Wed 25 Jul 06:41:43 BST 2018"},
diff --git a/handlers/secrets.go b/handlers/secrets.go
index 3e972009..c2abf9d9 100644
--- a/handlers/secrets.go
+++ b/handlers/secrets.go
@@ -220,7 +220,7 @@ func updateSecret(c client.SecretAPIClient, body []byte) (responseStatus int, re
 		)
 	}
 
-	return http.StatusOK, nil,nil
+	return http.StatusOK, nil, nil
 }
 
 func deleteSecret(c client.SecretAPIClient, body []byte) (responseStatus int, responseBody []byte, err error) {
@@ -256,7 +256,6 @@ func deleteSecret(c client.SecretAPIClient, body []byte) (responseStatus int, re
 	return http.StatusOK, nil, nil
 }
 
-
 func makeSecretsArray(c *client.Client, secretNames []string) ([]*swarm.SecretReference, error) {
 	values := []*swarm.SecretReference{}