diff --git a/Dockerfile b/Dockerfile
index 08be0ec..72b3a9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,16 @@
-FROM alpine
+FROM golang:alpine
 
-ENV GOPATH /go:/go/src/github.com/Luzifer/promcertcheck/Godeps/_workspace
+MAINTAINER Knut Ahlers <knut@ahlers.me>
 
 ADD . /go/src/github.com/Luzifer/promcertcheck
 WORKDIR /go/src/github.com/Luzifer/promcertcheck
 
-RUN apk --update add git go ca-certificates \
- && go install -ldflags "-X main.version=$(git describe --tags || git rev-parse --short || echo dev)" \
- && apk --purge del git go
+RUN set -ex \
+ && apk add --update git ca-certificates \
+ && go install -ldflags "-X main.version=$(git describe --tags || git rev-parse --short HEAD || echo dev)" \
+ && apk del --purge git
 
 EXPOSE 3000
+
 ENTRYPOINT ["/go/bin/promcertcheck"]
 CMD ["--probe=https://www.google.com/", "--probe=https://www.facebook.com/"]