diff --git a/Docker/rootfs/etc/services.d/NetDaemon/finish b/Docker/rootfs/etc/services.d/NetDaemon/finish
deleted file mode 100644
index b6531b3ca..000000000
--- a/Docker/rootfs/etc/services.d/NetDaemon/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/execlineb -S0
-
-s6-svscanctl -t /var/run/s6/services
diff --git a/Docker/rootfs/etc/services.d/NetDaemonAdmin/finish b/Docker/rootfs/etc/services.d/NetDaemonAdmin/finish
new file mode 100644
index 000000000..000f80a10
--- /dev/null
+++ b/Docker/rootfs/etc/services.d/NetDaemonAdmin/finish
@@ -0,0 +1,6 @@
+#!/usr/bin/execlineb -S0
+
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services
\ No newline at end of file
diff --git a/Docker/rootfs/etc/services.d/NetDaemonAdmin/run b/Docker/rootfs/etc/services.d/NetDaemonAdmin/run
new file mode 100755
index 000000000..07ca21890
--- /dev/null
+++ b/Docker/rootfs/etc/services.d/NetDaemonAdmin/run
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+echo "Starting NetDaemon Admin"
+
+cd /admin || exit 1
+
+exec node ./host/admin.js
\ No newline at end of file
diff --git a/Docker/rootfs/etc/services.d/NetDaemonApp/finish b/Docker/rootfs/etc/services.d/NetDaemonApp/finish
new file mode 100644
index 000000000..000f80a10
--- /dev/null
+++ b/Docker/rootfs/etc/services.d/NetDaemonApp/finish
@@ -0,0 +1,6 @@
+#!/usr/bin/execlineb -S0
+
+if -n { s6-test $# -ne 0 }
+if -n { s6-test ${1} -eq 256 }
+
+s6-svscanctl -t /var/run/s6/services
\ No newline at end of file
diff --git a/Docker/rootfs/etc/services.d/NetDaemon/run b/Docker/rootfs/etc/services.d/NetDaemonApp/run
similarity index 74%
rename from Docker/rootfs/etc/services.d/NetDaemon/run
rename to Docker/rootfs/etc/services.d/NetDaemonApp/run
index cc99962e2..bb3421a47 100755
--- a/Docker/rootfs/etc/services.d/NetDaemon/run
+++ b/Docker/rootfs/etc/services.d/NetDaemonApp/run
@@ -1,10 +1,5 @@
-#!/bin/env bash
-
-# ==============================================================================
-# NetDaemon Service
-# Starts NetDaemon
-# ==============================================================================
-set -e
+#!/usr/bin/with-contenv bash
+echo "Starting NetDaemon Runner"
 
 declare runtype="Service"
 declare daemondir="/daemon"
diff --git a/Dockerfile b/Dockerfile
index e20d536f9..1153b7e40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,29 @@
 # Build the NetDaemon with build container
-#mcr.microsoft.com/dotnet/core/sdk:3.1.200
-#ludeeus/container:dotnet-base
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.200
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.302
 
 # Copy the source to docker container
 COPY ./src /usr/src
 
 # COPY Docker/rootfs/etc /etc
-COPY ./Docker/rootfs/etc/services.d/NetDaemon/run /rundaemon
+COPY ./Docker/rootfs/etc /etc
+
+# Install S6 and the Admin site
+RUN wget -qO /s6 \
+        https://raw.githubusercontent.com/ludeeus/container/master/rootfs/s6/install \
+    && bash /s6 \
+    \
+    && wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    \
+    && apt update && apt install -y \
+        nodejs \
+        yarn \
+        make \
+    \
+    && git clone https://github.com/net-daemon/admin.git /admin \
+    && cd /admin \
+    && git checkout tags/1.0.0 \
+    && make deploy
 
 # Set default values of NetDaemon env
 ENV \
@@ -21,4 +37,4 @@ ENV \
     NETDAEMON__SOURCEFOLDER=/data
 
 
-ENTRYPOINT ["bash", "/rundaemon"]
+ENTRYPOINT ["/init"]