diff --git a/hosts/c3/default.nix b/hosts/c3/default.nix
index 2c0658e..a035941 100644
--- a/hosts/c3/default.nix
+++ b/hosts/c3/default.nix
@@ -3,10 +3,15 @@
   imports = [ 
     ../../common/global
     ../../common/compute-node.nix
+    ../../common/encrypted-btrfs-layout.nix
     ./hardware.nix
   ];
 
+  diskLayout = {
+    mainDiskDevice = "/dev/disk/by-id/nvme-INTENSO_SSD_1782403017002453";
+    keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777650050-0:0";
+  };
+
   networking.hostName = "c3";
-  boot.initrd.luks.devices."luksroot".keyFile = "/dev/sda";
-  services.tailscaleAutoconnect.authkey = "tskey-auth-kDNknU5CNTRL-iEGHyo8GDZBCVLaMutJjZBHH7wCuCDyFb";
+  services.tailscaleAutoconnect.authkey = "tskey-auth-kReCuA7E8M11CNTRL-DBGsB3YLBvQwCdWcviQQtQ1zV23pQpQP4";
 }
diff --git a/hosts/c3/hardware.nix b/hosts/c3/hardware.nix
index ae97a38..8b1428c 100644
--- a/hosts/c3/hardware.nix
+++ b/hosts/c3/hardware.nix
@@ -10,42 +10,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  boot.initrd.luks.devices."luksroot".device = "/dev/disk/by-uuid/c4a43a18-b480-43ed-87f2-f78a50f03976";
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
-
-  fileSystems."/persist" =
-    { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9";
-      fsType = "btrfs";
-      options = [ "subvol=persist" ];
-    };
-
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9";
-      fsType = "btrfs";
-      options = [ "subvol=log" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3051-C478";
-      fsType = "vfat";
-    };
-
-  swapDevices = pkgs.lib.mkForce [ {
-    device = "/dev/disk/by-id/nvme-eui.000000000000001000080d020035fefd-part2";
-    randomEncryption.enable = true;
-  }];
-
   nixpkgs.hostPlatform = "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = true;
 }
diff --git a/hosts/c3/key.bin b/hosts/c3/key.bin
new file mode 100644
index 0000000..f6f9bb6
Binary files /dev/null and b/hosts/c3/key.bin differ