diff --git a/_podman-common/20_enable_container.sh b/_podman-common/20_enable_container.sh
index 885484f..9242d0e 100755
--- a/_podman-common/20_enable_container.sh
+++ b/_podman-common/20_enable_container.sh
@@ -14,7 +14,7 @@ ensure_container_not_running ${container_name}
 
 ensure_systemd_as_user_dir_exists
 
-podman generate systemd --files --name ${container_name}
+podman generate systemd --stop-timeout=30 --files --name ${container_name}
 mv *.service ~/.config/systemd/user/
 
 systemctl --user daemon-reload
diff --git a/_podman-common/20_enable_pod.sh b/_podman-common/20_enable_pod.sh
index 4d1b35f..b3acd45 100755
--- a/_podman-common/20_enable_pod.sh
+++ b/_podman-common/20_enable_pod.sh
@@ -14,7 +14,7 @@ ensure_pod_not_running ${pod_name}
 
 ensure_systemd_as_user_dir_exists
 
-podman generate systemd --files --name ${pod_name}
+podman generate systemd --stop-timeout=30 --files --name ${pod_name}
 mv *.service ~/.config/systemd/user/
 
 systemctl --user daemon-reload