diff --git a/Dockerfile b/Dockerfile
index ef1cee3..e9aff27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,11 +39,10 @@ RUN \
     /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
   mkdir -p \
-    /app/www && \
+    /app/www-tmp && \
   tar xf \
     /tmp/heimdall.tar.gz -C \
-    /app/www --strip-components=1 && \
-  mv /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+    /app/www-tmp --strip-components=1 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0da0d51..dfe7146 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -39,11 +39,10 @@ RUN \
     /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
   mkdir -p \
-    /app/www && \
+    /app/www-tmp && \
   tar xf \
     /tmp/heimdall.tar.gz -C \
-    /app/www --strip-components=1 && \
-  mv /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+    /app/www-tmp --strip-components=1 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 3d0bc02..e58d92a 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -39,11 +39,10 @@ RUN \
     /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
   mkdir -p \
-    /app/www && \
+    /app/www-tmp && \
   tar xf \
     /tmp/heimdall.tar.gz -C \
-    /app/www --strip-components=1 && \
-  mv /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+    /app/www-tmp --strip-components=1 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run b/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
index 9a35033..9c25723 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
@@ -3,10 +3,17 @@
 
 # make our folders
 mkdir -p \
-    /app/www/bootstrap/cache \
     /config/www/{avatars,backgrounds,icons,logs,SupportedApps} \
     /config/log/heimdall
 
+# install heimdall if necessary
+if [[ -d /app/www-tmp ]]; then
+    echo "New container detected, installing Heimdall"
+    mv /app/www-tmp /app/www
+    cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig
+    touch /app/set-perms
+fi
+
 # create symlinks
 symlinks=(
     /app/www/storage/app/public/avatars
@@ -24,27 +31,23 @@ for i in "${symlinks[@]}"; do
     if [[ ! -L "${i}" ]]; then
         ln -s /config/www/"$(basename "${i}")" "${i}"
     fi
-    if [[ -d /config/www/"$(basename "${i}")" ]]; then
-        lsiown abc:abc /config/www/"$(basename "${i}")"
-    fi
 done
 
-# set permissions on new container
-if [[ ! -f /config/www/searchproviders.yaml ]]; then
-    echo "New container detected, setting permissions"
-    lsiown -R abc:abc \
-        /app \
-        /config
-fi
-
 # copy searchproviders if not exists and symlink
 if [[ ! -f /config/www/searchproviders.yaml ]]; then
     cp /app/www/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml
-    lsiown abc:abc /config/www/searchproviders.yaml
 fi
 rm -rf /app/www/storage/app/searchproviders.yaml
 ln -s /config/www/searchproviders.yaml /app/www/storage/app/searchproviders.yaml
 
+# tidy up install files & set permissions
+if [[ -d /app/set-perms ]]; then
+    rm /app/set-perms
+    lsiown -R abc:abc \
+        /app/www \
+        /config
+fi
+
 # copy .env if not exists
 if [[ ! -f /config/www/.env ]]; then
     install -g abc -o abc /app/www/.env.example /config/www/.env