diff --git a/roles/logscraper/templates/logscraper.service.j2 b/roles/logscraper/templates/logscraper.service.j2
index ac872d1..fcaaf7b 100644
--- a/roles/logscraper/templates/logscraper.service.j2
+++ b/roles/logscraper/templates/logscraper.service.j2
@@ -8,8 +8,9 @@ StartLimitBurst=5
 Type=simple
 SyslogIdentifier=logscraper-{{ item.tenant }}
 Restart=always
-RestartSec=3s
-ExecStop=-/usr/bin/podman stop -t 10 logscraper-{{ item.tenant }}
+RestartSec=12s
+ExecStop=/usr/bin/podman stop -t 10 logscraper-{{ item.tenant }}
+ExecStopPost=/usr/bin/podman rm -i logscraper-{{ item.tenant }}
 ExecStart=/usr/local/bin/logscraper-{{ item.tenant }}
 
 [Install]
diff --git a/roles/logsender/templates/logsender.service.j2 b/roles/logsender/templates/logsender.service.j2
index c3732b5..d28e7fe 100644
--- a/roles/logsender/templates/logsender.service.j2
+++ b/roles/logsender/templates/logsender.service.j2
@@ -8,8 +8,9 @@ StartLimitBurst=5
 Type=simple
 SyslogIdentifier=logsender-{{ item.tenant }}
 Restart=always
-RestartSec=3s
-ExecStop=-/usr/bin/podman stop -t 10 logsender-{{ item.tenant }}
+RestartSec=12s
+ExecStop=/usr/bin/podman stop -t 10 logsender-{{ item.tenant }}
+ExecStopPost=/usr/bin/podman rm -i logsender-{{ item.tenant }}
 ExecStart=/usr/local/bin/logsender-{{ item.tenant }}
 
 [Install]