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 2139815a4..a1ac4b94e 100644
--- a/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2
+++ b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2
@@ -13,10 +13,10 @@ ExecReload=/usr/bin/podman kill --signal HUP {{ lookup('dict', container_data_un
 {% if lookup('dict', container_data_unit).value.pre_stop_exec is defined %}
 ExecStop=-/usr/bin/podman exec {{ lookup('dict', container_data_unit).key }} {{ lookup('dict', container_data_unit).value.pre_stop_exec }}
 {% endif %}
-ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data_unit).key }}
-ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data_unit).key }}
+ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data_unit).key }}
+ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data_unit).key }}
 SuccessExitStatus=137 142 143
-KillMode=none
+TimeoutStopSec={{ 2*lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }}
 Type=forking
 PIDFile=/run/{{ lookup('dict', container_data_unit).key }}.pid
 {% if lookup('dict', container_data_unit).value.systemd_exec_flags is defined %}