diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
index 0dffde8116..6c934139a4 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
@@ -70,6 +70,7 @@ ExecStart=/bin/podman run \\
     /usr/local/bin/etcd \\
     --config-file /etc/etcd/etcd.conf.yaml
 ExecStop=/bin/podman stop etcd
+TimeoutStartSec=10min
 
 [Install]
 WantedBy=multi-user.target
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
index 465abc4ab6..135e51bf2e 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
@@ -84,6 +84,7 @@ ExecStart=/bin/podman run \\
     ${_prefix}heat-container-agent:${HEAT_CONTAINER_AGENT_TAG} \\
     /usr/bin/start-heat-container-agent
 ExecStop=/bin/podman stop heat-container-agent
+TimeoutStartSec=10min
 
 [Install]
 WantedBy=multi-user.target