Actually add volume control files and reduce timeouts"