diff --git a/Dockerfile b/Dockerfile
index c2372c9..624834f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:edge
 
 RUN apk upgrade --no-cache
 RUN apk add --no-cache ca-certificates openssl bash
diff --git a/Makefile b/Makefile
index e7c1fa0..4963465 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ROOT_DIR=${PWD}
 HARDWARE=$(shell uname -m)
 GIT_VERSION=$(shell git describe --always --tags --dirty)
 GIT_SHA=$(shell git rev-parse HEAD)
-GOVERSION=1.15
+GOVERSION=$(shell go version | { read _ _ v _; echo ${v#go}; })
 BUILD_TIME=$(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
 VERSION ?= ${TRAVIS_TAG:-git+${TRAVIS_COMMIT:-local+${GIT_VERSION}}}
 DEPS=$(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)