diff --git a/Dockerfile b/Dockerfile
index 096f868..f5e37e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,24 +11,20 @@ COPY auth /home/deluge/.config/deluge/
 COPY core.conf /home/deluge/.config/deluge/
 COPY web_plugin.conf /home/deluge/.config/deluge/
 COPY web.conf /home/deluge/.config/
-COPY run_deluge.sh /
 RUN apt-get update ; \
     apt-get install -y software-properties-common ; \
     add-apt-repository -y ppa:deluge-team/ppa ; \
     apt-get update ; \
     apt-get -y install deluged deluge-web deluge-console ; \ 
     chown -R deluge /home/deluge/.config ; \
-    chgrp -R deluge /home/deluge/.config ; \
-    chmod +x /run_deluge.sh
+    chgrp -R deluge /home/deluge/.config
 
-# Install supervisor, vnstat, & start script
-RUN apt-get -y install supervisor vnstat ; mkdir /start.d
+# Install supervisor, vnstat
+RUN apt-get -y install supervisor vnstat
 COPY deluged.conf /etc/supervisor/conf.d/deluged.conf 
 COPY vnstatd.conf etc/supervisor/conf.d/vnstatd.conf
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY start /start
-RUN chmod +x /start ; \
-    chown -R deluge /var/lib/vnstat ; \
+RUN chown -R deluge /var/lib/vnstat ; \
     chgrp -R deluge /var/lib/vnstat ; \
     sed -i -e"s/^UnitMode\s0/UnitMode 1/" /etc/vnstat.conf ; \
     sed -i -e"s/^RateUnit\s1/RateUnit 0/" /etc/vnstat.conf
@@ -45,5 +41,4 @@ EXPOSE 58846
 # REMEMBER TO MANUALLY SPECIFY A PEER PORT ON RUN
 
 # Set boot command
-CMD /start
-
+ENTRYPOINT ["supervisord"]
diff --git a/deluged.conf b/deluged.conf
index 7d845f6..e61071f 100644
--- a/deluged.conf
+++ b/deluged.conf
@@ -1,4 +1,5 @@
 [program:deluged]
 autorestart=true
-command=/run_deluge.sh
-
+command=/usr/bin/deluged --do-not-daemonize
+user=deluge
+environment=HOME="/home/deluge",USER="deluge"
diff --git a/run_deluge.sh b/run_deluge.sh
deleted file mode 100644
index 2b771f0..0000000
--- a/run_deluge.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd /home/deluge/
-su -c "/usr/bin/deluged --do-not-daemonize" deluge
-
diff --git a/start b/start
deleted file mode 100755
index 465c607..0000000
--- a/start
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# run everything in start.d
-find /start.d -type f -executable -exec {} \;
-
-# Cleanly kill supervisor when container is stopped
-trap 'kill $(jobs -p)' EXIT
-
-# start services
-supervisord
diff --git a/vnstatd.conf b/vnstatd.conf
index 7df1f6c..c27cfe5 100644
--- a/vnstatd.conf
+++ b/vnstatd.conf
@@ -1,4 +1,5 @@
 [program:vnstatd]
-command=/bin/su -c '/usr/sbin/vnstatd -n' deluge
+command=/usr/sbin/vnstatd --nodaemon
 autorestart=true
-
+user=deluge
+environment=HOME="/home/deluge",USER="deluge"