Fix #2839 - Authentication issues with cloud-init