diff --git a/baikal/rootfs/etc/services.d/nginx/finish b/baikal/rootfs/etc/services.d/nginx/finish
new file mode 100644
index 0000000..c89843d
--- /dev/null
+++ b/baikal/rootfs/etc/services.d/nginx/finish
@@ -0,0 +1,11 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: phpMyAdmin
+# Take down the S6 supervision tree when Nginx fails
+# ==============================================================================
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "NGinx crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "NGinx stoped, restarting..."
diff --git a/baikal/rootfs/etc/services.d/nginx/run b/baikal/rootfs/etc/services.d/nginx/run
new file mode 100644
index 0000000..7f1cc5e
--- /dev/null
+++ b/baikal/rootfs/etc/services.d/nginx/run
@@ -0,0 +1,12 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: phpMyAdmin
+# Runs the Nginx daemon
+# ==============================================================================
+
+# Wait for PHP-FPM to become available
+bashio::net.wait_for 9001
+
+bashio::log.info "Starting NGinx...."
+
+exec nginx