diff --git a/Dockerfile b/Dockerfile
index 08d80f1..db310de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM ubuntu:bionic
+FROM ubuntu:xenial
+MAINTAINER Dave P
 
-# Create user (user/password is deluge)
+# Create user with user/password 'deluge'
 RUN useradd --create-home --uid 1000 deluge && \
     echo "deluge:deluge" | chpasswd
 
@@ -10,9 +11,6 @@ COPY core.conf /home/deluge/.config/deluge/
 COPY web_plugin.conf /home/deluge/.config/deluge/
 COPY web.conf /home/deluge/.config/
 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
@@ -34,7 +32,8 @@ COPY openvpn.conf /etc/supervisor/conf.d/openvpn.conf
 # Expose deluge-web, deluge
 EXPOSE 8112
 EXPOSE 58846
-#EXPOSE 8113 # deluge-web https
+# EXPOSE 8113 # deluge-web https
+# on run, also set a tcp/udp port for torrent peering
 
 # Set boot command
 ENTRYPOINT ["supervisord"]
diff --git a/deluged.conf b/deluged.conf
index 1302d60..d497c8d 100644
--- a/deluged.conf
+++ b/deluged.conf
@@ -3,4 +3,4 @@ autorestart=true
 command=/usr/bin/deluged --do-not-daemonize
 user=deluge
 environment=HOME="/home/deluge",USER="deluge"
-stopwaitsecs=60
+stopwaitsecs=180