diff --git a/Dockerfile b/Dockerfile
index e0c1ea9..d58934f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,8 @@ RUN set -ex; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \
   apk update --update-cache && apk add --no-cache ${PACK_LIST}
 
-RUN echo
+RUN mkdir -p /run/tor && \
+  chown -Rf tor /run/tor
 
 RUN echo "$TIMEZONE" >"/etc/timezone" ; \
   touch "/etc/profile" "/root/.profile" ; \
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index 9d6b07c..8242e93 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -157,6 +157,7 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create directories
 [ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR"
+[ -d "/run/tor" ] || mkdir -p "/run/tor"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create files
 
diff --git a/rootfs/usr/local/share/template-files/config/tor/torrc b/rootfs/usr/local/share/template-files/config/tor/torrc
index b409a2c..4425686 100644
--- a/rootfs/usr/local/share/template-files/config/tor/torrc
+++ b/rootfs/usr/local/share/template-files/config/tor/torrc
@@ -5,8 +5,8 @@ CookieAuthentication 1
 CookieAuthFileGroupReadable 1
 HashedControlPassword 16:C30604D1D90F341360A14D9A1048C1DF4A3CA2411444E52EE5B954C01F
 ##### directiories and files
-ControlSocket /tmp/tor-control.sock
-CookieAuthFile /tmp/tor-control.authcookie
+ControlSocket /run/tor/control.sock
+CookieAuthFile /run/tor/control.authcookie
 DataDirectory /data/tor
 ##### logging
 Log notice file /dev/sdout