diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39c192d440..47c9de2f7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ aws-parallelcluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
 
+3.14.0
+------
+
+**ENHANCEMENTS**
+- Remove UnkillableStepTimeout from slurm.conf and let slurm set this value.
+
 3.13.0
 ------
 **ENHANCEMENTS**
diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb
index 80455e6f80..b52a1b6b5d 100644
--- a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb
+++ b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb
@@ -50,7 +50,6 @@ BatchStartTimeout=180
 # TIMERS
 SlurmctldTimeout=300
 SlurmdTimeout=180
-UnkillableStepTimeout=180
 InactiveLimit=0
 MinJobAge=300
 KillWait=30