diff --git a/hosts/jorah.cx.ts.hillion.co.uk/default.nix b/hosts/jorah.cx.ts.hillion.co.uk/default.nix
index 6a7cc39..6403ca2 100644
--- a/hosts/jorah.cx.ts.hillion.co.uk/default.nix
+++ b/hosts/jorah.cx.ts.hillion.co.uk/default.nix
@@ -15,6 +15,9 @@
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
 
+    ## Impermanence
+    custom.impermanence.enable = true;
+
     ## Custom Services
     custom.locations.autoServe = true;
 
diff --git a/hosts/jorah.cx.ts.hillion.co.uk/hardware-configuration.nix b/hosts/jorah.cx.ts.hillion.co.uk/hardware-configuration.nix
index 5638a61..7a6ef15 100644
--- a/hosts/jorah.cx.ts.hillion.co.uk/hardware-configuration.nix
+++ b/hosts/jorah.cx.ts.hillion.co.uk/hardware-configuration.nix
@@ -16,8 +16,23 @@
 
   fileSystems."/" =
     {
-      device = "/dev/nvme0n1p2";
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = [ "mode=0755" ];
+    };
+
+  fileSystems."/nix" =
+    {
+      device = "/dev/disk/by-id/nvme-KXG60ZNV512G_TOSHIBA_106S10VHT9LM_1-part2";
       fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/data" =
+    {
+      device = "/dev/disk/by-id/nvme-KXG60ZNV512G_TOSHIBA_106S10VHT9LM_1-part2";
+      fsType = "btrfs";
+      options = [ "subvol=data" ];
     };
 
   fileSystems."/boot" =