diff --git a/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile
index d1424f6..d888ad1 100644
--- a/rtorrent-flood/Dockerfile
+++ b/rtorrent-flood/Dockerfile
@@ -6,8 +6,7 @@ ARG LIBTORRENT_VER=0.13.6
 ARG FILEBOT_VER=4.7.2
 ARG BUILD_CORES
 
-ENV UID=991 \
-    GID=991 \
+ENV UID=991 GID=991 \
     FLOOD_SECRET=supersecret \
     PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
@@ -34,8 +33,9 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a
     gzip \
     zip \
     unrar \
-    supervisor \
-    tini@community \
+    s6 \
+    su-exec \
+    python \
     openjdk8-jre@community \
  && cd /tmp && mkdir libtorrent rtorrent \
  && cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \
@@ -58,14 +58,14 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/a
  && rm -rf /var/cache/apk/* /tmp/*
 
 COPY config.js /usr/flood/
-COPY supervisord.ini /etc/supervisor.d/
-COPY startup /usr/bin/
+COPY s6.d /etc/s6.d
+COPY run.sh /usr/bin/
 COPY postdl /usr/bin/
 COPY postrm /usr/bin/
 COPY config.js /usr/flood/
 COPY rtorrent.rc /home/torrent/.rtorrent.rc
 
-RUN chmod +x /usr/bin/* \
+RUN chmod +x /usr/bin/* /etc/s6.d/*/* \
  && cd /usr/flood && ./node_modules/.bin/gulp dist
 
 VOLUME /data /usr/flood/server/db
@@ -77,4 +77,4 @@ LABEL description="BitTorrent client with WebUI front-end" \
       libtorrent="libtorrent v$LIBTORRENT_VER" \
       filebot="Filebot v$FILEBOT_VER"
 
-CMD ["/sbin/tini","--","startup"]
+CMD ["run.sh"]
diff --git a/rtorrent-flood/startup b/rtorrent-flood/run.sh
similarity index 57%
rename from rtorrent-flood/startup
rename to rtorrent-flood/run.sh
index 64062f0..988ae28 100644
--- a/rtorrent-flood/startup
+++ b/rtorrent-flood/run.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-addgroup -g ${GID} torrent && adduser -h /home/torrent -s /bin/sh -G torrent -D -u ${UID} torrent
 
 mkdir -p /data/torrents
 mkdir -p /data/.watch
@@ -11,6 +10,6 @@ mkdir -p /data/Media/Music
 
 sed -i -e "s/<FLOOD_SECRET>/$FLOOD_SECRET/g" /usr/flood/config.js
 rm -f /data/.session/rtorrent.lock
-chown -R torrent:torrent /data /home/torrent /filebot /usr/flood
+chown -R $UID:$GID /data /home/torrent /tmp /filebot /usr/flood /etc/s6.d
 
-exec /usr/bin/supervisord -c /etc/supervisord.conf
+exec su-exec $GID:$UID /bin/s6-svscan /etc/s6.d
diff --git a/rtorrent-flood/s6.d/flood/run b/rtorrent-flood/s6.d/flood/run
new file mode 100644
index 0000000..a2f4aee
--- /dev/null
+++ b/rtorrent-flood/s6.d/flood/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/flood
+exec /usr/flood/server/bin/www
diff --git a/rtorrent-flood/s6.d/rtorrent/run b/rtorrent-flood/s6.d/rtorrent/run
new file mode 100644
index 0000000..a1cc742
--- /dev/null
+++ b/rtorrent-flood/s6.d/rtorrent/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+export TERM="xterm"
+export HOME="/home/torrent"
+export PWD="/home/torrent"
+cd /home/torrent
+exec rtorrent
diff --git a/rtorrent-flood/supervisord.ini b/rtorrent-flood/supervisord.ini
deleted file mode 100644
index 1f6fb28..0000000
--- a/rtorrent-flood/supervisord.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:rtorrent]
-user=torrent
-directory=/home/torrent
-priority=2
-redirect_stderr=true
-environment=HOME="/home/torrent",PWD="/home/torrent",LOGNAME="rtorrent",USER="torrent",TERM="xterm"
-command=rtorrent
-autorestart=true
-
-[program:flood]
-user=torrent
-directory=/usr/flood
-redirect_stderr=true
-command=/usr/flood/server/bin/www
-autorestart=true