Merge "Create clouds.yaml early enough"