diff --git a/Dockerfile b/Dockerfile
index 4a94b4e..1259a2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:bullseye-slim
 RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
 
 RUN apt-get update \
-	&& apt-get install -yyq curl ifcico crashmail jamnntpd xinetd nginx supervisor cron procps less logrotate netcat iputils-ping \
+	&& apt-get install -yyq curl ifcico crashmail jamnntpd rlinetd nginx supervisor cron procps less logrotate netcat iputils-ping ssmtp \
 	zip unzip arc arj unrar-free lhasa p7zip vim libtimedate-perl \
 	&& mkdir /etc/jamnntpd && mv /etc/jamnntpd.* /etc/jamnntpd/ && mv /etc/jamnntpd /etc/jamnntpd.orig \
 	&& apt-get -y purge exim4-base \
@@ -19,16 +19,16 @@ RUN apt-get update \
 RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
 
 RUN apt-get update \
-        && apt-get install -yyq nncp less ssmtp \
+        && apt-get install -yyq nncp \
         && mkdir /etc/nncp \
         && apt-get -y autoremove \
         && apt-get clean \
         && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
 
 # Add in Leenooks' apt repository
-RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
+RUN curl -sL http://apt.dege.au/setup.sh | DISTRO=bullseye bash
 # For qico
-RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=buster bash
+RUN curl -sL http://apt.dege.au/setup.sh | DISTRO=buster bash
 RUN echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list.d/buster-oldstable.list
 
 # Add ZeroTier
@@ -99,7 +99,7 @@ RUN apt-get update \
 
 COPY nginx/binkps.conf /etc/nginx/modules-enabled/
 COPY nginx/binkps.crt nginx/binkps.key /etc/nginx/conf.d/ssl/
-COPY xinetd.d /etc/xinetd.d/
+COPY rlinetd.d /etc/rlinetd.d/
 #COPY --chmod=644 logrotate.d /etc/logrotate.d/
 COPY logrotate.d /etc/logrotate.d/
 RUN chmod 644 /etc/logrotate.d/*
diff --git a/rlinetd.d/fido b/rlinetd.d/fido
new file mode 100644
index 0000000..d576ac5
--- /dev/null
+++ b/rlinetd.d/fido
@@ -0,0 +1,9 @@
+service "fido"
+{
+        protocol        tcp;
+        user            "root";
+        instances       10;
+        exec            "/usr/sbin/qico -aauto";
+        interface       any;
+        family          ipv6;
+}
diff --git a/rlinetd.d/tfido b/rlinetd.d/tfido
new file mode 100644
index 0000000..5705222
--- /dev/null
+++ b/rlinetd.d/tfido
@@ -0,0 +1,9 @@
+service "tfido"
+{
+        protocol        tcp;
+        user            "root";
+        instances       10;
+        exec            "/usr/lib/ifmail/ifcico -r0 -t1";
+        interface       any;
+        family          ipv6;
+}
diff --git a/start_daemon b/start_daemon
new file mode 100755
index 0000000..976f68a
--- /dev/null
+++ b/start_daemon
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PIDDIR=/var/run
+SLEEP=5
+DAEMON=${1}
+shift
+
+PROG=$(basename $DAEMON)
+
+echo "* Starting daemon [${PROG}]"
+
+${DAEMON}
+pidof ${PROG} > ${PIDDIR}/$PROG
+
+DAEMON_RUN=true
+while ${DAEMON_RUN}; do
+	for pid in $(cat ${PIDDIR}/$PROG); do
+		#echo "- Checking PID [${pid}]"
+		( ps -p ${pid} > /dev/null && sleep ${SLEEP} ) || DAEMON_RUN=false
+	done
+done
+
+echo "* Daemon [${PROG}] no longer running"
diff --git a/supervisord.d/rlinetd.conf b/supervisord.d/rlinetd.conf
new file mode 100644
index 0000000..da577da
--- /dev/null
+++ b/supervisord.d/rlinetd.conf
@@ -0,0 +1,2 @@
+[program:rlinetd]
+command=/usr/sbin/rlinetd -d
diff --git a/supervisord.d/xinetd.conf b/supervisord.d/xinetd.conf
deleted file mode 100644
index 5f04f2f..0000000
--- a/supervisord.d/xinetd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[program:xinetd]
-command=/usr/sbin/xinetd -pidfile /run/xinetd.pid -inetd_ipv6 -dontfork -stayalive
diff --git a/xinetd.d/fido b/xinetd.d/fido
deleted file mode 100644
index 5e25b6d..0000000
--- a/xinetd.d/fido
+++ /dev/null
@@ -1,11 +0,0 @@
-service fido
-{
-        socket_type     = stream
-        protocol        = tcp
-        flags           = IPv6
-        wait            = no
-        user            = root
-        instances       = 10
-        server          = /usr/sbin/qico
-        server_args     = -aauto
-}
diff --git a/xinetd.d/tfido b/xinetd.d/tfido
deleted file mode 100644
index 37c8431..0000000
--- a/xinetd.d/tfido
+++ /dev/null
@@ -1,11 +0,0 @@
-service tfido
-{
-        socket_type     = stream
-        protocol        = tcp
-        flags           = IPv6
-        wait            = no
-        user            = root
-        instances       = 10
-        server          = /usr/lib/ifmail/ifcico
-        server_args     = -r0 -t1
-}