diff --git a/installer.sh b/installer.sh
index 95a7898f8..22125e8f9 100755
--- a/installer.sh
+++ b/installer.sh
@@ -27,7 +27,7 @@ readonly versions_url="https://s3.amazonaws.com/dev-cloudron-releases/versions.j
 readonly installer_code_url="${release_bucket_url}/box-${revision}.tar.gz"
 
 # runtime consts
-readonly installer_code_file="/root/box.tar.gz"
+readonly installer_code_file="/tmp/box.tar.gz"
 readonly installer_tmp_dir="/tmp/box"
 readonly cert_folder="/tmp/certificates"
 
diff --git a/installer/images/initializeBaseUbuntuImage.sh b/installer/images/initializeBaseUbuntuImage.sh
index 26b2a0026..1c627a318 100755
--- a/installer/images/initializeBaseUbuntuImage.sh
+++ b/installer/images/initializeBaseUbuntuImage.sh
@@ -31,6 +31,12 @@ fi
 
 echo "=== Yellowtent base image preparation (installer revision - ${INSTALLER_REVISION}) ==="
 
+echo "=== Prepare installer source ==="
+rm -rf "${INSTALLER_SOURCE_DIR}" && mkdir -p "${INSTALLER_SOURCE_DIR}"
+# tar xvf /root/box.tar.gz -C /tmp/box && rm /root/box.tar.gz
+cp -rf /tmp/box/installer "${INSTALLER_SOURCE_DIR}"
+echo "${INSTALLER_REVISION}" > "${INSTALLER_SOURCE_DIR}/REVISION"
+
 export DEBIAN_FRONTEND=noninteractive
 
 echo "=== Upgrade ==="
@@ -194,11 +200,6 @@ echo "==== Install logrotate ==="
 apt-get install -y cron logrotate
 systemctl enable cron
 
-echo "==== Extracting installer source ===="
-rm -rf "${INSTALLER_SOURCE_DIR}" && mkdir -p "${INSTALLER_SOURCE_DIR}"
-tar xvf /root/installer.tar -C "${INSTALLER_SOURCE_DIR}" && rm /root/installer.tar
-echo "${INSTALLER_REVISION}" > "${INSTALLER_SOURCE_DIR}/REVISION"
-
 echo "==== Install nodejs ===="
 # Cannot use anything above 4.1.1 - https://github.com/nodejs/node/issues/3803
 mkdir -p /usr/local/node-4.1.1