Change kill-timeout to 30 secs