diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index ba5b05d14..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM ubuntu:wily
-MAINTAINER caktux
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Usual update / upgrade
-RUN apt-get update
-RUN apt-get upgrade -q -y
-RUN apt-get dist-upgrade -q -y
-
-# Install Ethereum
-RUN apt-get install -q -y software-properties-common
-RUN add-apt-repository ppa:ethereum/ethereum
-RUN add-apt-repository ppa:ethereum/ethereum-dev
-RUN apt-get update
-RUN apt-get install -q -y geth
-
-EXPOSE 8545
-EXPOSE 30303
-
-ENTRYPOINT ["/usr/bin/geth"]
diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
new file mode 100644
index 000000000..98b4aadf8
--- /dev/null
+++ b/docker/develop/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu:wily
+MAINTAINER caktux
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+    apt-get upgrade -q -y && \
+    apt-get dist-upgrade -q -y && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \
+    echo "deb http://ppa.launchpad.net/ethereum/ethereum-dev/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \
+    apt-get update && \
+    apt-get install -q -y geth
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/usr/bin/geth"]
diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
new file mode 100644
index 000000000..2c6de28c9
--- /dev/null
+++ b/docker/master/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu:wily
+MAINTAINER caktux
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+    apt-get upgrade -q -y && \
+    apt-get dist-upgrade -q -y && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \
+    echo "deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \
+    apt-get update && \
+    apt-get install -q -y geth
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/usr/bin/geth"]