diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..d1d79d53e6ec30aaaa30f7d9086c485d9a4318d4
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.git
+build/_workspace
+build/_bin
diff --git a/Dockerfile b/Dockerfile
index f24506f69dbcf437d89b26dd3e30d50c3e8270b7..ae6870e311025580798f9c9dba6c27f1be849466 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:3.3
+FROM alpine:3.5
 
 ADD . /go-ethereum
 RUN \
-  apk add --update git go make gcc musl-dev         && \
-  (cd go-ethereum && make geth)                     && \
-  cp go-ethereum/build/bin/geth /geth               && \
-  apk del git go make gcc musl-dev                  && \
+  apk add --update git go make gcc musl-dev linux-headers && \
+  (cd go-ethereum && make geth)                           && \
+  cp go-ethereum/build/bin/geth /geth                     && \
+  apk del git go make gcc musl-dev linux-headers          && \
   rm -rf /go-ethereum && rm -rf /var/cache/apk/*
 
 EXPOSE 8545
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
index a8d85bc63a521d751d74f71b09d10677ea2a5839..d239129d533d0d09c60b6bb6f4f5476a6e00cfa7 100644
--- a/containers/docker/develop-alpine/Dockerfile
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine:3.5
 
 RUN \
-  apk add --update go git make gcc musl-dev ca-certificates && \
+  apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
   git clone --depth 1 https://github.com/ethereum/go-ethereum && \
   (cd go-ethereum && make geth) && \
   cp go-ethereum/build/bin/geth /geth && \
-  apk del go git make gcc musl-dev && \
+  apk del go git make gcc musl-dev linux-headers && \
   rm -rf /go-ethereum && rm -rf /var/cache/apk/*
 
 EXPOSE 8545
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
index 0db583a439faee84a36a140e3bda0cadcee45e74..3c72bc8c83fc05849eff9258bb21c6d64f5aefae 100644
--- a/containers/docker/master-alpine/Dockerfile
+++ b/containers/docker/master-alpine/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine:3.5
 
 RUN \
-  apk add --update go git make gcc musl-dev ca-certificates && \
+  apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
   git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
   (cd go-ethereum && make geth) && \
   cp go-ethereum/build/bin/geth /geth && \
-  apk del go git make gcc musl-dev && \
+  apk del go git make gcc musl-dev linux-headers && \
   rm -rf /go-ethereum && rm -rf /var/cache/apk/*
 
 EXPOSE 8545