diff --git a/config/root/etc/nginx/nginx.conf b/config/root/etc/nginx/nginx.conf
index 3393b77..c36874d 100644
--- a/config/root/etc/nginx/nginx.conf
+++ b/config/root/etc/nginx/nginx.conf
@@ -1,5 +1,3 @@
-daemon off;
-
 user app;
 worker_processes auto;
 pid /run/nginx.pid;
diff --git a/config/root/etc/services.d/nginx/run b/config/root/etc/services.d/nginx/run
index 9ff6f46..dbc63c4 100755
--- a/config/root/etc/services.d/nginx/run
+++ b/config/root/etc/services.d/nginx/run
@@ -2,4 +2,18 @@
 
 cd /
 
-/usr/sbin/nginx
+# run this service only once
+s6-svc -O /var/run/s6/services/nginx
+
+/usr/sbin/nginx -g "daemon on;"
+
+/app/healthcheck.py http://127.0.0.1:8080/healthcheck
+exitcode=$?
+
+while [ $exitcode -ne 0 ]; do
+    sleep 1;
+    /app/healthcheck.py http://127.0.0.1:8080/healthcheck
+    exitcode=$?
+done
+
+echo "Nginx entered a running state and is serving tubesync on port 4848"