diff --git a/stage2/01-sys-tweaks/files/rc.local b/stage2/01-sys-tweaks/files/rc.local
index 261e184..1c7e16b 100755
--- a/stage2/01-sys-tweaks/files/rc.local
+++ b/stage2/01-sys-tweaks/files/rc.local
@@ -57,7 +57,7 @@ if [ ! -f /home/umbrel/statuses/service-configured ]; then
 
         #Load docker images
         echo "Loading docker images"
-        tar -cC '/tmp/docker-images' . | docker load
+        tar -cC '/home/umbrel/images' . | docker load
     fi
 
     # Next stage, check if service-configured
diff --git a/stage2/05-docker-compose/01-run.sh b/stage2/05-docker-compose/01-run.sh
index 57364be..01a36df 100755
--- a/stage2/05-docker-compose/01-run.sh
+++ b/stage2/05-docker-compose/01-run.sh
@@ -43,5 +43,5 @@ echo "Images to download: $IMAGES"
 chmod +x ./download-frozen-image-v2.sh
 ./download-frozen-image-v2.sh docker-images $IMAGES
 
-mkdir -p ${ROOTFS_DIR}/tmp/docker-images
-cp -avr docker-images/ ${ROOTFS_DIR}/tmp
\ No newline at end of file
+mkdir ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/images
+cp -avr docker-images/ ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/images
\ No newline at end of file