diff --git a/templates/systemd/php-fpm@.service.j2 b/templates/systemd/php-fpm@.service.j2
index 6e16267..ff92eea 100644
--- a/templates/systemd/php-fpm@.service.j2
+++ b/templates/systemd/php-fpm@.service.j2
@@ -23,8 +23,8 @@ Environment="FPM_SOCKET_PATH=/run/php/php-fpm-%i.sock"
 ExecStart=/usr/sbin/php-fpm{{ php_version.stdout }} --nodaemonize --fpm-config {{ php_fpm_pool_config_file }}
 ExecReload=/bin/kill -USR2 $MAINPID
 KillMode=process
-Restart=on-failure
-RestartSec=30s
+Restart=always
+RestartSec=15s
 
 # Hardening
 # https://github.com/php/php-src/blob/master/sapi/fpm/php-fpm.service.in
@@ -42,8 +42,8 @@ SystemCallArchitectures=native
 SystemCallErrorNumber=EPERM
 SystemCallFilter=@system-service
 
-# Resources
 {% if php_fpm_cpu_quota is defined %}
+# Resources
 CPUQuota={{ php_fpm_cpu_quota }}
 {% endif %}
 {% if php_fpm_memory_high is defined %}