diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
deleted file mode 100644
index 988f134..0000000
--- a/root/etc/cont-init.d/30-config
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folders
-mkdir -p /config/logs
-
-# permissions
-chmod +x /app/nzbhydra2/bin/nzbhydra2
-chown -R abc:abc /config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nzbhydra2-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nzbhydra2-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/dependencies.d/init-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run
new file mode 100755
index 0000000..9664b2c
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p /config/logs
+
+if [[ ! -f /config/nzbhydra.yml ]]; then
+    cp /defaults/nzbhydra.yml /config/nzbhydra.yml
+fi
+
+# permissions
+lsiown -R abc:abc /config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/type b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/up b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/up
new file mode 100644
index 0000000..db47652
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nzbhydra2-config/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d / init-services b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/dependencies.d / init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/notification-fd
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run
new file mode 100755
index 0000000..82e6943
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/run
@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+# unset unraid specific ENV to avoid crashing
+unset HOST_OS
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5076" \
+    cd /app/nzbhydra2/bin s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder /config
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-nzbhydra2/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nzbhydra2-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nzbhydra2-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nzbhydra2 b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-nzbhydra2
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/nzbhydra2/run b/root/etc/services.d/nzbhydra2/run
deleted file mode 100644
index b72fc68..0000000
--- a/root/etc/services.d/nzbhydra2/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# unset unraid specific ENV to avoid crashing
-unset HOST_OS
-
-cd /app/nzbhydra2/bin || exit
-
-exec \
-    s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
-    --nobrowser --datafolder /config