Increase timeouts and add build identifier