diff --git a/day01-image/scripts/cleanup.sh b/day01-image/scripts/cleanup.sh
index cf27058..c31f920 100644
--- a/day01-image/scripts/cleanup.sh
+++ b/day01-image/scripts/cleanup.sh
@@ -7,7 +7,7 @@
 rm -rf /var/lib/apt/lists/*
 rm -rf /etc/apt/sources.list.d/*
 echo "" > /etc/apt/sources.list
-rm -rf '/srv/salt/reclass/classes/!(service)'
+rm -rf /srv/salt/reclass/classes/!(service)
 rm -f /usr/sbin/policy-rc.d || true
 
 echo "cleaning up hostname"
diff --git a/day01-image/scripts/salt.sh b/day01-image/scripts/salt.sh
index c7bc7f1..16bafc8 100644
--- a/day01-image/scripts/salt.sh
+++ b/day01-image/scripts/salt.sh
@@ -17,11 +17,8 @@
 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
-# will not be needed with new maas formula
-apt-get install simplestreams -y
-sstream-mirror --keyring=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg http://images.maas.io/ephemeral-v3/daily/ /var/www/html/maas/images/ephemeral-v3/daily 'arch=amd64' 'release~(xenial)' --max=1
-
-salt-call -t 5 --retcode-passthrough --no-color state.sls jenkins.master
+# 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
 sleep 60
 salt-call -t 5 --no-color state.sls jenkins.client.plugin
 systemctl restart jenkins
diff --git a/day01-image/template.json b/day01-image/template.json
index ceb046c..f2f4d41 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -4,6 +4,19 @@
     "password": "r00tme",
     "do_api_token": "{{ env `DO_API_TOKEN` }}",
     "image_name": "{{ env `IMAGE_NAME` }}",
+    "cluster_model": "{{ env `CLUSTER_MODEL` }}",
+    "cluster_model_ref": "{{ env `CLUSTER_MODEL_REF` }}",
+    "cluster_name": "{{ env `CLUSTER_NAME` }}",
+    "formula_version": "{{ env `FORMULA_VERSION` }}",
+    "mcp_version": "{{ env `MCP_VERSION` }}",
+    "ubuntu_baseurl": "{{ env `UBUNTU_BASEURL` }}",
+    "saltstack_gpg": "{{ env `SALTSTACK_GPG` }}",
+    "saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
+    "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
+    "apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
+    "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
+    "apt_repository": "{{ env `APT_REPOSITORY` }}",
+    "apt_repository_gpg": "{{ env `APT_REPOSITORY_GPG` }}",
     "disk_size": "50000"
 
   },
diff --git a/mirror-image/scripts/salt.sh b/mirror-image/scripts/salt.sh
index 879c250..613352a 100644
--- a/mirror-image/scripts/salt.sh
+++ b/mirror-image/scripts/salt.sh
@@ -13,3 +13,4 @@
 sleep 120
 salt-call -t 5 --retcode-passthrough --no-color state.sls linux.network
 salt-call -t 5 --retcode-passthrough --no-color state.sls nginx
+salt-call -t 5 --retcode-passthrough --no-color state.sls maas.mirror