diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
new file mode 100644
index 0000000000..6b00bf2538
--- /dev/null
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -0,0 +1,15 @@
+FROM alpine:3.3
+
+RUN \
+  apk add --update go git make gcc musl-dev         && \
+  git clone https://github.com/ethereum/go-ethereum && \
+  (cd go-ethereum && git checkout develop)          && \
+  (cd go-ethereum && make geth)                     && \
+  cp go-ethereum/build/bin/geth /geth               && \
+  apk del go git make gcc musl-dev                  && \
+  rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/geth"]
diff --git a/docker/develop/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile
similarity index 100%
rename from docker/develop/Dockerfile
rename to containers/docker/develop-ubuntu/Dockerfile
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
new file mode 100644
index 0000000000..7a4c535fda
--- /dev/null
+++ b/containers/docker/master-alpine/Dockerfile
@@ -0,0 +1,14 @@
+FROM alpine:3.3
+
+RUN \
+  apk add --update go git make gcc musl-dev gmp-dev && \
+  git clone 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 gmp-dev          && \
+  rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/geth"]
diff --git a/docker/master/Dockerfile b/containers/docker/master-ubuntu/Dockerfile
similarity index 100%
rename from docker/master/Dockerfile
rename to containers/docker/master-ubuntu/Dockerfile