diff --git a/.local/bin/homesync b/.local/bin/homesync
index ba146839..e9ce9b0c 100755
--- a/.local/bin/homesync
+++ b/.local/bin/homesync
@@ -88,8 +88,11 @@ done
 if [ -n "$OPT_DEVICE" ]; then
 	section "GnuPG"
 	sudo cryptsetup open "$OPT_DEVICE" gpg_backup
-	sudo mount /dev/mapper/gpg_backup /mnt
-	tar -C ~ --exclude='*.conf' -cf /mnt/gnugpg-backup-$(date +%F).tar .gnupg
+	sudo mount -o compress=zstd /dev/mapper/gpg_backup /mnt
+	gpg --import /mnt/public/.gnupg/pubring.gpg
+	sudo btrfs subvolume snapshot -r /mnt/public /mnt/.snapshots/public_${*date +%F_%R} && \
+		rm -rfv /mnt/public/.gnupg && \
+		cp -a ~/.gnupg /mnt/public/
 	sudo umount /mnt
 	sudo cryptsetup close gpg_backup
 fi