diff --git a/vrrpd/templates/vrrp.service.j2 b/vrrpd/templates/vrrp.service.j2
index 7bd588d7..4db5d7a9 100644
--- a/vrrpd/templates/vrrp.service.j2
+++ b/vrrpd/templates/vrrp.service.j2
@@ -4,8 +4,12 @@ After=network.target
 
 [Service]
 ExecStart=/usr/sbin/vrrpd -i {{ vrrp_address.interface | mandatory }} -x -D -d {{ vrrp_address.delay | mandatory }} -v {{ vrrp_address.id | mandatory }} -p {{ vrrp_address.priority | mandatory }} -a {{ vrrp_address.authentication | mandatory }} -l {{ vrrp_address.label | mandatory }} {{ vrrp_address.ip | mandatory }}
-
+# PIDFile=/var/run/vrrpd_{{ vrrp_address.label }}_{{ vrrp_address.id }}.pid
+Restart=on-failure
 Type=forking
+IgnoreSIGPIPE=no
+KillMode=process
+RemainAfterExit=yes
 
 [Install]
 WantedBy=default.target
\ No newline at end of file