Bosh suite stability improvements v2