Reduce timeout to 30sec