Should this be covered by a separate PR? What happens if you don't do this -- ssh keys not working?