diff --git a/baikal/rootfs/etc/services.d/php-fpm/finish b/baikal/rootfs/etc/services.d/php-fpm/finish
new file mode 100644
index 0000000..6f7ff9f
--- /dev/null
+++ b/baikal/rootfs/etc/services.d/php-fpm/finish
@@ -0,0 +1,11 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: phpMyAdmin
+# Take down the S6 supervision tree when PHP FPM fails
+# ==============================================================================
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "php-fpm crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "php-fpm stoped, restarting..."
diff --git a/baikal/rootfs/etc/services.d/php-fpm/run b/baikal/rootfs/etc/services.d/php-fpm/run
new file mode 100644
index 0000000..450e8f7
--- /dev/null
+++ b/baikal/rootfs/etc/services.d/php-fpm/run
@@ -0,0 +1,8 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: phpMyAdmin
+# Runs the PHP-FPM daemon
+# ==============================================================================
+bashio::log.info "Starting PHP-FPM..."
+
+exec php-fpm81 --nodaemonize