My preference is to not set User or IdentityFile in the ssh config.  We want to do machine bringup as the ubuntu user, but for subsequent operations (installs) we want do do those as individual users.  So I've gone away from those two lines.