diff --git a/Dockerfile b/Dockerfile
index d521d18c..0ad99f29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 MAINTAINER Felix Imobersteg <felix@whatwedo.ch>
 
@@ -9,17 +9,20 @@ ENV HOME /root
 #Install ZeroNet
 RUN \
     apt-get update -y; \
-    apt-get -y install msgpack-python python-gevent python-pip python-dev; \
+    apt-get -y install msgpack-python python-gevent python-pip python-dev tor; \
     pip install msgpack-python --upgrade; \
     apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+    echo "ControlPort 9051" >> /etc/tor/torrc; \
+    echo "CookieAuthentication 1" >> /etc/tor/torrc
+    
 
 #Add Zeronet source
 ADD . /root
 VOLUME /root/data
 
 #Set upstart command
-CMD cd /root && python zeronet.py --ui_ip 0.0.0.0
+CMD cd /root && /etc/init.d/tor start && python zeronet.py --ui_ip 0.0.0.0
 
 #Expose ports
 EXPOSE 43110