diff --git a/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2 b/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2
index b93ac12d2..598f64433 100644
--- a/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2
+++ b/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2
@@ -10,10 +10,11 @@ ExecStart=/usr/libexec/tripleo-start-podman-container {{ lookup('dict', containe
 ExecStart=/usr/bin/podman start {{ lookup('dict', container_data).key }}
 {% endif %}
 ExecReload=/usr/bin/podman kill --signal HUP {{ lookup('dict', container_data).key }}
-ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data).key }}
-ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data).key }}
+ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data).key }}
+ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data).key }}
 SuccessExitStatus=137 142 143
-KillMode=none
+TimeoutStopSec={{ 2*(lookup('dict', container_data).value.stop_grace_period | default(42) | int) }}
+KillMode={{ lookup('dict', container_data).value.kill_mode | default('control-group') }}
 Type=forking
 PIDFile=/var/run/{{ lookup('dict', container_data).key }}.pid
 {% if lookup('dict', container_data).value.systemd_exec_flags is defined %}