diff --git a/unit-files/universal@.service b/unit-files/universal@.service
index af551a455920b5f036f43232a9c9c6933a6adb53..2419ab49b5c61d7859c685f08699faf14e49cc7b 100644
--- a/unit-files/universal@.service
+++ b/unit-files/universal@.service
@@ -12,6 +12,10 @@ Before=discovery-u@%i.service
 Before=backup-u@%i.timer
 
 [Service]
+Restart=always
+RestartSec=10
+TimeoutStartSec=60
+TimeoutStopSec=15
 WorkingDirectory=/data/domains/%i/
 ExecStartPre=/bin/cp /data/domains/%i/TLS/%i.pem /data/runtime/haproxy/approved-certs/%i.pem
 ExecStart=/bin/bash -euxc '/data/domains/%i/RUN'