diff --git a/Dockerfile b/Dockerfile
index 0882bad..bf038ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     tor
 
-COPY rc/torrc /etc/tor/torrc
+COPY misc/tor/torrc /etc/tor/torrc
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
@@ -40,4 +40,4 @@ COPY . .
 
 EXPOSE $EXPOSE_PORT
 
-CMD service tor start && ./run
+CMD misc/tor/start-tor.sh & ./run
diff --git a/misc/tor/start-tor.sh b/misc/tor/start-tor.sh
new file mode 100755
index 0000000..19be24a
--- /dev/null
+++ b/misc/tor/start-tor.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$(whoami)" != "root" ]; then
+    tor -f /etc/tor/torrc
+else
+    service tor start
+fi
diff --git a/rc/torrc b/misc/tor/torrc
similarity index 100%
rename from rc/torrc
rename to misc/tor/torrc