Improve cloud-init integration.