diff --git a/lib/templates/init-scripts/systemd-online.tpl b/lib/templates/init-scripts/systemd-online.tpl
index 5967d36b..5b6e868b 100644
--- a/lib/templates/init-scripts/systemd-online.tpl
+++ b/lib/templates/init-scripts/systemd-online.tpl
@@ -3,6 +3,7 @@ Description=PM2 process manager
 Documentation=https://pm2.keymetrics.io/
 After=network.target network-online.target
 Wants=network-online.target
+Restart=on-failure
 
 [Service]
 Type=forking
diff --git a/lib/templates/init-scripts/systemd.tpl b/lib/templates/init-scripts/systemd.tpl
index 4f050cd7..11a13b5f 100644
--- a/lib/templates/init-scripts/systemd.tpl
+++ b/lib/templates/init-scripts/systemd.tpl
@@ -2,6 +2,7 @@
 Description=PM2 process manager
 Documentation=https://pm2.keymetrics.io/
 After=network.target
+Restart=on-failure
 
 [Service]
 Type=forking
diff --git a/packager/build-deb-rpm.sh b/packager/build-deb-rpm.sh
index d8a195f8..41605671 100755
--- a/packager/build-deb-rpm.sh
+++ b/packager/build-deb-rpm.sh
@@ -83,6 +83,7 @@ LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 PIDFile=/etc/pm2/pm2.pid
+Restart=on-failure
 
 ExecStart=/usr/bin/pm2 resurrect
 ExecReload=/usr/bin/pm2 reload all