diff --git a/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg b/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg
index ed427ed..992b775 100644
--- a/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg
+++ b/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg
@@ -1 +1,2 @@
-mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ]
+apt_preserve_sources_list: true
+manage_etc_hosts: true
diff --git a/bootstrapvz/providers/ec2/tasks/tuning.py b/bootstrapvz/providers/ec2/tasks/tuning.py
index 0638a0e..a360092 100644
--- a/bootstrapvz/providers/ec2/tasks/tuning.py
+++ b/bootstrapvz/providers/ec2/tasks/tuning.py
@@ -23,8 +23,8 @@ class SetCloudInitMountOptions(Task):
 
     @classmethod
     def run(cls, info):
-        cloud_init_src = os.path.join(assets, 'cloud-init/debian_cloud.conf')
-        cloud_init_dst = os.path.join(info.root, 'etc/cloud/cloud.cfg.d/01_debian_cloud.conf')
+        cloud_init_src = os.path.join(assets, 'cloud-init/debian_cloud.cfg')
+        cloud_init_dst = os.path.join(info.root, 'etc/cloud/cloud.cfg.d/01_debian_cloud.cfg')
         copy(cloud_init_src, cloud_init_dst)
         os.chmod(cloud_init_dst, 0644)