diff --git a/env/tacc/templates/slurm/slurm.conf.j2 b/env/tacc/templates/slurm/slurm.conf.j2
index 07edb715..ae10dd42 100644
--- a/env/tacc/templates/slurm/slurm.conf.j2
+++ b/env/tacc/templates/slurm/slurm.conf.j2
@@ -36,6 +36,9 @@ TaskPlugin=task/cgroup
 ClusterName=roundup
 ReturnToService=1
 
+# https://bugs.schedmd.com/show_bug.cgi?id=3941
+UnkillableStepTimeout=180
+
 SlurmctldLogFile=/var/log/slurm/slurmctld.log
 SlurmctldDebug=debug
 SlurmdLogFile=/var/log/slurm/slurmd.log