diff --git a/docker/Dockerfile b/docker/Dockerfile
index b608e4ab6d..ba5b05d14c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:utopic
+FROM ubuntu:wily
 MAINTAINER caktux
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -8,9 +8,6 @@ RUN apt-get update
 RUN apt-get upgrade -q -y
 RUN apt-get dist-upgrade -q -y
 
-# Let our containers upgrade themselves
-RUN apt-get install -q -y unattended-upgrades
-
 # Install Ethereum
 RUN apt-get install -q -y software-properties-common
 RUN add-apt-repository ppa:ethereum/ethereum
@@ -18,14 +15,7 @@ RUN add-apt-repository ppa:ethereum/ethereum-dev
 RUN apt-get update
 RUN apt-get install -q -y geth
 
-# Install supervisor
-RUN apt-get install -q -y supervisor
-
-# Add supervisor configs
-ADD supervisord.conf supervisord.conf
-
 EXPOSE 8545
 EXPOSE 30303
 
-CMD ["-n", "-c", "/supervisord.conf"]
-ENTRYPOINT ["/usr/bin/supervisord"]
+ENTRYPOINT ["/usr/bin/geth"]
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
deleted file mode 100644
index 33cba0c140..0000000000
--- a/docker/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[supervisord]
-nodaemon=false
-
-[program:geth]
-priority=30
-directory=/
-command=geth --rpc
-user=root
-autostart=true
-autorestart=true
-startsecs=10
-stopsignal=QUIT
-stdout_logfile=/var/log/geth.log
-stderr_logfile=/var/log/geth.err
-
-[unix_http_server]
-file=%(here)s/supervisor.sock
-
-[supervisorctl]
-serverurl=unix://%(here)s/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
\ No newline at end of file