diff --git a/modules/cluster/default.nix b/modules/cluster/default.nix
index 5890692f..03aaedce 100644
--- a/modules/cluster/default.nix
+++ b/modules/cluster/default.nix
@@ -16,6 +16,9 @@ let
       then net
       else result
     ) null [ "cluster" "serv" ];
+
+  skyflakeHome = "/var/lib/skyflake/home";
+
 in {
   # Open firewall between cluster members
   networking.firewall.extraCommands = lib.concatMapStrings
@@ -59,15 +62,18 @@ in {
       c3d2 = {
         uid = 1001;
         sshKeys = config.users.users.root.openssh.authorizedKeys.keys;
+        home = "${skyflakeHome}/c3d2";
       };
       # Deployment user for leon who also uses this flake
       leon = {
         uid = 1002;
         sshKeys = with ssh-public-keys; leon ++ astro;
+        home = "${skyflakeHome}/leon";
       };
       # Deployment user for neighbour Andreas Lippmann <andreaslippmann@web.de>
       luulaatsch = {
         uid = 1003;
+        home = "${skyflakeHome}/luulaatsch";
         sshKeys = [
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDVipwWSzxgUgm0fMeTbOSCXDNkbUUp+k1tvWaJcBA1M+LTM21rhP3tQQP24smPx1b2V/by6vHakhsj5pIMLzSSW7he/mAnOtwHj2dCEk6VaMvozAfS6n777g8ujZg0N9ekrqoNLh0uNchs3DYFZWXAnKtfEYjzIdXqVgXMI4uDXM6ObEh+YR3iGaZSYKd6S5nufzJOR6EiYbv/z6ThRq16f+HqetVdBamqmpNK9NcWCtjMcww7nZTyUvTbd2AyrpTAXSnVg30fza428Kpc5ZdzDJFjn0B3MVnP2LavIo8VH3Y5sjpp0aMDKfbz6dPA/df/pR6LVMsxx0eCEXeGqo9sFdabu2AwIPi79QFANr3qJ/nZo2LR3o2LvcOLO06xVRFKReGTsy6WWTNOTAL03sdiIbqnlmkjXu5nb4hzxoHBgA6LZGMx3knoVcUMBlpVaxOoT2tzXzpYszsKpGSN1EBqUlDXzen3EkHg7TpjjTJSH7Q0AeeSCJsaoAepa6wcZeJlBWSRiJdqIn7YBmCBdjV1nNPVBYE5mm2x88ha9e4NbyFhjQvZ/BiLyKCFVyDs6lIvhV5QfAPWOkyPwbLXtXg6g1OvmuM6mGDhtEfZKvreeqmTKjB+x7OpG847JKxmU8eeYax63/WgRssbOfTpicjsdoKlFST3WpZHGT7mWzmB/w== andreas@luulaatschs-MBP.pub.zentralwerk.org"
         ] ++ ssh-public-keys.astro;
@@ -76,6 +82,7 @@ in {
       marenz = {
         uid = 1004;
         sshKeys = ssh-public-keys.marenz;
+        home = "${skyflakeHome}/marenz";
       };
     };
 
@@ -84,12 +91,15 @@ in {
     # Ceph storage cluster configuration
     storage.ceph = assert lib.versions.majorMinor pkgs.ceph.version == "16.2"; rec {
       fsid = "a06b1061-ef09-46d6-a15f-2f8ce4d7d1bf";
-      mons = [ "server8" "server9" "server10" ];
+      mons = [ "server7" "server8" "server9" "server10" ];
       mgrs = mons;
       mdss = mons;
       rbdPools.microvms = {
         params = { size = 2; class = "ssd"; };
       };
+      cephfs.home.mountPoint = skyflakeHome;
+      # Legacy: migration to rbd
+      cephfs.skyflake.mountPoint = "/storage/cephfs";
 
       monKeyring = config.sops.secrets."ceph/monKeyring".path;
       adminKeyring = config.sops.secrets."ceph/adminKeyring".path;