diff --git a/centos-7/scripts/zerodisk.sh b/centos-7/scripts/zerodisk.sh
deleted file mode 100644
index 6a658ed..0000000
--- a/centos-7/scripts/zerodisk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-dd if=/dev/zero of=/EMPTY bs=1M || true
-rm -f /EMPTY
diff --git a/centos-7/scripts/zerodisk.sh b/centos-7/scripts/zerodisk.sh
new file mode 120000
index 0000000..7a54d04
--- /dev/null
+++ b/centos-7/scripts/zerodisk.sh
@@ -0,0 +1 @@
+../../common/zerodisk.sh
\ No newline at end of file
diff --git a/common/ubuntu_base.sh b/common/ubuntu_base.sh
index bca322d..6f314e9 100644
--- a/common/ubuntu_base.sh
+++ b/common/ubuntu_base.sh
@@ -62,5 +62,10 @@
 # Setup cloud-init
 apt-get -y install cloud-init
 
-# Disable apt-daily
-systemctl disable apt-daily.timer
+# FIXME: move to cluster model
+# Disable services
+disable_services="apt-daily.timer apt-daily-upgrade.timer lxc.service snapd.service snapd.socket"
+for s in ${disable_services}; do
+  systemctl disable ${s} || true
+  systemctl stop ${s} || true
+done
diff --git a/ubuntu-16.04/scripts/zerodisk.sh b/common/zerodisk.sh
similarity index 62%
rename from ubuntu-16.04/scripts/zerodisk.sh
rename to common/zerodisk.sh
index f2c6f16..9b20b18 100644
--- a/ubuntu-16.04/scripts/zerodisk.sh
+++ b/common/zerodisk.sh
@@ -1,3 +1,4 @@
 dd if=/dev/zero of=/EMPTY bs=1M || true
 rm -f /EMPTY
+echo 3 > /proc/sys/vm/drop_caches
 sync
diff --git a/day01-image/files/etc/cloud/cloud.cfg b/day01-image/files/etc/cloud/cloud.cfg
index c3cbb03..94b618d 100644
--- a/day01-image/files/etc/cloud/cloud.cfg
+++ b/day01-image/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/day01-image/run.example.sh b/day01-image/run.example.sh
index e9ada77..aeee71e 100755
--- a/day01-image/run.example.sh
+++ b/day01-image/run.example.sh
@@ -11,7 +11,7 @@
 # External script sources:
 # http/bootstrap.saltstack.com.sh https://github.com/saltstack/salt-bootstrap
 #
-
+export IMAGE_NAME="cfg01"
 #
 export CLUSTER_MODEL=https://github.com/Mirantis/mcp-drivetrain-model.git
 export CLUSTER_MODEL_REF=master
diff --git a/day01-image/scripts/cleanup.sh b/day01-image/scripts/cleanup.sh
index 0968dd5..2b5ccbc 100644
--- a/day01-image/scripts/cleanup.sh
+++ b/day01-image/scripts/cleanup.sh
@@ -1,18 +1,23 @@
 #!/bin/bash -xe
-chmod +x /var/lib/maas/.maas_login.sh
 
 apt-get purge salt-formula-* -y
 apt-get -y autoremove --purge
 apt-get -y clean
 
+rm -rf /var/lib/ntp/ntp.conf.dhcp || true
 rm -rf /var/lib/apt/lists/*
-rm -rf /etc/apt/sources.list.d/*
-echo "" > /etc/apt/sources.list
+rm -rv /etc/apt/sources.list.d/* || true
+echo > /etc/apt/sources.list  || true
+rm -vf /usr/sbin/policy-rc.d || true
 
-rm -rf /srv/salt/reclass/classes/*
-rm /srv/salt/reclass/nodes/cfg01.mcp-day01.local.yml
-mkdir -p /srv/salt/reclass/classes/service
-rm -f /usr/sbin/policy-rc.d || true
+echo "cleaning up reclass"
+rm -rf /srv/salt/reclass || true
+rm -rf /srv/salt/scripts || true
+rm -rf /usr/share/salt-formulas/env || true
+#
+mkdir -p /srv/salt/reclass/
+mkdir -p /usr/share/salt-formulas/reclass/service/
+mkdir -p /usr/share/salt-formulas/env/
 
 echo "cleaning up hostname"
 sed -i "/.*ubuntu.*/d" /etc/hosts
@@ -35,6 +40,13 @@
 echo "cleaning up resolvconf"
 sed -i '/172\.18\.208\.44/d' /etc/resolvconf/resolv.conf.d/base
 
-# Clear\drop cache's
-sync
+# stop and disable services, for healthy zerodisk
+# They should be enabled after cfg01 init
+stop_services="postgresql.service salt-api salt-master salt-minion jenkins maas-rackd.service maas-regiond.service"
+for s in ${stop_services} ; do
+  systemctl stop ${s} || true
+  systemctl disable ${s} || true
+done
+
 echo 3 > /proc/sys/vm/drop_caches
+sync
diff --git a/day01-image/scripts/salt.sh b/day01-image/scripts/salt.sh
index 16bafc8..78cdd79 100644
--- a/day01-image/scripts/salt.sh
+++ b/day01-image/scripts/salt.sh
@@ -2,28 +2,36 @@
 
 FORMULA_VERSION=${FORMULA_VERSION:-2018.3.1}
 APT_MIRANTIS_SALT_REPO=${APT_MIRANTIS_SALT_REPO:-"http://apt.mirantis.com/xenial/ $FORMULA_VERSION salt"}
+SALT_OPTS="-t 10 --retcode-passthrough --no-color"
 
-salt-call -t 5 --retcode-passthrough reclass.validate_pillar
+salt-call ${SALT_OPTS} reclass.validate_pillar
 
 echo "deb [arch=amd64] ${APT_MIRANTIS_SALT_REPO}" > /etc/apt/sources.list.d/mcp_salt.list
 apt-get update
 apt-get install salt-formula* -y
+
 salt-call saltutil.refresh_pillar
 salt-call saltutil.sync_all
-salt-call -t 5 --retcode-passthrough --no-color state.sls salt
-salt-call -t 5 --retcode-passthrough --no-color state.sls linux.system.repo,linux.system.package,linux.system.user,linux.system.directory,linux.system.config
-salt-call -t 5 --retcode-passthrough --no-color state.sls linux.network
-salt-call -t 5 --retcode-passthrough --no-color state.sls openssh
-salt-call -t 5 --retcode-passthrough --no-color state.sls git.server
-salt-call -t 5 --retcode-passthrough --no-color state.sls postgresql
-salt-call -t 5 --no-color state.sls maas
+salt-call ${SALT_OPTS} state.sls salt
+salt-call ${SALT_OPTS} state.sls linux.system.repo,linux.system.package,linux.system.user,linux.system.directory,linux.system.config
+salt-call ${SALT_OPTS} state.sls linux.network
+salt-call ${SALT_OPTS} state.sls openssh
+salt-call ${SALT_OPTS} state.sls git.server
+salt-call ${SALT_OPTS} state.sls postgresql
+# install only MAAS packages, don't configure anything.
+# Configuration will be processed during cfg01 initialization.
+# Those step, required to have clean MAAS configuration - w\o auto import and etc.
+salt-call ${SALT_OPTS} state.sls_id maas_cluster_packages maas
+salt-call ${SALT_OPTS} state.sls_id maas_region_packages maas
+
 # linux.system.file only for backwards compatibility of jenkins - mcp-common-scripts
-salt-call -t 5 --retcode-passthrough --no-color state.sls jenkins.master,linux.system.file
+salt-call ${SALT_OPTS} state.sls jenkins.master,linux.system.file
 sleep 60
 salt-call -t 5 --no-color state.sls jenkins.client.plugin
 systemctl restart jenkins
 sleep 60
 # Jenkins Mirantis theme
+# FIXME move those into cluster model
 git clone https://github.com/Mirantis/docker-jenkins.git
 cp -r docker-jenkins/theme /var/lib/jenkins/userContent
 chown -R jenkins:jenkins /var/lib/jenkins/userContent/*
@@ -34,5 +42,5 @@
 salt-call -t 5 --no-color state.sls jenkins.client
 systemctl restart jenkins
 sleep 60
-salt-call -t 5 --retcode-passthrough --no-color state.sls jenkins.client
+salt-call ${SALT_OPTS} state.sls jenkins.client
 
diff --git a/day01-image/template.json b/day01-image/template.json
index 6cc5ce5..4db83f2 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -52,7 +52,8 @@
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
         "APT_REPOSITORY={{ user `apt_repository` }}",
         "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
-        "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}"
+        "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
+        "PACKER_OFFLINE_BUILD=true"
       ],
       "type": "shell",
       "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
@@ -119,6 +120,7 @@
       "vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\"  }}",
       "output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\"  }}",
       "format": "qcow2",
+      "disk_compression": true,
       "iso_checksum": "566efef1d6f12e7d3a994c2405bdb642",
       "iso_checksum_type": "md5",
       "iso_url": "http://cloud-images.ubuntu.com/releases/xenial/release-20180306/ubuntu-16.04-server-cloudimg-amd64-disk1.img",
@@ -128,6 +130,8 @@
       "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"
diff --git a/debian-8/scripts/zerodisk.sh b/debian-8/scripts/zerodisk.sh
deleted file mode 100644
index 6a658ed..0000000
--- a/debian-8/scripts/zerodisk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-dd if=/dev/zero of=/EMPTY bs=1M || true
-rm -f /EMPTY
diff --git a/debian-8/scripts/zerodisk.sh b/debian-8/scripts/zerodisk.sh
new file mode 120000
index 0000000..7a54d04
--- /dev/null
+++ b/debian-8/scripts/zerodisk.sh
@@ -0,0 +1 @@
+../../common/zerodisk.sh
\ No newline at end of file
diff --git a/mirror-image/files/etc/cloud/cloud.cfg b/mirror-image/files/etc/cloud/cloud.cfg
index c3cbb03..94b618d 100644
--- a/mirror-image/files/etc/cloud/cloud.cfg
+++ b/mirror-image/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/mirror-image/template.json b/mirror-image/template.json
index bd5f6e8..1b0369c 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -2,7 +2,7 @@
   "variables": {
     "user": "root",
     "password": "r00tme",
-    "disk_size": "150000",
+    "disk_size": "100000",
     "do_api_token": "{{ env `DO_API_TOKEN` }}",
     "image_name": "{{ env `IMAGE_NAME` }}",
     "cluster_model": "{{ env `CLUSTER_MODEL` }}",
@@ -153,6 +153,7 @@
       "iso_target_path": "/root/isos/xenial-server-cloudimg-amd64-disk1.img",
       "iso_checksum_type": "md5",
       "disk_image": true,
+      "disk_compression": true,
       "iso_checksum": "566efef1d6f12e7d3a994c2405bdb642",
       "http_directory": "http",
       "headless": true,
@@ -162,8 +163,8 @@
       "vnc_bind_address": "0.0.0.0",
       "vnc_port_max": "5956",
       "vnc_port_min": "5956",
-      "ssh_host_port_min": 2223,
-      "ssh_host_port_max": 2223,
+      "ssh_host_port_min": 7000,
+      "ssh_host_port_max": 7050,
       "boot_wait": "2s",
       "ssh_wait_timeout": "360s"
     }
diff --git a/ubuntu-14.04/scripts/zerodisk.sh b/ubuntu-14.04/scripts/zerodisk.sh
deleted file mode 100644
index 6a658ed..0000000
--- a/ubuntu-14.04/scripts/zerodisk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-dd if=/dev/zero of=/EMPTY bs=1M || true
-rm -f /EMPTY
diff --git a/ubuntu-14.04/scripts/zerodisk.sh b/ubuntu-14.04/scripts/zerodisk.sh
new file mode 120000
index 0000000..7a54d04
--- /dev/null
+++ b/ubuntu-14.04/scripts/zerodisk.sh
@@ -0,0 +1 @@
+../../common/zerodisk.sh
\ No newline at end of file
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
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"