diff --git a/tor/Dockerfile b/tor/Dockerfile
index 7e610d1..0bb8b7d 100644
--- a/tor/Dockerfile
+++ b/tor/Dockerfile
@@ -25,15 +25,13 @@ RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositor
                gmp-dev \
                go \
                python-dev \
-    && rm -rf /var/cache/apk/* \
-    && mkdir -p /home/tor/.tor \
-    && chown -R tor:nogroup /home/tor
+    && rm -rf /var/cache/apk/*
 
 COPY ./torrc /etc/tor/torrc
 
 USER tor
-WORKDIR /home/tor
-VOLUME /etc/tor /home/tor/.tor
+WORKDIR /var/lib/tor
+VOLUME /etc/tor /var/lib/tor
 EXPOSE 9001 9030 9050 9051
 
 CMD ["/usr/bin/tor", "-f", "/etc/tor/torrc"]
diff --git a/tor/README.md b/tor/README.md
index 51abde4..89dfae3 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -41,6 +41,7 @@ BridgeRelay 1
 Exitpolicy reject *:*
 Nickname datageek
 ContactInfo noreply@datageek.info
+DataDirectory /var/lib/tor
 #ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
 #ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
diff --git a/tor/torrc b/tor/torrc
index 3585d6a..ab19835 100644
--- a/tor/torrc
+++ b/tor/torrc
@@ -4,6 +4,7 @@ BridgeRelay 1
 Exitpolicy reject *:*
 Nickname datageek
 ContactInfo noreply@datageek.info
+DataDirectory /var/lib/tor
 #ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
 #ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy