diff --git a/.vscode/settings.json b/.vscode/settings.json
index 22e9f2e..c0d2bb5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -129,6 +129,8 @@
     "jnoortheen",
     "jsbc",
     "kagi",
+    "keyformat",
+    "keylocation",
     "kuma",
     "lazer",
     "levelname",
diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix
index 556985a..c6f735c 100644
--- a/systems/jeeves/hardware.nix
+++ b/systems/jeeves/hardware.nix
@@ -71,12 +71,6 @@ in
         "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" =
           makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1";
 
-        # Scratch pool
-        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01C-part1" =
-          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01C-part1";
-        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01E-part1" =
-          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01E-part1";
-
         # Storage pool
         "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1" =
           makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1";
diff --git a/systems/jeeves/scripts/zfs.sh b/systems/jeeves/scripts/zfs.sh
index 0a53200..1b5b720 100644
--- a/systems/jeeves/scripts/zfs.sh
+++ b/systems/jeeves/scripts/zfs.sh
@@ -12,7 +12,7 @@ sudo zpool add storage -o ashift=12 special mirror
 sudo zpool add storage -o ashift=12 logs mirror
 
 # scratch
-sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -m /zfs/scratch scratch
+sudo zpool create scratch -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -O encryption=aes-256-gcm -O keyformat=hex -O keylocation=file:///key -m /zfs/scratch
 
 # media datasets
 sudo zfs create -o compression=zstd-9 media/docker
@@ -25,9 +25,8 @@ sudo zfs create -o exec=off media/share
 sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/postgres media/postgres
 
 # scratch datasets
-sudo zfs create -o recordsize=16k -o sync=disabled scratch/qbitvpn
-sudo zfs create -o recordsize=16k -o sync=disabled scratch/transmission
-sudo zfs create -o recordsize=1M scratch/kafka
+sudo zfs create scratch/kafka -o mountpoint=/zfs/scratch/kafka -o recordsize=1M
+sudo zfs create scratch/transmission -o mountpoint=/zfs/scratch/transmission -o recordsize=16k -o sync=disabled
 
 # storage datasets
 sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/archive