diff --git a/.gitignore b/.gitignore
index 61d99885e..de75c385d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ secrets.db
 /embassyos-*.tar.gz
 /*.deb
 /target
+/*.squashfs
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 213e1ac24..b5c2b6193 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ embassyos-raspi.img: all raspios.img cargo-deps/aarch64-unknown-linux-gnu/releas
 	! test -f embassyos-raspi.img || rm embassyos-raspi.img
 	./build/raspberry-pi/make-image.sh
 
-lite-upgrade.img: raspios.img cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast $(BUILD_SRC) update.img
+lite-upgrade.img: raspios.img cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast $(BUILD_SRC) eos.raspberrypi.squashfs
 	! test -f lite-upgrade.img || rm lite-upgrade.img
 	./build/raspberry-pi/make-upgrade-image.sh
 
diff --git a/build/raspberry-pi/make-upgrade-image.sh b/build/raspberry-pi/make-upgrade-image.sh
index a50a63a29..77f453708 100755
--- a/build/raspberry-pi/make-upgrade-image.sh
+++ b/build/raspberry-pi/make-upgrade-image.sh
@@ -21,22 +21,18 @@ sudo e2fsck -f -y $TARGET_NAME
 sudo resize2fs $TARGET_NAME
 
 TMPDIR=$(mktemp -d)
-mkdir $TMPDIR/target
-mkdir $TMPDIR/source
 
-sudo mount update.img $TMPDIR/source
+sudo mount $TARGET_NAME $TMPDIR/
 
-sudo mount $TARGET_NAME $TMPDIR/target
+sudo mkdir -p $TMPDIR/update
+sudo unsquashfs -f -d $TMPDIR/update eos.raspberrypi.squashfs
+sudo cp ./build/raspberry-pi/033-upgrade.sh $TMPDIR/usr/local/bin/033-upgrade.sh
+sudo cp ./build/raspberry-pi/033-upgrade.service $TMPDIR/etc/systemd/system/033-upgrade.service
+sudo ln -s /etc/systemd/system/033-upgrade.service $TMPDIR/etc/systemd/system/multi-user.target.wants/033-upgrade.service
+sudo cp ./build/raspberry-pi/nc-broadcast.service $TMPDIR/etc/systemd/system/nc-broadcast.service
+sudo ln -s /etc/systemd/system/nc-broadcast.service $TMPDIR/etc/systemd/system/multi-user.target.wants/nc-broadcast.service
 
-sudo mkdir -p $TMPDIR/target/update
-sudo rsync -acvAXH $TMPDIR/source/ $TMPDIR/target/update/
-sudo cp ./build/raspberry-pi/033-upgrade.sh $TMPDIR/target/usr/local/bin/033-upgrade.sh
-sudo cp ./build/raspberry-pi/033-upgrade.service $TMPDIR/target/etc/systemd/system/033-upgrade.service
-sudo ln -s /etc/systemd/system/033-upgrade.service $TMPDIR/target/etc/systemd/system/multi-user.target.wants/033-upgrade.service
-sudo cp ./build/raspberry-pi/nc-broadcast.service $TMPDIR/target/etc/systemd/system/nc-broadcast.service
-sudo ln -s /etc/systemd/system/nc-broadcast.service $TMPDIR/target/etc/systemd/system/multi-user.target.wants/nc-broadcast.service
-
-sudo umount $TMPDIR/target
+sudo umount $TMPDIR/
 
 sudo e2fsck -f -y $TARGET_NAME
 sudo resize2fs -M $TARGET_NAME
diff --git a/build/raspberry-pi/rip-image.sh b/build/raspberry-pi/rip-image.sh
index 166ecea99..d1574a88e 100755
--- a/build/raspberry-pi/rip-image.sh
+++ b/build/raspberry-pi/rip-image.sh
@@ -17,39 +17,13 @@ if [[ "$ROOT_PARTITION" =~ ^/dev/loop ]] || [[ "$BOOT_PARTITION" =~ ^/dev/loop ]
 	fi
 fi
 
-mkdir -p $TMPDIR/source
-mkdir -p $TMPDIR/target
+sudo mount $ROOT_PARTITION $TMPDIR/
+sudo mount $BOOT_PARTITION $TMPDIR/current/boot/
+sudo sed -i 's/PARTUUID=[a-f0-9]+/PARTUUID=cb15ae4d/g' $TMPDIR/current/etc/fstab
+sudo sed -i 's/PARTUUID=[a-f0-9]+/PARTUUID=cb15ae4d/g' $TMPDIR/current/boot/cmdline.txt
+sudo mksquashfs $TMPDIR/current/ eos.raspberrypi.squashfs
 
-rm -f update.img
-truncate -s 5000000000 update.img
-mkfs.ext4 update.img
-e2label update.img rootfs
-sudo mount update.img $TMPDIR/target/
-
-sudo mount $ROOT_PARTITION $TMPDIR/source/
-sudo mount $BOOT_PARTITION $TMPDIR/source/current/boot/
-sudo rsync -acvAXH --info=progress2 $TMPDIR/source/current/ $TMPDIR/target/
-
-sudo sed -i 's/PARTUUID=[a-f0-9]+/PARTUUID=cb15ae4d/g' $TMPDIR/target/etc/fstab
-sudo sed -i 's/PARTUUID=[a-f0-9]+/PARTUUID=cb15ae4d/g' $TMPDIR/target/boot/cmdline.txt
-
-sudo umount $TMPDIR/source/current/boot/
-sudo umount $TMPDIR/source/
-sudo umount $TMPDIR/target
+sudo umount $TMPDIR/current/boot/
+sudo umount $TMPDIR/
 
 rm -rf $TMPDIR
-
-sudo e2fsck -f -y update.img
-sudo resize2fs -M update.img
-BLOCK_INFO=$(sudo dumpe2fs update.img)
-BLOCK_COUNT=$(echo "$BLOCK_INFO" | grep "Block count:" | sed 's/Block count:\s\+//g')
-BLOCK_SIZE=$(echo "$BLOCK_INFO" | grep "Block size:" | sed 's/Block size:\s\+//g')
-FS_SIZE=$[$BLOCK_COUNT*$BLOCK_SIZE]
-truncate -s $FS_SIZE update.img
-
-echo "Compressing..."
-if which pv > /dev/null; then
-	cat update.img | pv -s $FS_SIZE | gzip > update.img.gz
-else
-	cat update.img | gzip > update.img.gz
-fi