diff --git a/ubuntu-16.04/files/etc/cloud/cloud.cfg b/ubuntu-16.04/files/etc/cloud/cloud.cfg
index c3cbb03..94b618d 100644
--- a/ubuntu-16.04/files/etc/cloud/cloud.cfg
+++ b/ubuntu-16.04/files/etc/cloud/cloud.cfg
@@ -4,6 +4,7 @@
 
 # This will cause the set+update hostname module to not operate (if true)
 preserve_hostname: false
+apt_preserve_sources_list: true
 
 # Better let managing of /etc/hosts on salt and others
 # manage_etc_hosts: localhost
diff --git a/ubuntu-16.04/scripts/zerodisk.sh b/ubuntu-16.04/scripts/zerodisk.sh
deleted file mode 100644
index f2c6f16..0000000
--- a/ubuntu-16.04/scripts/zerodisk.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-dd if=/dev/zero of=/EMPTY bs=1M || true
-rm -f /EMPTY
-sync
diff --git a/ubuntu-16.04/scripts/zerodisk.sh b/ubuntu-16.04/scripts/zerodisk.sh
new file mode 120000
index 0000000..7a54d04
--- /dev/null
+++ b/ubuntu-16.04/scripts/zerodisk.sh
@@ -0,0 +1 @@
+../../common/zerodisk.sh
\ No newline at end of file
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 467b143..cfcb6f0 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -61,8 +61,7 @@
             "scripts/network.sh",
             "scripts/security.sh",
             "scripts/cleanup.sh",
-            "scripts/info.sh",
-            "scripts/zerodisk.sh"
+            "scripts/info.sh"
           ]
         },
         "openstack": {
@@ -284,11 +283,14 @@
       "iso_checksum_type": "md5",
       "iso_url": "http://cloud-images.ubuntu.com/releases/xenial/release-20180306/ubuntu-16.04-server-cloudimg-amd64-disk1.img",
       "disk_image": true,
+      "disk_compression": true,
       "accelerator": "kvm",
       "disk_size": "{{ user `disk_size`}}",
       "headless": true,
       "ssh_username": "{{user `user`}}",
       "ssh_password": "{{user `password`}}",
+      "ssh_host_port_min": 7000,
+      "ssh_host_port_max": 7050,
       "shutdown_command": "shutdown -P now",
       "boot_wait": "2s",
       "ssh_wait_timeout": "360s"