diff --git a/scripts/systemd/exodus-gw-db.service b/scripts/systemd/exodus-gw-db.service
index a842bdc5..9a21183a 100644
--- a/scripts/systemd/exodus-gw-db.service
+++ b/scripts/systemd/exodus-gw-db.service
@@ -35,7 +35,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]
diff --git a/scripts/systemd/exodus-gw-localstack.service b/scripts/systemd/exodus-gw-localstack.service
index 217c0ea7..dee0e0df 100644
--- a/scripts/systemd/exodus-gw-localstack.service
+++ b/scripts/systemd/exodus-gw-localstack.service
@@ -49,7 +49,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]
diff --git a/scripts/systemd/exodus-gw-sidecar.service b/scripts/systemd/exodus-gw-sidecar.service
index 80f6c857..4bdc9971 100644
--- a/scripts/systemd/exodus-gw-sidecar.service
+++ b/scripts/systemd/exodus-gw-sidecar.service
@@ -62,7 +62,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]