diff --git a/Dockerfile b/Dockerfile
index f1953b6..75b45cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 #use the golang base image
 FROM golang:1.7
-MAINTAINER Daniel van Gils
+MAINTAINER Cloud 66
 
 #get all the go crosscompile stuff
 RUN go get github.com/mitchellh/gox
@@ -21,4 +21,4 @@ ADD . /usr/local/go/src/github.com/cloud66/starter
 ADD ./test/node/express_no_git /usr/local/go/src/github.com/cloud66
 
 #switch to our app directory
-WORKDIR /usr/local/go/src/github.com/cloud66/starter
\ No newline at end of file
+WORKDIR /usr/local/go/src/github.com/cloud66/starter
diff --git a/Dockerfile.crosscompile b/Dockerfile.crosscompile
index 1401b71..4ff8eed 100644
--- a/Dockerfile.crosscompile
+++ b/Dockerfile.crosscompile
@@ -1,6 +1,6 @@
 #use the golang base image
-FROM golang:1.7
-MAINTAINER Daniel van Gils
+FROM golang:1.8
+MAINTAINER Cloud 66
 
 #get all the go crosscompile stuff
 RUN go get github.com/mitchellh/gox
@@ -12,4 +12,4 @@ ADD . /usr/local/go/src/github.com/cloud66/starter
 #switch to our app directory
 WORKDIR /usr/local/go/src/github.com/cloud66/starter
 
-RUN ./compile.sh
\ No newline at end of file
+RUN ./compile.sh
diff --git a/Dockerfile.production b/Dockerfile.production
index c627da8..9ff5251 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -1,6 +1,6 @@
 # use the alpine base image
-FROM alpine:3.3
-MAINTAINER Daniel van Gils
+FROM alpine:3.6
+MAINTAINER Cloud 66
 
 RUN apk --update upgrade && apk add curl ca-certificates && rm -rf /var/cache/apk/*