diff --git a/docs/unlocking-root.md b/docs/unlocking-root.md
index 8832b93c..2ec0d9a6 100644
--- a/docs/unlocking-root.md
+++ b/docs/unlocking-root.md
@@ -1,3 +1,9 @@
 # Unlocking the root partition on boot
 
-After a boot, the encrypted root partition will have to be unlocked. This is done by accessing the server via SSH on port 2222. After connecting, paste the crypt passphrase you can find in the shared keepass. This will disconnect the SSH session right away and the server will keep booting into stage 2.
+After a boot, the encrypted root partition will have to be unlocked. This is done by accessing the server via SSH with user root on port 2222.
+
+```
+ssh root@nachtigall.pub.solar -p2222
+```
+
+ After connecting, paste the crypt passphrase you can find in the shared keepass. This will disconnect the SSH session right away and the server will keep booting into stage 2.
diff --git a/flake.nix b/flake.nix
index 76ab2176..329bc9c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,6 +107,7 @@
                 extraOptions = ''
                   --data-root /var/lib/docker
                 '';
+                storageDriver = "zfs";
               };
 
               services.openssh.enable = true;
@@ -153,6 +154,7 @@
               };
             };
           };
+
           deploy.nodes = self.pub-solar.lib.deploy.mkDeployNodes self.nixosConfigurations {
             nachtigall = {
               sshUser = username;
diff --git a/hosts/nachtigall/hardware-configuration.nix b/hosts/nachtigall/hardware-configuration.nix
index 02246323..9aab804b 100644
--- a/hosts/nachtigall/hardware-configuration.nix
+++ b/hosts/nachtigall/hardware-configuration.nix
@@ -28,6 +28,11 @@
       fsType = "zfs";
     };
 
+  fileSystems."/var/lib/docker" =
+    { device = "root_pool/data/docker";
+      fsType = "zfs";
+    };
+
   fileSystems."/boot1" =
     { device = "/dev/disk/by-uuid/5493-EFF5";
       fsType = "vfat";