diff --git a/operation-tools/templates/buffer_writer-worker.service b/operation-tools/templates/buffer_writer-worker.service
index d1e4126..0f30f30 100644
--- a/operation-tools/templates/buffer_writer-worker.service
+++ b/operation-tools/templates/buffer_writer-worker.service
@@ -10,7 +10,10 @@ Type=idle
 User=root
 ExecStart=/usr/bin/sh /home/dbe/service_scripts/{{ detector }}-buffer_writer-worker.sh %i
 TimeoutStartSec=10
-RestartSec=1
+RestartSec=5
+StartLimitInterval=0
+Restart=on-failure
+
 
 [Install]
 WantedBy={{ detector }}-buffer_writer.service
diff --git a/operation-tools/templates/stream2vis.service b/operation-tools/templates/stream2vis.service
index 917908d..66c4e1e 100644
--- a/operation-tools/templates/stream2vis.service
+++ b/operation-tools/templates/stream2vis.service
@@ -8,7 +8,8 @@ User=root
 ExecStart=/usr/bin/sh /home/dbe/service_scripts/{{ detector }}-stream2vis.sh
 TimeoutStartSec=10
 Restart=on-failure
-RestartSec=1
+RestartSec=2
+StartLimitInterval=0
 
 [Install]
 WantedBy=multi-user.target