diff --git a/common/ubuntu_base.sh b/common/ubuntu_base.sh
index 336662b..10f42c0 100644
--- a/common/ubuntu_base.sh
+++ b/common/ubuntu_base.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -xe
 
-if [ -f /tmp/done_ubuntu_base ] ; then
+# Don't use /tmp/ - some templates do node reboot
+if [ -f /done_ubuntu_base ] ; then
   echo "INFO: ubuntu_base already finished.Skipping.."
   exit 0
 fi
@@ -27,10 +28,10 @@
 
 sysctl -w fs.file-max=100000
 # Overwrite default mirrors
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial main restricted multiverse universe" > /etc/apt/sources.list
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-updates main restricted multiverse universe" >> /etc/apt/sources.list
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-security main restricted multiverse universe" >> /etc/apt/sources.list
-#echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-backports main restricted multiverse universe" >> /etc/apt/sources.list
+echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial main restricted universe" > /etc/apt/sources.list
+echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-updates main restricted universe" >> /etc/apt/sources.list
+echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-security main restricted universe" >> /etc/apt/sources.list
+#echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-backports main restricted universe" >> /etc/apt/sources.list
 
 apt-get clean
 apt-get update
@@ -77,4 +78,4 @@
   systemctl stop ${s} || true
 done
 
-touch /tmp/done_ubuntu_base
+touch /done_ubuntu_base
diff --git a/common/ubuntu_cleanup.sh b/common/ubuntu_cleanup.sh
index 4eb9c7f..919f64a 100644
--- a/common/ubuntu_cleanup.sh
+++ b/common/ubuntu_cleanup.sh
@@ -2,9 +2,11 @@
 
 apt-get -y autoremove --purge
 apt-get -y clean
-rm -rf /var/lib/apt/lists/*
 
-rm -f /usr/sbin/policy-rc.d || true
+rm -rf /var/lib/apt/lists/*
+rm -rv /etc/apt/sources.list.d/* || true
+echo > /etc/apt/sources.list  || true
+rm -vf /usr/sbin/policy-rc.d || true
 
 echo "cleaning up hostname"
 sed -i "/.*ubuntu.*/d" /etc/hosts
@@ -15,19 +17,23 @@
 
 echo "cleaning up dhcp leases"
 rm -rf /var/lib/dhcp/* || true
-rm -rf /var/lib/ntp/ntp.conf.dhcp || true
+rm -rfv /var/lib/ntp/ntp.conf.dhcp || true
 
 echo "cleaning up udev rules"
-rm -f /etc/udev/rules.d/70-persistent-net.rules || true
+rm -fv /etc/udev/rules.d/70-persistent-net.rules || true
 rm -rf /dev/.udev/ || true
-rm -f /lib/udev/rules.d/75-persistent-net-generator.rules || true
+rm -fv /lib/udev/rules.d/75-persistent-net-generator.rules || true
 
 echo "cleaning up minion_id for salt"
-rm -f /etc/salt/minion_id || true
+rm -vf /etc/salt/minion_id || true
 
 echo "cleaning up resolvconf"
 sed -i '/172\.18\.208\.44/d' /etc/resolvconf/resolv.conf.d/base
 
+# Remove flags
+rm -v /done_ubuntu_base || true
+rm -v /done_ubuntu_salt_bootstrap || true
+
 # Clear\drop cache's
 sync
 echo 3 > /proc/sys/vm/drop_caches
diff --git a/common/ubuntu_cleanup_salt.sh b/common/ubuntu_cleanup_salt.sh
new file mode 100644
index 0000000..4e77783
--- /dev/null
+++ b/common/ubuntu_cleanup_salt.sh
@@ -0,0 +1,28 @@
+#!/bin/bash -xe
+
+apt-get purge salt-formula-* -y
+
+echo "removing all previously accepted salt keys"
+salt-key -D -y || 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/
+
+# stop and disable services, for healthy zerodisk
+# They should be enabled after VCP init
+stop_services="salt-api salt-master salt-minion"
+for s in ${stop_services} ; do
+  systemctl stop ${s} || true
+# Enable this, after refactoring salt:control:virtng
+#  systemctl disable ${s} || true
+done
+
+# Clear\drop cache's
+sync
+echo 3 > /proc/sys/vm/drop_caches
diff --git a/common/ubuntu_salt_bootstrap.sh b/common/ubuntu_salt_bootstrap.sh
index 0b45762..a5a04f3 100644
--- a/common/ubuntu_salt_bootstrap.sh
+++ b/common/ubuntu_salt_bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-if [ -f '/tmp/done_ubuntu_salt_bootstrap' ]; then
+if [ -f '/done_ubuntu_salt_bootstrap' ]; then
   echo "INFO: ubuntu_salt_bootstrap already finished! Skipping.."
   exit 0
 fi
@@ -62,4 +62,4 @@
   exit 1
 fi
 bash -x /srv/salt/scripts/bootstrap.sh || true
-touch /tmp/done_ubuntu_salt_bootstrap
+touch /done_ubuntu_salt_bootstrap